]> git.ipfire.org Git - thirdparty/linux.git/commit
projects / thirdparty / linux.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: db03488 36efaca)
Merge net-next/main to resolve conflicts
authorJohannes Berg <johannes.berg@intel.com>
Wed, 9 Oct 2024 06:59:14 +0000 (08:59 +0200)
committerJohannes Berg <johannes.berg@intel.com>
Wed, 9 Oct 2024 06:59:22 +0000 (08:59 +0200)
commita0efa2f362a69e47b9d8b48f770ef3a0249a7911
tree384d2c79a9b613213ef7591583d820d18c7be9c3tree
parentdb03488897a70367aeafe82d07a78943d2a6068ecommit | diff
parent36efaca9cb28a893cad98f0448c39a8b698859e2commit | diff
Merge net-next/main to resolve conflicts

The wireless-next tree was based on something older, and there
are now conflicts between -rc2 and work here. Merge net-next,
which has enough of -rc2 for the conflicts to happen, resolving
them in the process.

Signed-off-by: Johannes Berg <johannes.berg@intel.com>
12 files changed:
Documentation/networking/net_cachelines/net_device.rst diff1 | diff2 | blob | history
drivers/net/wireless/broadcom/brcm80211/brcmfmac/pcie.c diff1 | diff2 | blob | history
drivers/net/wireless/broadcom/brcm80211/brcmfmac/sdio.c diff1 | diff2 | blob | history
drivers/staging/Kconfig diff1 | diff2 | blob | history
drivers/staging/Makefile diff1 | diff2 | blob | history
drivers/staging/vt6655/TODO diff1 | diff2 | blob | history
include/linux/netdevice.h diff1 | diff2 | blob | history
net/mac80211/mesh.c diff1 | diff2 | blob | history
net/mac80211/mesh_hwmp.c diff1 | diff2 | blob | history
net/mac80211/tkip.c diff1 | diff2 | blob | history
net/mac80211/tx.c diff1 | diff2 | blob | history
net/wireless/radiotap.c diff1 | diff2 | blob | history
A mirror of Linus' kernel repository