From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from m43-7.mailgun.net (m43-7.mailgun.net [69.72.43.7]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 702D73FC6 for ; Fri, 27 Aug 2021 12:47:06 +0000 (UTC) DKIM-Signature: a=rsa-sha256; v=1; c=relaxed/relaxed; d=mg.codeaurora.org; q=dns/txt; s=smtp; t=1630068429; h=Content-Type: MIME-Version: Message-ID: In-Reply-To: Date: References: Subject: Cc: To: From: Sender; bh=uG5FVSn/f9JM1ZVPwji494DZnJkYhEBJ3nhkVaTww/A=; b=brHQYMoV1kXDBs+ZXic/37RUbHF7ZThiY1sxB8NwWgWa5glpb9oCuW8psxLu/HWL7758M7Ah Bye1Nej60dvUYKjf9oNSZqP5Vcfw38QQQky3ZvPIaMH1RqdKgIR6shOXWqXApLH5pFI1BZnX GG1HPVNOgtWNQnIf8OwCDnr0t34= X-Mailgun-Sending-Ip: 69.72.43.7 X-Mailgun-Sid: WyI0YzJmNCIsICJyZWdyZXNzaW9uc0BsaXN0cy5saW51eC5kZXYiLCAiYmU5ZTRhIl0= Received: from smtp.codeaurora.org (ec2-35-166-182-171.us-west-2.compute.amazonaws.com [35.166.182.171]) by smtp-out-n05.prod.us-east-1.postgun.com with SMTP id 6128dec3d6653df767c76ad3 (version=TLS1.2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256); Fri, 27 Aug 2021 12:46:59 GMT Sender: kvalo=codeaurora.org@mg.codeaurora.org Received: by smtp.codeaurora.org (Postfix, from userid 1001) id 11B82C43618; Fri, 27 Aug 2021 12:46:59 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-caf-mail-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-2.9 required=2.0 tests=ALL_TRUSTED,BAYES_00,SPF_FAIL autolearn=no autolearn_force=no version=3.4.0 Received: from tykki (tynnyri.adurom.net [51.15.11.48]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) (Authenticated sender: kvalo) by smtp.codeaurora.org (Postfix) with ESMTPSA id 4D754C4338F; Fri, 27 Aug 2021 12:46:55 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.4.1 smtp.codeaurora.org 4D754C4338F Authentication-Results: aws-us-west-2-caf-mail-1.web.codeaurora.org; dmarc=none (p=none dis=none) header.from=codeaurora.org Authentication-Results: aws-us-west-2-caf-mail-1.web.codeaurora.org; spf=fail smtp.mailfrom=codeaurora.org From: Kalle Valo To: Greg Kroah-Hartman Cc: "David S. Miller" , Jakub Kicinski , Linus Torvalds , Wren Turkal , ath11k@lists.infradead.org, linux-wireless@vger.kernel.org, regressions@lists.linux.dev, Manivannan Sadhasivam , Hemant Kumar , Loic Poulain , Nicolas Schichan Subject: Re: [regression] Re: 5.14 rc6 broken for QCA6390 on Dell XPS 13 9310 References: <87y28sqq4l.fsf@codeaurora.org> <843e7689-fa1e-441b-c49a-ed7291046d5f@freebox.fr> <87tujgqcth.fsf@codeaurora.org> <87mtp47073.fsf_-_@codeaurora.org> Date: Fri, 27 Aug 2021 15:46:50 +0300 In-Reply-To: (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) Precedence: bulk X-Mailing-List: regressions@lists.linux.dev List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Type: text/plain Greg Kroah-Hartman 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 >> >> 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