Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/jkirsher/net-next (91c8028c) · Commits · Summer2022 / 22b970371 · GitLab

Skip to content

GitLab

Explore

Sign in

Primary navigation

Project

2

22b970371
- Activity
- Members
- Labels
- Issues
  0
- Issue boards
- Milestones
- Wiki
- Releases
- Package Registry
- Environments
- Terraform modules
- Incidents

Snippets Groups Projects

91c8028c

Commit 91c8028c authored 13 years ago by

David S. Miller

Downloads
- Plain Diff

Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/jkirsher/net-next

parents 81aded24 1d1a79b5

No related branches found

No related tags found

No related merge requests found

Changes 8

Hide whitespace changes

Inline Side-by-side

Showing

drivers/net/ethernet/intel/e1000e/netdev.c 7 additions, 4 deletions

drivers/net/ethernet/intel/e1000e/netdev.c
drivers/net/ethernet/intel/e1000e/param.c 27 additions, 16 deletions

drivers/net/ethernet/intel/e1000e/param.c
drivers/net/ethernet/intel/ixgbe/Makefile 2 additions, 2 deletions

drivers/net/ethernet/intel/ixgbe/Makefile
drivers/net/ethernet/intel/ixgbe/ixgbe.h 2 additions, 0 deletions

drivers/net/ethernet/intel/ixgbe/ixgbe.h
drivers/net/ethernet/intel/ixgbe/ixgbe_main.c 4 additions, 7 deletions

drivers/net/ethernet/intel/ixgbe/ixgbe_main.c
drivers/net/ethernet/intel/ixgbe/ixgbe_ptp.c 116 additions, 33 deletions

drivers/net/ethernet/intel/ixgbe/ixgbe_ptp.c
drivers/net/ethernet/intel/ixgbe/ixgbe_sysfs.c 0 additions, 2 deletions

drivers/net/ethernet/intel/ixgbe/ixgbe_sysfs.c
drivers/net/ethernet/intel/ixgbe/ixgbe_type.h 22 additions, 15 deletions

drivers/net/ethernet/intel/ixgbe/ixgbe_type.h

with 180 additions and 79 deletions

0% or .

You are about to add 0 people to the discussion. Proceed with caution.

Finish editing this message first!

Please register or sign in to comment