Merge git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net
authorJakub Kicinski <kuba@kernel.org>
Wed, 20 Jan 2021 20:16:11 +0000 (12:16 -0800)
committerJakub Kicinski <kuba@kernel.org>
Wed, 20 Jan 2021 20:16:11 +0000 (12:16 -0800)
commit0fe2f273ab892bbba3f8d85e3f237bc0802e5709
treec0194aaa4d716cd49909176885bf498dd6de8cd4
parent7b8fc0103bb51d1d3e1fb5fd67958612e709f883
parent75439bc439e0f02903b48efce84876ca92da97bd
Merge git://git./linux/kernel/git/netdev/net

Conflicts:

drivers/net/can/dev.c
  commit 03f16c5075b2 ("can: dev: can_restart: fix use after free bug")
  commit 3e77f70e7345 ("can: dev: move driver related infrastructure into separate subdir")

  Code move.

drivers/net/dsa/b53/b53_common.c
 commit 8e4052c32d6b ("net: dsa: b53: fix an off by one in checking "vlan->vid"")
 commit b7a9e0da2d1c ("net: switchdev: remove vid_begin -> vid_end range from VLAN objects")

 Field rename.

Signed-off-by: Jakub Kicinski <kuba@kernel.org>
14 files changed:
MAINTAINERS
drivers/net/can/dev/dev.c
drivers/net/dsa/b53/b53_common.c
drivers/net/ethernet/broadcom/bcmsysport.c
drivers/net/ethernet/mscc/ocelot.c
drivers/net/ethernet/mscc/ocelot_net.c
kernel/bpf/btf.c
kernel/bpf/verifier.c
net/bpf/test_run.c
net/core/dev.c
net/core/skbuff.c
net/ipv4/tcp.c
net/ipv4/tcp_output.c
net/nfc/nci/core.c