git.monstr.eu Git - linux-2.6-microblaze.git/commit

projects / linux-2.6-microblaze.git / commit

summary | shortlog | log | commit | commitdiff | tree
(merge: f30e532 27bbf45)

author	Paolo Abeni <pabeni@redhat.com>
	Thu, 21 Sep 2023 19:49:45 +0000 (21:49 +0200)
committer	Paolo Abeni <pabeni@redhat.com>
	Thu, 21 Sep 2023 19:49:45 +0000 (21:49 +0200)
commit	e9cbc89067cce78211c8629c78e931c0fe64e29d
tree	95662373d0a7b4adc589fec61e120586d476de71	tree
parent	f30e5323a188cfc2d74b04f222cea0dbe9ffd6e6	commit \| diff
parent	27bbf45eae9ca98877a2d52a92a188147cd61b07	commit \| diff

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

Cross-merge networking fixes after downstream PR.

No conflicts.

Signed-off-by: Paolo Abeni <pabeni@redhat.com>

18 files changed:

MAINTAINERS	diff1 \|	diff2 \|	blob \| history
drivers/net/ethernet/engleder/tsnep_main.c	diff1 \|	diff2 \|	blob \| history
drivers/net/ethernet/intel/iavf/iavf.h	diff1 \|	diff2 \|	blob \| history
drivers/net/ethernet/intel/iavf/iavf_main.c	diff1 \|	diff2 \|	blob \| history
drivers/net/ethernet/marvell/octeon_ep/octep_main.c	diff1 \|	diff2 \|	blob \| history
drivers/net/ethernet/pensando/ionic/ionic_dev.h	diff1 \|	diff2 \|	blob \| history
drivers/net/ethernet/pensando/ionic/ionic_txrx.c	diff1 \|	diff2 \|	blob \| history
drivers/net/ethernet/stmicro/stmmac/dwmac-sun8i.c	diff1 \|	diff2 \|	blob \| history
drivers/net/ethernet/stmicro/stmmac/stmmac_main.c	diff1 \|	diff2 \|	blob \| history
include/uapi/linux/bpf.h	diff1 \|	diff2 \|	blob \| history
kernel/bpf/btf.c	diff1 \|	diff2 \|	blob \| history
kernel/bpf/memalloc.c	diff1 \|	diff2 \|	blob \| history
kernel/bpf/offload.c	diff1 \|	diff2 \|	blob \| history
net/core/dev.c	diff1 \|	diff2 \|	blob \| history
net/dccp/ipv6.c	diff1 \|	diff2 \|	blob \| history
net/ipv4/route.c	diff1 \|	diff2 \|	blob \| history
tools/include/uapi/linux/bpf.h	diff1 \|	diff2 \|	blob \| history
tools/testing/selftests/bpf/DENYLIST.aarch64	diff1 \|	diff2 \|	blob \| history

MicroBlaze GIT Repository