projects / platform / kernel / linux-rpi.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: 98e9587 8a28a0b)
Merge git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net
authorJakub Kicinski <kuba@kernel.org>
Fri, 23 Jun 2023 01:40:38 +0000 (18:40 -0700)
committerJakub Kicinski <kuba@kernel.org>
Fri, 23 Jun 2023 01:40:38 +0000 (18:40 -0700)
commita7384f3918756c193e3fcd7e3111fc4bd3686013
tree156fda862edf0154225e6a5d8d092b0f6fe35728tree | snapshot
parent98e95872f2b818c74872d073eaa4c937579d41fccommit | diff
parent8a28a0b6f1a1dcbf5a834600a9acfbe2ba51e5ebcommit | diff
Merge git://git./linux/kernel/git/netdev/net

Cross-merge networking fixes after downstream PR.

Conflicts:

tools/testing/selftests/net/fcnal-test.sh
  d7a2fc1437f7 ("selftests: net: fcnal-test: check if FIPS mode is enabled")
  dd017c72dde6 ("selftests: fcnal: Test SO_DONTROUTE on TCP sockets.")
https://lore.kernel.org/all/5007b52c-dd16-dbf6-8d64-b9701bfa498b@tessares.net/
https://lore.kernel.org/all/20230619105427.4a0df9b3@canb.auug.org.au/

No adjacent changes.

Signed-off-by: Jakub Kicinski <kuba@kernel.org>
34 files changed:
MAINTAINERS diff1 | diff2 | blob | history
drivers/net/ethernet/emulex/benet/be_main.c diff1 | diff2 | blob | history
drivers/net/ethernet/freescale/dpaa2/dpaa2-mac.c diff1 | diff2 | blob | history
drivers/net/ethernet/mellanox/mlx5/core/en_main.c diff1 | diff2 | blob | history
drivers/net/ethernet/mellanox/mlx5/core/en_tc.c diff1 | diff2 | blob | history
drivers/net/ethernet/mellanox/mlx5/core/fs_cmd.c diff1 | diff2 | blob | history
drivers/net/ethernet/mellanox/mlx5/core/fs_core.h diff1 | diff2 | blob | history
drivers/net/ethernet/mellanox/mlx5/core/pci_irq.c diff1 | diff2 | blob | history
drivers/net/ethernet/mellanox/mlx5/core/steering/dr_action.c diff1 | diff2 | blob | history
drivers/net/ethernet/mellanox/mlx5/core/steering/fs_dr.c diff1 | diff2 | blob | history
drivers/net/ethernet/mellanox/mlx5/core/steering/mlx5dr.h diff1 | diff2 | blob | history
drivers/net/ethernet/sfc/tx_common.c diff1 | diff2 | blob | history
drivers/net/phy/phy_device.c diff1 | diff2 | blob | history
include/net/dsa.h diff1 | diff2 | blob | history
io_uring/net.c diff1 | diff2 | blob | history
kernel/bpf/btf.c diff1 | diff2 | blob | history
kernel/bpf/syscall.c diff1 | diff2 | blob | history
kernel/bpf/verifier.c diff1 | diff2 | blob | history
net/core/sock.c diff1 | diff2 | blob | history
net/ipv4/esp4_offload.c diff1 | diff2 | blob | history
net/ipv6/esp6_offload.c diff1 | diff2 | blob | history
net/mac80211/rx.c diff1 | diff2 | blob | history
net/mptcp/pm_netlink.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/ipvs/ip_vs_xmit.c diff1 | diff2 | blob | history
net/netfilter/nf_tables_api.c diff1 | diff2 | blob | history
net/netfilter/nft_set_pipapo.c diff1 | diff2 | blob | history
net/sched/sch_netem.c diff1 | diff2 | blob | history
net/xfrm/xfrm_interface_core.c diff1 | diff2 | blob | history
tools/testing/selftests/net/fcnal-test.sh diff1 | diff2 | blob | history
tools/testing/selftests/net/forwarding/mirror_gre_bridge_1d.sh diff1 | diff2 | blob | history
tools/testing/selftests/net/tls.c diff1 | diff2 | blob | history
Domain: System / Kernel;