]> git.baikalelectronics.ru Git - kernel.git/commit
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net
authorDavid S. Miller <davem@davemloft.net>
Wed, 11 Jan 2017 19:43:39 +0000 (14:43 -0500)
committerDavid S. Miller <davem@davemloft.net>
Wed, 11 Jan 2017 19:43:39 +0000 (14:43 -0500)
commitbd993ad2ff7d1d3a6accb38b78a62c6dce0e37c4
tree08a39341379ce6f1ad4f3997df36c76ee82cee9c
parente01f868fc6d7a5752f48115b22ba14a8f1782769
parent128e4770508f74a712c7bd207b5e2146e03d8312
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net

Two AF_* families adding entries to the lockdep tables
at the same time.

Signed-off-by: David S. Miller <davem@davemloft.net>
19 files changed:
MAINTAINERS
drivers/net/ethernet/intel/igb/igb_main.c
drivers/net/ethernet/mellanox/mlx4/en_netdev.c
drivers/net/ethernet/mellanox/mlx5/core/en_main.c
drivers/net/ethernet/mellanox/mlx5/core/main.c
drivers/net/vrf.c
drivers/net/wireless/realtek/rtlwifi/usb.c
include/linux/netdevice.h
include/linux/skbuff.h
lib/Kconfig.debug
net/Kconfig
net/core/dev.c
net/core/flow_dissector.c
net/core/skbuff.c
net/core/sock.c
net/dsa/dsa2.c
net/ipv4/fib_semantics.c
net/ipv4/sysctl_net_ipv4.c
net/socket.c