From: Kalle Valo <kvalo@codeaurora.org>
To: Jakub Kicinski <kuba@kernel.org>
Cc: Greg Kroah-Hartman <gregkh@linuxfoundation.org>,
"David S. Miller" <davem@davemloft.net>,
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
Date: Thu, 26 Aug 2021 20:33:47 +0300 [thread overview]
Message-ID: <87y28o5cw4.fsf@codeaurora.org> (raw)
In-Reply-To: <87eeag6yjr.fsf@codeaurora.org> (Kalle Valo's message of "Thu, 26 Aug 2021 18:00:40 +0300")
Kalle Valo <kvalo@codeaurora.org> writes:
> Jakub Kicinski <kuba@kernel.org> 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@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.
>>>
>>> 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.
I now submitted the revert, please take it into the net tree if you
still can:
https://patchwork.kernel.org/project/netdevbpf/patch/20210826172816.24478-1-kvalo@codeaurora.org/
I also tested the build with various QRTR options and didn't see any
build errors.
--
https://patchwork.kernel.org/project/linux-wireless/list/
https://wireless.wiki.kernel.org/en/developers/documentation/submittingpatches
next prev parent reply other threads:[~2021-08-26 17:34 UTC|newest]
Thread overview: 15+ messages / expand[flat|nested] mbox.gz Atom feed top
[not found] <a8cddf24-ecfc-088e-27f4-98cbbb5fb67c@penguintechs.org>
2021-08-23 12:53 ` 5.14 rc6 broken for QCA6390 on Dell XPS 13 9310 Kalle Valo
2021-08-23 16:02 ` Nicolas Schichan
2021-08-23 17:40 ` Kalle Valo
2021-08-26 14:25 ` [regression] " Kalle Valo
2021-08-26 14:38 ` Greg Kroah-Hartman
2021-08-26 14:48 ` Jakub Kicinski
2021-08-26 15:00 ` Kalle Valo
2021-08-26 17:33 ` Kalle Valo [this message]
2021-08-26 18:12 ` Jakub Kicinski
2021-08-27 12:41 ` Kalle Valo
2021-08-30 16:04 ` Nicolas Schichan
2021-08-31 10:37 ` Kalle Valo
2021-08-27 12:46 ` Kalle Valo
2021-08-23 16:17 ` Wren Turkal
2021-08-27 12:43 ` Kalle Valo
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=87y28o5cw4.fsf@codeaurora.org \
--to=kvalo@codeaurora.org \
--cc=ath11k@lists.infradead.org \
--cc=davem@davemloft.net \
--cc=gregkh@linuxfoundation.org \
--cc=hemantk@codeaurora.org \
--cc=kuba@kernel.org \
--cc=linux-wireless@vger.kernel.org \
--cc=loic.poulain@linaro.org \
--cc=manivannan.sadhasivam@linaro.org \
--cc=nschichan@freebox.fr \
--cc=regressions@lists.linux.dev \
--cc=torvalds@linuxfoundation.org \
--cc=wt@penguintechs.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
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).