summaryrefslogtreecommitdiffstats
path: root/drivers/staging
diff options
context:
space:
mode:
authorPaolo Abeni <pabeni@redhat.com>2024-11-19 13:27:50 +0100
committerPaolo Abeni <pabeni@redhat.com>2024-11-19 13:56:02 +0100
commitdd7207838d38780b51e4690ee508ab2d5057e099 (patch)
treeafcf5e28f88a62efe57bcdff46419084b808839c /drivers/staging
parentmm: page_frag: fix a compile error when kernel is not compiled (diff)
parentMerge branch 'bpf-fix-recursive-lock-and-add-test' (diff)
downloadlinux-dd7207838d38780b51e4690ee508ab2d5057e099.tar.xz
linux-dd7207838d38780b51e4690ee508ab2d5057e099.zip
Merge git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net
Merge in late fixes to prepare for the 6.13 net-next PR. Conflicts: include/linux/phy.h 41ffcd95015f net: phy: fix phylib's dual eee_enabled 721aa69e708b net: phy: convert eee_broken_modes to a linkmode bitmap https://lore.kernel.org/all/20241118135512.1039208b@canb.auug.org.au/ drivers/net/ethernet/wangxun/txgbe/txgbe_phy.c 2160428bcb20 net: txgbe: fix null pointer to pcs 2160428bcb20 net: txgbe: remove GPIO interrupt controller Adjacent commits: include/linux/phy.h 41ffcd95015f net: phy: fix phylib's dual eee_enabled 516a5f11eb97 net: phy: respect cached advertising when re-enabling EEE Signed-off-by: Paolo Abeni <pabeni@redhat.com>
Diffstat (limited to 'drivers/staging')
0 files changed, 0 insertions, 0 deletions