]> 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)
commitde74594606861e17b44d23a6104ab16a5a4e98e6
treec0194aaa4d716cd49909176885bf498dd6de8cd4
parent06680f93f8e962c53b52a2c18882206ea4bfda03
parentcf7e592444f1641f7f04956a982d128b81c33adf
Merge git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net

Conflicts:

drivers/net/can/dev.c
  commit e48a7c745f53 ("can: dev: can_restart: fix use after free bug")
  commit 6ac4eb9449c8 ("can: dev: move driver related infrastructure into separate subdir")

  Code move.

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