Received-SPF: pass (google.com: domain of linux-wireless-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) client-ip=23.128.96.18;
Sender: kvalo=codeaurora.org@mg.codeaurora.org
DMARC-Filter: OpenDMARC Filter v1.4.1 smtp.codeaurora.org 4D754C4338F
From:   Kalle Valo <kvalo@codeaurora.org>
To:     Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Cc:     "David S. Miller" <davem@davemloft.net>,
        Jakub Kicinski <kuba@kernel.org>,
        Linus Torvalds <torvalds@linuxfoundation.org>,
        Wren Turkal <wt@penguintechs.org>, ath11k@lists.infradead.org,
        linux-wireless@vger.kernel.org, regressions@lists.linux.dev,
        Manivannan Sadhasivam <manivannan.sadhasivam@linaro.org>,
        Hemant Kumar <hemantk@codeaurora.org>,
        Loic Poulain <loic.poulain@linaro.org>,
        Nicolas Schichan <nschichan@freebox.fr>
Subject: Re: [regression] Re: 5.14 rc6 broken for QCA6390 on Dell XPS 13 9310
References: <a8cddf24-ecfc-088e-27f4-98cbbb5fb67c@penguintechs.org>
        <87y28sqq4l.fsf@codeaurora.org>
        <843e7689-fa1e-441b-c49a-ed7291046d5f@freebox.fr>
        <87tujgqcth.fsf@codeaurora.org> <87mtp47073.fsf_-_@codeaurora.org>
        <YSenaxWzxRkYkucv@kroah.com>
Date:   Fri, 27 Aug 2021 15:46:50 +0300
In-Reply-To: <YSenaxWzxRkYkucv@kroah.com> (Greg Kroah-Hartman's message of
        "Thu, 26 Aug 2021 16:38:35 +0200")
Message-ID: <87k0k75a2t.fsf@codeaurora.org>
User-Agent: Gnus/5.13 (Gnus v5.13) Emacs/26.1 (gnu/linux)
MIME-Version: 1.0
Content-Type: text/plain
Precedence: bulk

Greg Kroah-Hartman <gregkh@linuxfoundation.org> writes:

>> 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@linuxfoundation.org>
>> 
>>     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.

Thanks!

> 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.

Yes, I'll help with this. I see that Stephen already reported the
reappeared merge issue. It's just that I'm not familiar with inner
workings of the MHI subsystem, but I can test code etc.

-- 
https://patchwork.kernel.org/project/linux-wireless/list/

https://wireless.wiki.kernel.org/en/developers/documentation/submittingpatches