git.ipfire.org Git - thirdparty/kernel/linux.git/commit

]> git.ipfire.org Git - thirdparty/kernel/linux.git/commit

projects / thirdparty / kernel / linux.git / commit

author	Jakub Kicinski <kuba@kernel.org>
	Thu, 13 Nov 2025 20:32:50 +0000 (12:32 -0800)
committer	Jakub Kicinski <kuba@kernel.org>
	Thu, 13 Nov 2025 20:35:38 +0000 (12:35 -0800)
commit	c99ebb6132595b4b288a413981197eb076547c5a
tree	6ef2de29b7afb5f1107b8e11489c09f0a5290260	tree \| snapshot
parent	f694d215d34035cc64b1d176fd82db0d1f2428d4	commit \| diff
parent	d0309c054362a235077327b46f727bc48878a3bc	commit \| diff

Merge git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net

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

No conflicts, adjacent changes in:

drivers/net/phy/micrel.c
96a9178a29a6 ("net: phy: micrel: lan8814 fix reset of the QSGMII interface")
61b7ade9ba8c ("net: phy: micrel: Add support for non PTP SKUs for lan8814")

and a trivial one in tools/testing/selftests/drivers/net/Makefile.

Signed-off-by: Jakub Kicinski <kuba@kernel.org>

18 files changed:

MAINTAINERS	diff1 \|	diff2 \|	blob \| history
drivers/net/bonding/bond_main.c	diff1 \|	diff2 \|	blob \| history
drivers/net/ethernet/freescale/fec_main.c	diff1 \|	diff2 \|	blob \| history
drivers/net/ethernet/mellanox/mlx5/core/en_main.c	diff1 \|	diff2 \|	blob \| history
drivers/net/phy/micrel.c	diff1 \|	diff2 \|	blob \| history
drivers/net/virtio_net.c	diff1 \|	diff2 \|	blob \| history
drivers/net/wireless/ath/ath11k/wmi.c	diff1 \|	diff2 \|	blob \| history
drivers/net/wireless/intel/iwlwifi/mld/link.c	diff1 \|	diff2 \|	blob \| history
drivers/net/wireless/intel/iwlwifi/mvm/utils.c	diff1 \|	diff2 \|	blob \| history
drivers/net/wireless/virtual/mac80211_hwsim.c	diff1 \|	diff2 \|	blob \| history
fs/smb/server/transport_tcp.c	diff1 \|	diff2 \|	blob \| history
net/mac80211/iface.c	diff1 \|	diff2 \|	blob \| history
net/mac80211/rx.c	diff1 \|	diff2 \|	blob \| history
net/sched/sch_generic.c	diff1 \|	diff2 \|	blob \| history
net/strparser/strparser.c	diff1 \|	diff2 \|	blob \| history
tools/testing/selftests/drivers/net/Makefile	diff1 \|	diff2 \|	blob \| history
tools/testing/selftests/net/mptcp/mptcp_connect.c	diff1 \|	diff2 \|	blob \| history
tools/testing/selftests/net/mptcp/mptcp_join.sh	diff1 \|	diff2 \|	blob \| history

A mirror of Linus' kernel repository

RSS Atom

MAINTAINERS	diff1 \|	diff2 \|	blob \| history
drivers/net/bonding/bond_main.c	diff1 \|	diff2 \|	blob \| history
drivers/net/ethernet/freescale/fec_main.c	diff1 \|	diff2 \|	blob \| history
drivers/net/ethernet/mellanox/mlx5/core/en_main.c	diff1 \|	diff2 \|	blob \| history
drivers/net/phy/micrel.c	diff1 \|	diff2 \|	blob \| history
drivers/net/virtio_net.c	diff1 \|	diff2 \|	blob \| history
drivers/net/wireless/ath/ath11k/wmi.c	diff1 \|	diff2 \|	blob \| history
drivers/net/wireless/intel/iwlwifi/mld/link.c	diff1 \|	diff2 \|	blob \| history
drivers/net/wireless/intel/iwlwifi/mvm/utils.c	diff1 \|	diff2 \|	blob \| history
drivers/net/wireless/virtual/mac80211_hwsim.c	diff1 \|	diff2 \|	blob \| history
fs/smb/server/transport_tcp.c	diff1 \|	diff2 \|	blob \| history
net/mac80211/iface.c	diff1 \|	diff2 \|	blob \| history
net/mac80211/rx.c	diff1 \|	diff2 \|	blob \| history
net/sched/sch_generic.c	diff1 \|	diff2 \|	blob \| history
net/strparser/strparser.c	diff1 \|	diff2 \|	blob \| history
tools/testing/selftests/drivers/net/Makefile	diff1 \|	diff2 \|	blob \| history
tools/testing/selftests/net/mptcp/mptcp_connect.c	diff1 \|	diff2 \|	blob \| history
tools/testing/selftests/net/mptcp/mptcp_join.sh	diff1 \|	diff2 \|	blob \| history