OSDN Git Service

Merge git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net
authorJakub Kicinski <kuba@kernel.org>
Thu, 28 Apr 2022 20:01:50 +0000 (13:01 -0700)
committerJakub Kicinski <kuba@kernel.org>
Thu, 28 Apr 2022 20:02:01 +0000 (13:02 -0700)
commit0e55546b189fc5f1ce5149445d7df083f26d4f25
tree0ed58feac725c81dd27a4533bea24c328898e877
parentf3412b3879b4f7c4313b186b03940d4791345534
parent249aca0d3d631660aa3583c6a3559b75b6e971b4
Merge git://git./linux/kernel/git/netdev/net

include/linux/netdevice.h
net/core/dev.c
  6510ea973d8d ("net: Use this_cpu_inc() to increment net->core_stats")
  794c24e9921f ("net-core: rx_otherhost_dropped to core_stats")
https://lore.kernel.org/all/20220428111903.5f4304e0@canb.auug.org.au/

drivers/net/wan/cosa.c
  d48fea8401cf ("net: cosa: fix error check return value of register_chrdev()")
  89fbca3307d4 ("net: wan: remove support for COSA and SRP synchronous serial boards")
https://lore.kernel.org/all/20220428112130.1f689e5e@canb.auug.org.au/

Signed-off-by: Jakub Kicinski <kuba@kernel.org>
18 files changed:
MAINTAINERS
drivers/net/ethernet/hisilicon/hns3/hns3_enet.c
drivers/net/ethernet/hisilicon/hns3/hns3pf/hclge_mbx.c
drivers/net/ethernet/ibm/ibmvnic.c
drivers/net/ethernet/ibm/ibmvnic.h
drivers/net/ethernet/intel/ice/ice_main.c
include/linux/netdevice.h
include/net/tcp.h
net/bpf/test_run.c
net/bridge/br_switchdev.c
net/core/dev.c
net/dsa/port.c
net/dsa/slave.c
net/ipv4/tcp_input.c
net/ipv4/tcp_output.c
net/ipv4/tcp_rate.c
net/tls/tls_device.c
net/xdp/xsk.c