AuxXxilium/linux_dsm_epyc7002
1
0
Fork 0
mirror of https://github.com/AuxXxilium/linux_dsm_epyc7002.git synced 2024-12-19 01:17:23 +07:00
Code Issues Actions Packages Projects Releases Wiki Activity
355a901e6c
linux_dsm_epyc7002/net/netlink
History
David S. Miller 076ce44825 Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net 
Conflicts:
	drivers/net/ethernet/chelsio/cxgb4vf/sge.c
	drivers/net/ethernet/intel/ixgbe/ixgbe_phy.c

sge.c was overlapping two changes, one to use the new
__dev_alloc_page() in net-next, and one to use s->fl_pg_order in net.

ixgbe_phy.c was a set of overlapping whitespace changes.

Signed-off-by: David S. Miller <davem@davemloft.net>
2014-11-14 01:01:12 -05:00
..
af_netlink.c Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net 2014-11-14 01:01:12 -05:00
af_netlink.h netlink: hold nl_sock_hash_lock during diag dump 2014-08-06 19:17:44 -07:00
diag.c netlink: hold nl_sock_hash_lock during diag dump 2014-08-06 19:17:44 -07:00
genetlink.c genetlink: remove superfluous assignment 2014-06-02 10:36:18 -07:00
Kconfig netlink: kconfig: move mmap i/o into netlink kconfig 2013-05-01 15:02:42 -04:00
Makefile netlink: Diag core and basic socket info dumping (v2) 2013-03-21 12:38:03 -04:00