Merge git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net
authorJakub Kicinski <kuba@kernel.org>
Thu, 3 Mar 2022 19:55:12 +0000 (11:55 -0800)
committerJakub Kicinski <kuba@kernel.org>
Thu, 3 Mar 2022 19:55:12 +0000 (11:55 -0800)
commit80901bff812984624918d9d03f9286e3245ee9a5
tree945b0f2416cb904e5a178f2d099958b510ed1d56
parent25bf4df4d18b4546a5821d77b5fac149a3a4961f
parentb949c21fc23ecaccef89582f251e6281cad1f81e
Merge git://git./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>
32 files changed:
MAINTAINERS
drivers/net/ethernet/ibm/ibmvnic.c
drivers/net/ethernet/intel/e1000e/netdev.c
drivers/net/ethernet/intel/iavf/iavf.h
drivers/net/ethernet/intel/iavf/iavf_main.c
drivers/net/ethernet/intel/iavf/iavf_virtchnl.c
drivers/net/ethernet/intel/ixgbe/ixgbe_xsk.c
drivers/net/ethernet/samsung/sxgbe/sxgbe_main.c
drivers/net/ethernet/stmicro/stmmac/stmmac_main.c
drivers/ptp/ptp_ocp.c
drivers/tty/serial/sc16is7xx.c
include/net/bluetooth/hci_core.h
include/net/ndisc.h
net/batman-adv/hard-interface.c
net/bluetooth/hci_core.c
net/bluetooth/hci_sync.c
net/bluetooth/mgmt.c
net/core/skbuff.c
net/dsa/dsa2.c
net/ipv4/tcp.c
net/ipv6/addrconf.c
net/ipv6/ip6_output.c
net/mac80211/ieee80211_i.h
net/mac80211/mlme.c
net/mac80211/rx.c
net/netfilter/core.c
net/netfilter/nfnetlink_queue.c
net/sched/act_ct.c
net/smc/af_smc.c
net/smc/smc_core.c
net/xfrm/xfrm_interface.c
tools/testing/selftests/net/mptcp/mptcp_connect.sh