]> git.baikalelectronics.ru Git - kernel.git/commit
Merge git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net
authorJakub Kicinski <kuba@kernel.org>
Fri, 26 Nov 2021 21:26:29 +0000 (13:26 -0800)
committerJakub Kicinski <kuba@kernel.org>
Fri, 26 Nov 2021 21:45:19 +0000 (13:45 -0800)
commit1b31ba43a7f2f34c4ed8d7886e0d657f1a773cd4
treedd08a576dab4d61fda56dd005c7b2d0001a04297
parent21a48e62c7cf06de4b0a0a9518b40f8a3f9ea288
parent3cb41c7737b0e52e06b06144fe39b0005fea6aa7
Merge git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net

drivers/net/ipa/ipa_main.c
  91c1e1dd8786 ("net: ipa: separate disabling setup from modem stop")
  969ba1f9c870 ("net: ipa: kill ipa_modem_init()")

Duplicated include, drop one.

Signed-off-by: Jakub Kicinski <kuba@kernel.org>
30 files changed:
drivers/net/dsa/qca8k.c
drivers/net/ethernet/chelsio/cxgb4vf/cxgb4vf_main.c
drivers/net/ethernet/hisilicon/hns3/hns3_ethtool.c
drivers/net/ethernet/hisilicon/hns3/hns3vf/hclgevf_main.c
drivers/net/ethernet/intel/iavf/iavf_ethtool.c
drivers/net/ethernet/intel/ice/ice_main.c
drivers/net/ethernet/intel/igb/igb_main.c
drivers/net/ethernet/marvell/mvpp2/mvpp2_main.c
drivers/net/ethernet/mellanox/mlxsw/spectrum.c
drivers/net/ethernet/mscc/ocelot.c
drivers/net/ethernet/mscc/ocelot_vcap.c
drivers/net/ethernet/netronome/nfp/nfp_net_ethtool.c
drivers/net/ethernet/realtek/r8169_main.c
drivers/net/ethernet/stmicro/stmmac/stmmac.h
drivers/net/ethernet/stmicro/stmmac/stmmac_main.c
drivers/net/ipa/ipa_endpoint.c
drivers/net/ipa/ipa_main.c
drivers/net/ipa/ipa_modem.c
drivers/net/phy/phylink.c
include/soc/mscc/ocelot_vcap.h
net/8021q/vlan.c
net/8021q/vlan_dev.c
net/ethtool/ioctl.c
net/ipv6/af_inet6.c
net/ipv6/ip6_output.c
net/ipv6/route.c
net/mptcp/protocol.c
net/netfilter/nf_conntrack_netlink.c
net/smc/af_smc.c
net/unix/af_unix.c