Merge git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net

No conflicts.

Signed-off-by: Jakub Kicinski <kuba@kernel.org>

diff --cc MAINTAINERS
Simple merge

diff --cc drivers/net/bonding/bond_main.c
Simple merge

diff --cc drivers/net/ethernet/intel/ice/ice_lib.c
Simple merge

diff --cc drivers/net/phy/aquantia_main.c
Simple merge

diff --cc drivers/net/phy/smsc.c
Simple merge

diff --cc kernel/bpf/btf.c
Simple merge

diff --cc kernel/trace/bpf_trace.c
Simple merge

diff --cc net/core/dev.c
Simple merge

diff --cc net/core/filter.c
Simple merge

diff --cc net/core/net-sysfs.c
Simple merge

diff --cc net/core/skmsg.c
Simple merge

diff --cc net/ipv4/ping.c
Simple merge

diff --cc net/ipv4/tcp_bpf.c
Simple merge

diff --cc net/ipv6/ip6_gre.c
Simple merge