Merge git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net
authorJakub Kicinski <kuba@kernel.org>
Fri, 29 Jan 2021 01:09:31 +0000 (17:09 -0800)
committerJakub Kicinski <kuba@kernel.org>
Fri, 29 Jan 2021 01:09:31 +0000 (17:09 -0800)
commitc358f95205ff472fb3960a5659304774983ec1c5
tree281fa209514d58a69109ac7a2190d7a2a937d93d
parent24a790da0ac4d9bcce2a9becc8799241716672f6
parent909b447dcc45db2f9bd5f495f1d16c419812e6df
Merge git://git./linux/kernel/git/netdev/net

drivers/net/can/dev.c
  b552766c872f ("can: dev: prevent potential information leak in can_fill_info()")
  3e77f70e7345 ("can: dev: move driver related infrastructure into separate subdir")
  0a042c6ec991 ("can: dev: move netlink related code into seperate file")

  Code move.

drivers/net/ethernet/mellanox/mlx5/core/en_ethtool.c
  57ac4a31c483 ("net/mlx5e: Correctly handle changing the number of queues when the interface is down")
  214baf22870c ("net/mlx5e: Support HTB offload")

  Adjacent code changes

net/switchdev/switchdev.c
  20776b465c0c ("net: switchdev: don't set port_obj_info->handled true when -EOPNOTSUPP")
  ffb68fc58e96 ("net: switchdev: remove the transaction structure from port object notifiers")
  bae33f2b5afe ("net: switchdev: remove the transaction structure from port attributes")

  Transaction parameter gets dropped otherwise keep the fix.

Signed-off-by: Jakub Kicinski <kuba@kernel.org>
28 files changed:
Documentation/networking/ip-sysctl.rst
MAINTAINERS
Makefile
drivers/net/can/dev/netlink.c
drivers/net/dsa/bcm_sf2.c
drivers/net/dsa/microchip/ksz8795.c
drivers/net/dsa/microchip/ksz_common.c
drivers/net/ethernet/ibm/ibmvnic.c
drivers/net/ethernet/intel/ice/ice_main.c
drivers/net/ethernet/intel/ice/ice_txrx.c
drivers/net/ethernet/marvell/octeontx2/nic/otx2_common.c
drivers/net/ethernet/mellanox/mlx5/core/en/tc_ct.c
drivers/net/ethernet/mellanox/mlx5/core/en_ethtool.c
drivers/net/ethernet/mellanox/mlx5/core/en_main.c
drivers/net/ethernet/mellanox/mlx5/core/en_rep.c
drivers/net/ethernet/mellanox/mlx5/core/en_tc.c
drivers/net/ethernet/mellanox/mlx5/core/fs_core.c
drivers/net/ethernet/stmicro/stmmac/dwmac-intel.c
drivers/net/usb/qmi_wwan.c
drivers/net/wireless/intel/iwlwifi/mvm/d3.c
drivers/net/wireless/intel/iwlwifi/mvm/mac80211.c
include/linux/mlx5/driver.h
net/ipv4/tcp_input.c
net/ipv4/tcp_output.c
net/mac80211/ieee80211_i.h
net/mac80211/iface.c
net/nfc/netlink.c
net/switchdev/switchdev.c