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>

diff --cc MAINTAINERS
Simple merge

diff --cc drivers/net/ethernet/intel/igb/igb_main.c
Simple merge

diff --cc drivers/net/ethernet/mellanox/mlx4/en_netdev.c
Simple merge

diff --cc drivers/net/ethernet/mellanox/mlx5/core/en_main.c
Simple merge

diff --cc drivers/net/ethernet/mellanox/mlx5/core/main.c
Simple merge

diff --cc drivers/net/vrf.c
Simple merge

diff --cc drivers/net/wireless/realtek/rtlwifi/usb.c
Simple merge

diff --cc include/linux/netdevice.h
Simple merge

diff --cc include/linux/skbuff.h
Simple merge

diff --cc lib/Kconfig.debug
Simple merge

diff --cc net/Kconfig
Simple merge

diff --cc net/core/dev.c
Simple merge

diff --cc net/core/flow_dissector.c
Simple merge

diff --cc net/core/skbuff.c
Simple merge

diff --cc net/core/sock.c
index 31f72f3a355952be55ca32f4654d7f511007d0f5,4eca27dc5c9478e36120a5128a7c11d6208b45a9..dbbdc4f167898a9bb748c253f48e52fa507bbe45
--- 1/net/core/sock.c
--- 2/net/core/sock.c
+++ b/net/core/sock.c
@@@ -222,7 -222,7 +222,7 @@@ static const char *const af_family_key_
    "sk_lock-AF_RXRPC" , "sk_lock-AF_ISDN"     , "sk_lock-AF_PHONET"   ,
    "sk_lock-AF_IEEE802154", "sk_lock-AF_CAIF" , "sk_lock-AF_ALG"      ,
    "sk_lock-AF_NFC"   , "sk_lock-AF_VSOCK"    , "sk_lock-AF_KCM"      ,
-   "sk_lock-AF_SMC"   , "sk_lock-AF_MAX"
 -  "sk_lock-AF_QIPCRTR", "sk_lock-AF_MAX"
++  "sk_lock-AF_QIPCRTR", "sk_lock-AF_SMC"     , "sk_lock-AF_MAX"
  };
  static const char *const af_family_slock_key_strings[AF_MAX+1] = {
    "slock-AF_UNSPEC", "slock-AF_UNIX"     , "slock-AF_INET"     ,
@@@ -239,7 -239,7 +239,7 @@@
    "slock-AF_RXRPC" , "slock-AF_ISDN"     , "slock-AF_PHONET"   ,
    "slock-AF_IEEE802154", "slock-AF_CAIF" , "slock-AF_ALG"      ,
    "slock-AF_NFC"   , "slock-AF_VSOCK"    ,"slock-AF_KCM"       ,
-   "slock-AF_SMC"   , "slock-AF_MAX"
 -  "slock-AF_QIPCRTR", "slock-AF_MAX"
++  "slock-AF_QIPCRTR", "slock-AF_SMC"     , "slock-AF_MAX"
  };
  static const char *const af_family_clock_key_strings[AF_MAX+1] = {
    "clock-AF_UNSPEC", "clock-AF_UNIX"     , "clock-AF_INET"     ,
@@@ -256,7 -256,7 +256,7 @@@
    "clock-AF_RXRPC" , "clock-AF_ISDN"     , "clock-AF_PHONET"   ,
    "clock-AF_IEEE802154", "clock-AF_CAIF" , "clock-AF_ALG"      ,
    "clock-AF_NFC"   , "clock-AF_VSOCK"    , "clock-AF_KCM"      ,
-   "closck-AF_smc"  , "clock-AF_MAX"
 -  "clock-AF_QIPCRTR", "clock-AF_MAX"
++  "clock-AF_QIPCRTR", "closck-AF_smc"    , "clock-AF_MAX"
  };
  
  /*

diff --cc net/dsa/dsa2.c
Simple merge

diff --cc net/ipv4/fib_semantics.c
Simple merge

diff --cc net/ipv4/sysctl_net_ipv4.c
Simple merge

diff --cc net/socket.c
Simple merge