]> git.baikalelectronics.ru Git - kernel.git/commit
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)
commitd8990de1781df177477f6e3cbb848d67577f9814
treec0194aaa4d716cd49909176885bf498dd6de8cd4
parentf8a59bcc5b47e989b8072cd510217bfec141461a
parent5585141c1b40edf67dc80587c0e76d27850562cb
Merge git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net

Conflicts:

drivers/net/can/dev.c
  commit 0ed548bde437 ("can: dev: can_restart: fix use after free bug")
  commit 9b92e0060875 ("can: dev: move driver related infrastructure into separate subdir")

  Code move.

drivers/net/dsa/b53/b53_common.c
 commit d63e6b2a99a0 ("net: dsa: b53: fix an off by one in checking "vlan->vid"")
 commit b224abe56567 ("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