Merge git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net

net/batman-adv/hard-interface.c
  commit 690bb6fb64f5 ("batman-adv: Request iflink once in batadv-on-batadv check")
  commit 6ee3c393eeb7 ("batman-adv: Demote batadv-on-batadv skip error message")
https://lore.kernel.org/all/20220302163049.101957-1-sw@simonwunderlich.de/

net/smc/af_smc.c
  commit 4d08b7b57ece ("net/smc: Fix cleanup when register ULP fails")
  commit 462791bbfa35 ("net/smc: add sysctl interface for SMC")
https://lore.kernel.org/all/20220302112209.355def40@canb.auug.org.au/

Signed-off-by: Jakub Kicinski <kuba@kernel.org>

diff --cc MAINTAINERS
Simple merge

diff --cc drivers/net/ethernet/ibm/ibmvnic.c
Simple merge

diff --cc drivers/net/ethernet/intel/e1000e/netdev.c
Simple merge

diff --cc drivers/net/ethernet/intel/iavf/iavf.h
Simple merge

diff --cc drivers/net/ethernet/intel/iavf/iavf_main.c
Simple merge

diff --cc drivers/net/ethernet/intel/iavf/iavf_virtchnl.c
Simple merge

diff --cc drivers/net/ethernet/intel/ixgbe/ixgbe_xsk.c
Simple merge

diff --cc drivers/net/ethernet/samsung/sxgbe/sxgbe_main.c
Simple merge

diff --cc drivers/net/ethernet/stmicro/stmmac/stmmac_main.c
Simple merge

diff --cc drivers/ptp/ptp_ocp.c
Simple merge

diff --cc drivers/tty/serial/sc16is7xx.c
Simple merge

diff --cc include/net/bluetooth/hci_core.h
Simple merge

diff --cc include/net/ndisc.h
Simple merge

diff --cc net/batman-adv/hard-interface.c
index b25afc7ff59cfe2ee2c163234285c398fc9a1a9c,35fadb924849866f0fcdcd57ad136d158c398a93..83fb51b6e2994cb29a956667a53116581d94929b
--- 1/net/batman-adv/hard-interface.c
--- 2/net/batman-adv/hard-interface.c
+++ b/net/batman-adv/hard-interface.c
@@@ -162,12 -162,15 +162,15 @@@ static bool batadv_is_on_batman_iface(c
  
        parent_net = batadv_getlink_net(net_dev, net);
  
+       /* iflink to itself, most likely physical device */
+       if (net == parent_net && iflink == net_dev->ifindex)
+               return false;
+ 
        /* recurse over the parent device */
-       parent_dev = __dev_get_by_index((struct net *)parent_net,
-                                       dev_get_iflink(net_dev));
+       parent_dev = __dev_get_by_index((struct net *)parent_net, iflink);
 -      /* if we got a NULL parent_dev there is something broken.. */
        if (!parent_dev) {
 -              pr_err("Cannot find parent device\n");
 +              pr_warn("Cannot find parent device. Skipping batadv-on-batadv check for %s\n",
 +                      net_dev->name);
                return false;
        }
  

diff --cc net/bluetooth/hci_core.c
Simple merge

diff --cc net/bluetooth/hci_sync.c
Simple merge

diff --cc net/bluetooth/mgmt.c
Simple merge

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

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

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

diff --cc net/ipv6/addrconf.c
Simple merge

diff --cc net/ipv6/ip6_output.c
Simple merge

diff --cc net/mac80211/ieee80211_i.h
Simple merge

diff --cc net/mac80211/mlme.c
Simple merge

diff --cc net/mac80211/rx.c
Simple merge

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

diff --cc net/netfilter/nfnetlink_queue.c
Simple merge

diff --cc net/sched/act_ct.c
Simple merge

diff --cc net/smc/af_smc.c
index 6447607675fa922cd71bb41e3919a57d1c3f9b98,284befa909676b8881a443b37442980700d26d34..e508e4f3a07378c9fa654afeca1de957d879613b
--- 1/net/smc/af_smc.c
--- 2/net/smc/af_smc.c
+++ b/net/smc/af_smc.c
@@@ -3287,20 -3087,14 +3293,22 @@@ static int __init smc_init(void
        rc = tcp_register_ulp(&smc_ulp_ops);
        if (rc) {
                pr_err("%s: tcp_ulp_register fails with %d\n", __func__, rc);
-               goto out_sock;
+               goto out_ib;
        }
  
 +      rc = smc_sysctl_init();
 +      if (rc) {
 +              pr_err("%s: sysctl_init fails with %d\n", __func__, rc);
 +              goto out_ulp;
 +      }
 +
        static_branch_enable(&tcp_have_smc);
        return 0;
  
 +out_ulp:
 +      tcp_unregister_ulp(&smc_ulp_ops);
+ out_ib:
+       smc_ib_unregister_client();
  out_sock:
        sock_unregister(PF_SMC);
  out_proto6:

diff --cc net/smc/smc_core.c
Simple merge

diff --cc net/xfrm/xfrm_interface.c
Simple merge

diff --cc tools/testing/selftests/net/mptcp/mptcp_connect.sh
Simple merge