projects
/
linux-2.6-microblaze.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
combined
(merge:
a148f82
df47935
)
Merge git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net
author
Jakub Kicinski
<kuba@kernel.org>
Thu, 7 Mar 2024 18:19:05 +0000
(10:19 -0800)
committer
Jakub Kicinski
<kuba@kernel.org>
Thu, 7 Mar 2024 18:29:36 +0000
(10:29 -0800)
Cross-merge networking fixes after downstream PR.
No conflicts.
Adjacent changes:
net/core/page_pool_user.c
0b11b1c5c320
("netdev: let netlink core handle -EMSGSIZE errors")
429679dcf7d9
("page_pool: fix netlink dump stop/resume")
Signed-off-by: Jakub Kicinski <kuba@kernel.org>
32 files changed:
1
2
MAINTAINERS
patch
|
diff1
|
diff2
|
blob
|
history
drivers/dpll/dpll_core.c
patch
|
diff1
|
diff2
|
blob
|
history
drivers/dpll/dpll_netlink.c
patch
|
diff1
|
diff2
|
blob
|
history
drivers/net/bonding/bond_main.c
patch
|
diff1
|
diff2
|
blob
|
history
drivers/net/dsa/microchip/ksz8795.c
patch
|
diff1
|
diff2
|
blob
|
history
drivers/net/ethernet/amd/pds_core/auxbus.c
patch
|
diff1
|
diff2
|
blob
|
history
drivers/net/ethernet/intel/i40e/i40e_main.c
patch
|
diff1
|
diff2
|
blob
|
history
drivers/net/ethernet/intel/ice/ice_dpll.c
patch
|
diff1
|
diff2
|
blob
|
history
drivers/net/ethernet/intel/ice/ice_lib.c
patch
|
diff1
|
diff2
|
blob
|
history
drivers/net/ethernet/intel/ice/ice_main.c
patch
|
diff1
|
diff2
|
blob
|
history
drivers/net/ethernet/intel/ice/ice_sriov.c
patch
|
diff1
|
diff2
|
blob
|
history
drivers/net/ethernet/intel/ice/ice_virtchnl.c
patch
|
diff1
|
diff2
|
blob
|
history
drivers/net/ethernet/intel/ice/ice_xsk.c
patch
|
diff1
|
diff2
|
blob
|
history
drivers/net/ethernet/intel/idpf/idpf_virtchnl.c
patch
|
diff1
|
diff2
|
blob
|
history
drivers/net/ethernet/intel/igc/igc_main.c
patch
|
diff1
|
diff2
|
blob
|
history
drivers/net/ethernet/intel/ixgbe/ixgbe_main.c
patch
|
diff1
|
diff2
|
blob
|
history
drivers/net/ethernet/mellanox/mlx5/core/dpll.c
patch
|
diff1
|
diff2
|
blob
|
history
drivers/net/ethernet/mellanox/mlx5/core/en/ptp.c
patch
|
diff1
|
diff2
|
blob
|
history
drivers/net/ethernet/mellanox/mlx5/core/health.c
patch
|
diff1
|
diff2
|
blob
|
history
drivers/net/geneve.c
patch
|
diff1
|
diff2
|
blob
|
history
drivers/net/usb/lan78xx.c
patch
|
diff1
|
diff2
|
blob
|
history
include/linux/dpll.h
patch
|
diff1
|
diff2
|
blob
|
history
include/linux/mlx5/mlx5_ifc.h
patch
|
diff1
|
diff2
|
blob
|
history
include/linux/netdevice.h
patch
|
diff1
|
diff2
|
blob
|
history
kernel/bpf/verifier.c
patch
|
diff1
|
diff2
|
blob
|
history
net/core/dev.c
patch
|
diff1
|
diff2
|
blob
|
history
net/core/page_pool_user.c
patch
|
diff1
|
diff2
|
blob
|
history
net/core/rtnetlink.c
patch
|
diff1
|
diff2
|
blob
|
history
net/ipv6/route.c
patch
|
diff1
|
diff2
|
blob
|
history
net/netfilter/nf_tables_api.c
patch
|
diff1
|
diff2
|
blob
|
history
net/xfrm/xfrm_user.c
patch
|
diff1
|
diff2
|
blob
|
history
tools/testing/selftests/net/mptcp/diag.sh
patch
|
diff1
|
diff2
|
blob
|
history
diff --cc
MAINTAINERS
Simple merge
diff --cc
drivers/dpll/dpll_core.c
Simple merge
diff --cc
drivers/dpll/dpll_netlink.c
Simple merge
diff --cc
drivers/net/bonding/bond_main.c
Simple merge
diff --cc
drivers/net/dsa/microchip/ksz8795.c
Simple merge
diff --cc
drivers/net/ethernet/amd/pds_core/auxbus.c
Simple merge
diff --cc
drivers/net/ethernet/intel/i40e/i40e_main.c
Simple merge
diff --cc
drivers/net/ethernet/intel/ice/ice_dpll.c
Simple merge
diff --cc
drivers/net/ethernet/intel/ice/ice_lib.c
Simple merge
diff --cc
drivers/net/ethernet/intel/ice/ice_main.c
Simple merge
diff --cc
drivers/net/ethernet/intel/ice/ice_sriov.c
Simple merge
diff --cc
drivers/net/ethernet/intel/ice/ice_virtchnl.c
Simple merge
diff --cc
drivers/net/ethernet/intel/ice/ice_xsk.c
Simple merge
diff --cc
drivers/net/ethernet/intel/idpf/idpf_virtchnl.c
Simple merge
diff --cc
drivers/net/ethernet/intel/igc/igc_main.c
Simple merge
diff --cc
drivers/net/ethernet/intel/ixgbe/ixgbe_main.c
Simple merge
diff --cc
drivers/net/ethernet/mellanox/mlx5/core/dpll.c
Simple merge
diff --cc
drivers/net/ethernet/mellanox/mlx5/core/en/ptp.c
Simple merge
diff --cc
drivers/net/ethernet/mellanox/mlx5/core/health.c
Simple merge
diff --cc
drivers/net/geneve.c
Simple merge
diff --cc
drivers/net/usb/lan78xx.c
Simple merge
diff --cc
include/linux/dpll.h
Simple merge
diff --cc
include/linux/mlx5/mlx5_ifc.h
Simple merge
diff --cc
include/linux/netdevice.h
Simple merge
diff --cc
kernel/bpf/verifier.c
Simple merge
diff --cc
net/core/dev.c
Simple merge
diff --cc
net/core/page_pool_user.c
Simple merge
diff --cc
net/core/rtnetlink.c
Simple merge
diff --cc
net/ipv6/route.c
Simple merge
diff --cc
net/netfilter/nf_tables_api.c
Simple merge
diff --cc
net/xfrm/xfrm_user.c
Simple merge
diff --cc
tools/testing/selftests/net/mptcp/diag.sh
Simple merge