Merge ra.kernel.org:/pub/scm/linux/kernel/git/netdev/net
authorDavid S. Miller <davem@davemloft.net>
Fri, 17 Feb 2023 11:06:39 +0000 (11:06 +0000)
committerDavid S. Miller <davem@davemloft.net>
Fri, 17 Feb 2023 11:06:39 +0000 (11:06 +0000)
commit675f176b4dcc2b75adbcea7ba0e9a649527f53bd
treedc5eea870c19b405bb6558964e5367bb6c9205c5
parent84cb1b53cdbad52642571e31a8aee301206d2043
parentec35307e18ba8174e2a3f701956059f6a36f22fb
Merge ra./pub/scm/linux/kernel/git/netdev/net

Some of the devlink bits were tricky, but I think I got it right.

Signed-off-by: David S. Miller <davem@davemloft.net>
23 files changed:
MAINTAINERS
drivers/net/ethernet/broadcom/bnxt/bnxt.c
drivers/net/ethernet/intel/i40e/i40e_main.c
drivers/net/ethernet/intel/ice/ice_devlink.c
drivers/net/ethernet/intel/ice/ice_main.c
drivers/net/ethernet/intel/ice/ice_xsk.c
drivers/net/ethernet/intel/igb/igb_main.c
drivers/net/ethernet/intel/ixgbe/ixgbe_main.c
drivers/net/ethernet/netronome/nfp/crypto/ipsec.c
drivers/net/ethernet/netronome/nfp/nfp_net_common.c
drivers/net/ethernet/netronome/nfp/nfp_net_ctrl.h
drivers/net/ethernet/stmicro/stmmac/stmmac_platform.c
drivers/net/ethernet/ti/am65-cpsw-nuss.c
drivers/net/ethernet/ti/am65-cpsw-nuss.h
include/linux/netdevice.h
include/net/sock.h
net/caif/caif_socket.c
net/core/dev.c
net/devlink/dev.c
net/devlink/leftover.c
net/ipv6/tcp_ipv6.c
net/socket.c
net/tipc/socket.c