]> www.infradead.org Git - users/dwmw2/linux.git/commit
projects / users / dwmw2 / linux.git / commit
summary | shortlog | log | commit | commitdiff | tree
(merge: 3f8ad50 a118ff6)
Merge git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net
authorJakub Kicinski <kuba@kernel.org>
Tue, 29 Jun 2021 22:45:27 +0000 (15:45 -0700)
committerJakub Kicinski <kuba@kernel.org>
Tue, 29 Jun 2021 22:45:27 +0000 (15:45 -0700)
commitb6df00789e2831fff7a2c65aa7164b2a4dcbe599
treea94cbeeca3f0ae2fffed008cb287c02dbee4dcebtree
parent3f8ad50a9e43b6a59070e6c9c5eec79626f81095commit | diff
parenta118ff661889ecee3ca90f8125bad8fb5bbc07d5commit | diff
Merge git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net

Trivial conflict in net/netfilter/nf_tables_api.c.

Duplicate fix in tools/testing/selftests/net/devlink_port_split.py
- take the net-next version.

skmsg, and L4 bpf - keep the bpf code but remove the flags
and err params.

Signed-off-by: Jakub Kicinski <kuba@kernel.org>
48 files changed:
MAINTAINERS diff1 | diff2 | blob | history
drivers/atm/nicstar.c diff1 | diff2 | blob | history
drivers/net/bonding/bond_main.c diff1 | diff2 | blob | history
drivers/net/dsa/sja1105/sja1105_main.c diff1 | diff2 | blob | history
drivers/net/ethernet/google/gve/gve_main.c diff1 | diff2 | blob | history
drivers/net/ethernet/ibm/ibmvnic.c diff1 | diff2 | blob | history
drivers/net/ethernet/intel/e1000e/netdev.c diff1 | diff2 | blob | history
drivers/net/ethernet/intel/i40e/i40e_main.c diff1 | diff2 | blob | history
drivers/net/ethernet/microsoft/mana/mana_en.c diff1 | diff2 | blob | history
drivers/net/ethernet/sfc/ef10.c diff1 | diff2 | blob | history
drivers/net/phy/at803x.c diff1 | diff2 | blob | history
drivers/net/vrf.c diff1 | diff2 | blob | history
include/linux/netdevice.h diff1 | diff2 | blob | history
include/linux/skmsg.h diff1 | diff2 | blob | history
include/net/sch_generic.h diff1 | diff2 | blob | history
include/net/sctp/structs.h diff1 | diff2 | blob | history
include/net/xfrm.h diff1 | diff2 | blob | history
kernel/bpf/devmap.c diff1 | diff2 | blob | history
kernel/bpf/verifier.c diff1 | diff2 | blob | history
net/can/bcm.c diff1 | diff2 | blob | history
net/can/isotp.c diff1 | diff2 | blob | history
net/can/j1939/socket.c diff1 | diff2 | blob | history
net/core/dev.c diff1 | diff2 | blob | history
net/ipv4/esp4.c diff1 | diff2 | blob | history
net/ipv4/fib_frontend.c diff1 | diff2 | blob | history
net/ipv4/route.c diff1 | diff2 | blob | history
net/ipv4/tcp_bpf.c diff1 | diff2 | blob | history
net/ipv4/udp.c diff1 | diff2 | blob | history
net/ipv4/udp_bpf.c diff1 | diff2 | blob | history
net/ipv6/esp6.c diff1 | diff2 | blob | history
net/ipv6/ip6_tunnel.c diff1 | diff2 | blob | history
net/mptcp/options.c diff1 | diff2 | blob | history
net/mptcp/protocol.c diff1 | diff2 | blob | history
net/mptcp/protocol.h diff1 | diff2 | blob | history
net/mptcp/subflow.c diff1 | diff2 | blob | history
net/netfilter/nf_tables_api.c diff1 | diff2 | blob | history
net/netfilter/nft_exthdr.c diff1 | diff2 | blob | history
net/netfilter/nft_tproxy.c diff1 | diff2 | blob | history
net/sctp/input.c diff1 | diff2 | blob | history
net/sctp/ipv6.c diff1 | diff2 | blob | history
net/sctp/protocol.c diff1 | diff2 | blob | history
net/sctp/sm_make_chunk.c diff1 | diff2 | blob | history
net/tls/tls_sw.c diff1 | diff2 | blob | history
net/vmw_vsock/af_vsock.c diff1 | diff2 | blob | history
net/xfrm/xfrm_output.c diff1 | diff2 | blob | history
net/xfrm/xfrm_policy.c diff1 | diff2 | blob | history
net/xfrm/xfrm_state.c diff1 | diff2 | blob | history
tools/testing/selftests/bpf/prog_tests/sockmap_listen.c diff1 | diff2 | blob | history
Unnamed repository; edit this file 'description' to name the repository.