review.tizen.org Git - platform/kernel/linux-starfive.git/commit

projects / platform / kernel / linux-starfive.git / commit

author	Jakub Kicinski <kuba@kernel.org>
	Thu, 13 Apr 2023 23:04:28 +0000 (16:04 -0700)
committer	Jakub Kicinski <kuba@kernel.org>
	Thu, 13 Apr 2023 23:04:28 +0000 (16:04 -0700)
commit	800e68c44ffe71f9715f745b38fd1af6910b3773
tree	898caef9a109e429776e65c1083d1503207bebed	tree \| snapshot
parent	4033eaa68af6e3e9a8ec3819a9369d29aee8a2c4	commit \| diff
parent	829cca4d1783088e43bace57a555044cc937c554	commit \| diff

Merge git://git./linux/kernel/git/netdev/net

Conflicts:

tools/testing/selftests/net/config
62199e3f1658 ("selftests: net: Add VXLAN MDB test")
3a0385be133e ("selftests: add the missing CONFIG_IP_SCTP in net config")

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

20 files changed:

MAINTAINERS	diff1 \|	diff2 \|	blob \| history
arch/loongarch/net/bpf_jit.c	diff1 \|	diff2 \|	blob \| history
drivers/net/ethernet/cadence/macb_main.c	diff1 \|	diff2 \|	blob \| history
drivers/net/ethernet/intel/iavf/iavf.h	diff1 \|	diff2 \|	blob \| history
drivers/net/ethernet/mellanox/mlx4/mlx4_en.h	diff1 \|	diff2 \|	blob \| history
drivers/net/ethernet/mellanox/mlx5/core/en/xdp.c	diff1 \|	diff2 \|	blob \| history
drivers/net/phy/sfp.c	diff1 \|	diff2 \|	blob \| history
include/linux/mlx5/device.h	diff1 \|	diff2 \|	blob \| history
include/linux/netdevice.h	diff1 \|	diff2 \|	blob \| history
include/linux/rtnetlink.h	diff1 \|	diff2 \|	blob \| history
net/core/dev.c	diff1 \|	diff2 \|	blob \| history
net/core/rtnetlink.c	diff1 \|	diff2 \|	blob \| history
net/core/skbuff.c	diff1 \|	diff2 \|	blob \| history
net/ipv4/tcp_ipv4.c	diff1 \|	diff2 \|	blob \| history
net/ipv6/udp.c	diff1 \|	diff2 \|	blob \| history
net/mptcp/protocol.c	diff1 \|	diff2 \|	blob \| history
net/mptcp/subflow.c	diff1 \|	diff2 \|	blob \| history
tools/testing/selftests/bpf/prog_tests/xdp_do_redirect.c	diff1 \|	diff2 \|	blob \| history
tools/testing/selftests/bpf/prog_tests/xdp_metadata.c	diff1 \|	diff2 \|	blob \| history
tools/testing/selftests/net/config	diff1 \|	diff2 \|	blob \| history

Domain: System / Kernel;

RSS Atom

MAINTAINERS	diff1 \|	diff2 \|	blob \| history
arch/loongarch/net/bpf_jit.c	diff1 \|	diff2 \|	blob \| history
drivers/net/ethernet/cadence/macb_main.c	diff1 \|	diff2 \|	blob \| history
drivers/net/ethernet/intel/iavf/iavf.h	diff1 \|	diff2 \|	blob \| history
drivers/net/ethernet/mellanox/mlx4/mlx4_en.h	diff1 \|	diff2 \|	blob \| history
drivers/net/ethernet/mellanox/mlx5/core/en/xdp.c	diff1 \|	diff2 \|	blob \| history
drivers/net/phy/sfp.c	diff1 \|	diff2 \|	blob \| history
include/linux/mlx5/device.h	diff1 \|	diff2 \|	blob \| history
include/linux/netdevice.h	diff1 \|	diff2 \|	blob \| history
include/linux/rtnetlink.h	diff1 \|	diff2 \|	blob \| history
net/core/dev.c	diff1 \|	diff2 \|	blob \| history
net/core/rtnetlink.c	diff1 \|	diff2 \|	blob \| history
net/core/skbuff.c	diff1 \|	diff2 \|	blob \| history
net/ipv4/tcp_ipv4.c	diff1 \|	diff2 \|	blob \| history
net/ipv6/udp.c	diff1 \|	diff2 \|	blob \| history
net/mptcp/protocol.c	diff1 \|	diff2 \|	blob \| history
net/mptcp/subflow.c	diff1 \|	diff2 \|	blob \| history
tools/testing/selftests/bpf/prog_tests/xdp_do_redirect.c	diff1 \|	diff2 \|	blob \| history
tools/testing/selftests/bpf/prog_tests/xdp_metadata.c	diff1 \|	diff2 \|	blob \| history
tools/testing/selftests/net/config	diff1 \|	diff2 \|	blob \| history