* heads-up: wireless/wireless-next merge conflict
@ 2023-09-11 17:15 Johannes Berg
0 siblings, 0 replies; only message in thread
From: Johannes Berg @ 2023-09-11 17:15 UTC (permalink / raw)
To: Stephen Rothwell; +Cc: linux-next, linux-wireless
Hi,
FYI, there's a merge conflict in wireless vs. wireless-next coming.
I've pushed a resolution to wireless-next/merge-2023-09-11 for you to
use if you like, it's non-trivial due to major locking rework in
wireless-next.
johannes
^ permalink raw reply [flat|nested] only message in thread
only message in thread, other threads:[~2023-09-11 21:40 UTC | newest]
Thread overview: (only message) (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2023-09-11 17:15 heads-up: wireless/wireless-next merge conflict Johannes Berg
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).