From: David S. Miller Date: Wed, 11 Jan 2017 19:43:39 +0000 (-0500) Subject: Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net X-Git-Url: https://git.stricted.de/?a=commitdiff_plain;h=02ac5d1487115d160fab4c3e61b7edc20a945af9;p=GitHub%2FLineageOS%2Fandroid_kernel_motorola_exynos9610.git Merge git://git./linux/kernel/git/davem/net Two AF_* families adding entries to the lockdep tables at the same time. Signed-off-by: David S. Miller --- 02ac5d1487115d160fab4c3e61b7edc20a945af9 diff --cc net/core/sock.c index 31f72f3a3559,4eca27dc5c94..dbbdc4f16789 --- a/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" }; /*