Merge git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net
authorJakub Kicinski <kuba@kernel.org>
Fri, 17 Jun 2022 03:13:52 +0000 (20:13 -0700)
committerJakub Kicinski <kuba@kernel.org>
Fri, 17 Jun 2022 03:13:52 +0000 (20:13 -0700)
commit9cbc9911260f24cd3ce2bfb3bcdf4792366a5745
tree4600a657ac1e8977ff706bf398eb27de2dedab7f
parent5dcb50c009c9f8ec1cfca6a81a05c0060a5bbf68
parent48a23ec6ff2b2a5effe8d3ae5f17fc6b7f35df65
Merge git://git./linux/kernel/git/netdev/net

No conflicts.

Signed-off-by: Jakub Kicinski <kuba@kernel.org>
MAINTAINERS
drivers/net/ethernet/intel/i40e/i40e_ethtool.c
drivers/net/ethernet/intel/i40e/i40e_main.c
drivers/net/ethernet/intel/i40e/i40e_virtchnl_pf.c
drivers/net/ethernet/intel/iavf/iavf_main.c
drivers/net/ethernet/intel/ice/ice_virtchnl.c
include/net/sock.h
net/ax25/af_ax25.c
net/ipv4/tcp.c