Jakub Kicinski <kuba@xxxxxxxxxx> writes:
> On Thu, 26 Aug 2021 16:38:35 +0200 Greg Kroah-Hartman wrote:
>> > I did some investiation and I suspect that commit ce78ffa3ef16 ("net:
>> > really fix the build...")[1] is for handling a conflict between net-next
>> > and char-misc-next trees related to Loic's commit 0092a1e3f763 ("bus:
>> > mhi: Add inbound buffers allocation flag"). Greg mentions this in a
>> > commit[2]:
>> >
>> > commit 813272ed5238b37c81e448b302048e8008570121
>> > Merge: de0534df9347 36a21d51725a
>> > Author: Greg Kroah-Hartman <gregkh@xxxxxxxxxxxxxxxxxxx>
>> >
>> > Merge 5.14-rc5 into char-misc-next
>> >
>> > We need the fixes in here as well, and resolves some merge issues with
>> > the mhi codebase.
>> >
>> > If my assumption is correct when I propose that we revert commit
>> > ce78ffa3ef16 for v5.14, AFAICS it's not really needed for v5.14 (commit
>> > 0092a1e3f763 is in -next, not in Linus' tree yet) and commit
>> > ce78ffa3ef16 breaks ath11k. And the conflict between net-next and
>> > char-misc-next can be then later fixed during the merge window.
>> >
>> > Will this work for everyone? If no objections, I'll submit the revert to
>> > Linus later today. We are getting really close to final v5.14 release so
>> > not much time left to fix this.
>> >
>> > Just to reiterate why the urgency: commit ce78ffa3ef16 broke ath11k in
>> > v5.14-rc5, users have reported (and I have confirmed) that at least
>> > QCA6390 support is broken but I suspect all Qualcomm Wi-Fi 6 devices
>> > supported by ath11k are currently broken.
>>
>> No objection from me for reverting that, if it fixes the problems you
>> are seeing for 5.14-final.
>>
>> The goal was for the mhi changes to go through the networking tree in
>> the first place, I don't see how this got out of sync.
>>
>> If this is reverted, some help on how to resolve the merge issues it
>> will cause would be appreciated.
>
> Also no objections here. FWIW I'm about to send the last PR for
> networking, still waiting on BPF. You can send the revert to netdev,
> or directly to Linus as you prefer. LMK.
I prefer take it via the net tree if possible, so if you can wait ~2h
and I'll send it to you.
--
https://patchwork.kernel.org/project/linux-wireless/list/
https://wireless.wiki.kernel.org/en/developers/documentation/submittingpatches
