]> git.baikalelectronics.ru Git - kernel.git/commit
Merge git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net
authorJakub Kicinski <kuba@kernel.org>
Tue, 31 Aug 2021 16:06:04 +0000 (09:06 -0700)
committerJakub Kicinski <kuba@kernel.org>
Tue, 31 Aug 2021 16:06:04 +0000 (09:06 -0700)
commit42ceb6836bffb2d7720eec128cffe6dcdea3e7d2
tree054ead168bcd34a90ba924a22d94eeeffd79167c
parent190e17ea1afae09ff30b962e89fd27026ffc18e9
parent356c1791dbfe3bea8f74d87e6a3cc00cbc39f866
Merge git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net

include/linux/netdevice.h
net/socket.c

  603af93d2965 ("net: don't unconditionally copy_from_user a struct ifreq for socket ioctls")

  2274da4f3f8d ("net: socket: simplify dev_ifconf handling")
  dd3fa1f0c193 ("net: socket: rework compat_ifreq_ioctl()")

Signed-off-by: Jakub Kicinski <kuba@kernel.org>
drivers/net/ethernet/aquantia/atlantic/aq_pci_func.c
drivers/net/ethernet/intel/ice/ice_main.c
drivers/net/ethernet/mellanox/mlx5/core/dev.c
drivers/net/ethernet/mellanox/mlx5/core/en_tc.c
drivers/net/ethernet/mellanox/mlx5/core/lag.c
drivers/net/ethernet/mellanox/mlx5/core/lag_mp.c
drivers/net/ethernet/mellanox/mlx5/core/steering/dr_rule.c
drivers/net/phy/marvell10g.c
include/linux/netdevice.h
net/socket.c