projects / linux-block.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: f1078ab f315296)
Merge git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net
authorJakub Kicinski <kuba@kernel.org>
Thu, 6 Mar 2025 21:01:27 +0000 (13:01 -0800)
committerJakub Kicinski <kuba@kernel.org>
Thu, 6 Mar 2025 21:03:35 +0000 (13:03 -0800)
commit2525e16a2bae322641fd745412f3524d4455d8df
treeb1b2646362b8cc89fe3cf4eece698810fbb05c55tree
parentf1078ab18818542a90e59be420448bd8034bc332commit | diff
parentf315296c92fd4b7716bdea17f727ab431891dc3bcommit | diff
Merge git://git./linux/kernel/git/netdev/net

Cross-merge networking fixes after downstream PR (net-6.14-rc6).

Conflicts:

net/ethtool/cabletest.c
  2bcf4772e45a ("net: ethtool: try to protect all callback with netdev instance lock")
  637399bf7e77 ("net: ethtool: netlink: Allow NULL nlattrs when getting a phy_device")

No Adjacent changes.

Signed-off-by: Jakub Kicinski <kuba@kernel.org>
17 files changed:
MAINTAINERS diff1 | diff2 | blob | history
drivers/net/dsa/mt7530.c diff1 | diff2 | blob | history
drivers/net/ethernet/stmicro/stmmac/dwmac-loongson.c diff1 | diff2 | blob | history
drivers/net/ppp/ppp_generic.c diff1 | diff2 | blob | history
drivers/net/wireless/intel/iwlwifi/fw/dbg.c diff1 | diff2 | blob | history
drivers/net/wireless/intel/iwlwifi/mvm/d3.c diff1 | diff2 | blob | history
drivers/net/wireless/intel/iwlwifi/mvm/time-event.c diff1 | diff2 | blob | history
net/ethtool/cabletest.c diff1 | diff2 | blob | history
net/ethtool/netlink.c diff1 | diff2 | blob | history
net/ethtool/phy.c diff1 | diff2 | blob | history
net/ipv4/tcp_offload.c diff1 | diff2 | blob | history
net/ipv4/udp_offload.c diff1 | diff2 | blob | history
net/mac80211/iface.c diff1 | diff2 | blob | history
net/mac80211/mlme.c diff1 | diff2 | blob | history
net/mac80211/util.c diff1 | diff2 | blob | history
net/mptcp/pm_netlink.c diff1 | diff2 | blob | history
net/wireless/nl80211.c diff1 | diff2 | blob | history
Linux 6.x block layer and io_uring tree(s)