projects / linux.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: 2f0968a e8c127b)
Merge git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net
authorJakub Kicinski <kuba@kernel.org>
Thu, 12 Oct 2023 23:17:46 +0000 (16:17 -0700)
committerJakub Kicinski <kuba@kernel.org>
Fri, 13 Oct 2023 00:07:34 +0000 (17:07 -0700)
commit0e6bb5b7f4c8e6665e76bdafce37ad4a8daf83c5
tree6f71fc5628f01bcf9d2dc6eceb3000ee4e73c79atree | snapshot
parent2f0968a030f2a5dd4897a0151c8395bf5babe5b0commit | diff
parente8c127b0576660da9195504fe8393fe9da3de9cecommit | diff
Merge git://git./linux/kernel/git/netdev/net

Cross-merge networking fixes after downstream PR.

No conflicts.

Adjacent changes:

kernel/bpf/verifier.c
  829955981c55 ("bpf: Fix verifier log for async callback return values")
  a923819fb2c5 ("bpf: Treat first argument as return value for bpf_throw")

Signed-off-by: Jakub Kicinski <kuba@kernel.org>
14 files changed:
MAINTAINERS diff1 | diff2 | blob | history
arch/s390/net/bpf_jit_comp.c diff1 | diff2 | blob | history
drivers/net/can/Kconfig diff1 | diff2 | blob | history
drivers/net/can/sja1000/sja1000.c diff1 | diff2 | blob | history
drivers/net/ethernet/intel/ice/ice_lag.c diff1 | diff2 | blob | history
drivers/net/ethernet/intel/ice/ice_lib.c diff1 | diff2 | blob | history
drivers/net/ethernet/intel/ixgbe/ixgbe_sriov.c diff1 | diff2 | blob | history
drivers/net/ethernet/renesas/ravb_main.c diff1 | diff2 | blob | history
drivers/net/ethernet/renesas/rswitch.c diff1 | diff2 | blob | history
drivers/net/macsec.c diff1 | diff2 | blob | history
kernel/bpf/syscall.c diff1 | diff2 | blob | history
kernel/bpf/verifier.c diff1 | diff2 | blob | history
net/core/dev.c diff1 | diff2 | blob | history
net/ipv4/tcp_output.c diff1 | diff2 | blob | history
ep93xx device tree rework repo: git://git.maquefel.me/linux.git