]> 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)
commitddfe789f0cc6e45dce3662ea5da08fc9c6a75ee1
tree054ead168bcd34a90ba924a22d94eeeffd79167c
parent90ddc6f240fc9b813945a805328c5ae12df75313
parent6f235d164bcced9312f4303c80fc5e0223543001
Merge git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net

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

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

  f13b04afd1e6 ("net: socket: simplify dev_ifconf handling")
  dd53eb2b351f ("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