From: "Luca Weiss" <luca.weiss@fairphone.com>
To: "Mark Brown" <broonie@kernel.org>
Cc: "Greg Kroah-Hartman" <gregkh@linuxfoundation.org>,
"Rob Herring" <robh@kernel.org>,
"Krzysztof Kozlowski" <krzk+dt@kernel.org>,
"Conor Dooley" <conor+dt@kernel.org>,
"Felipe Balbi" <balbi@kernel.org>,
"Srinivas Kandagatla" <srini@kernel.org>,
"Liam Girdwood" <lgirdwood@gmail.com>,
"Jaroslav Kysela" <perex@perex.cz>,
"Takashi Iwai" <tiwai@suse.com>,
"Bjorn Andersson" <andersson@kernel.org>,
"Konrad Dybcio" <konradybcio@kernel.org>,
"Wesley Cheng" <quic_wcheng@quicinc.com>,
"Stephan Gerhold" <stephan.gerhold@linaro.org>,
<~postmarketos/upstreaming@lists.sr.ht>,
<phone-devel@vger.kernel.org>, <linux-usb@vger.kernel.org>,
<devicetree@vger.kernel.org>, <linux-kernel@vger.kernel.org>,
"Krzysztof Kozlowski" <krzysztof.kozlowski@linaro.org>,
<linux-arm-msm@vger.kernel.org>, <linux-sound@vger.kernel.org>,
"Dmitry Baryshkov" <dmitry.baryshkov@oss.qualcomm.com>
Subject: Re: [PATCH v2 0/5] Enable USB audio offloading on Fairphone 4 smartphone
Date: Wed, 23 Jul 2025 14:35:36 +0200 [thread overview]
Message-ID: <DBJFT72B59MC.RIRP9YSHOX98@fairphone.com> (raw)
In-Reply-To: <00c2ac7c-763f-467f-8199-76de9f5d71b0@sirena.org.uk>
On Wed Jul 23, 2025 at 2:19 PM CEST, Mark Brown wrote:
> On Wed, Jul 23, 2025 at 01:09:35PM +0200, Luca Weiss wrote:
>> On Wed Jul 23, 2025 at 12:57 PM CEST, Mark Brown wrote:
>
>> > As previously discussed they won't apply until after the merge window.
>
>> Sorry about that, I thought the conflict was for the 6.16 merge window,
>> not 6.17?
>
> There is a conflict. You could check this yourself...
I see now where the conflict is, due to an updated previous patch.
I will send a v3 shortly with that resolved. Then it applies on your
for-next branch cleanly.
Regards
Luca
next prev parent reply other threads:[~2025-07-23 12:35 UTC|newest]
Thread overview: 17+ messages / expand[flat|nested] mbox.gz Atom feed top
2025-05-01 6:48 [PATCH v2 0/5] Enable USB audio offloading on Fairphone 4 smartphone Luca Weiss
2025-05-01 6:48 ` [PATCH v2 1/5] ASoC: dt-bindings: qcom,q6afe: Document q6usb subnode Luca Weiss
2025-05-09 22:03 ` Rob Herring (Arm)
2025-05-01 6:48 ` [PATCH v2 2/5] ASoC: dt-bindings: qcom,sm8250: Add Fairphone 4 sound card Luca Weiss
2025-05-01 6:48 ` [PATCH v2 3/5] ASoC: qcom: sm8250: Add Fairphone 4 soundcard compatible Luca Weiss
2025-05-01 6:48 ` [PATCH v2 4/5] arm64: dts: qcom: sm6350: Add q6usbdai node Luca Weiss
2025-05-01 8:23 ` Konrad Dybcio
2025-05-01 6:48 ` [PATCH v2 5/5] arm64: dts: qcom: sm7225-fairphone-fp4: Enable USB audio offload support Luca Weiss
2025-05-01 8:24 ` Konrad Dybcio
2025-07-16 7:19 ` [PATCH v2 0/5] Enable USB audio offloading on Fairphone 4 smartphone Luca Weiss
2025-07-21 6:22 ` Luca Weiss
2025-07-23 10:57 ` Mark Brown
2025-07-23 11:09 ` Luca Weiss
2025-07-23 12:19 ` Mark Brown
2025-07-23 12:35 ` Luca Weiss [this message]
2025-07-17 4:31 ` (subset) " Bjorn Andersson
2025-07-23 16:48 ` Mark Brown
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=DBJFT72B59MC.RIRP9YSHOX98@fairphone.com \
--to=luca.weiss@fairphone.com \
--cc=andersson@kernel.org \
--cc=balbi@kernel.org \
--cc=broonie@kernel.org \
--cc=conor+dt@kernel.org \
--cc=devicetree@vger.kernel.org \
--cc=dmitry.baryshkov@oss.qualcomm.com \
--cc=gregkh@linuxfoundation.org \
--cc=konradybcio@kernel.org \
--cc=krzk+dt@kernel.org \
--cc=krzysztof.kozlowski@linaro.org \
--cc=lgirdwood@gmail.com \
--cc=linux-arm-msm@vger.kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-sound@vger.kernel.org \
--cc=linux-usb@vger.kernel.org \
--cc=perex@perex.cz \
--cc=phone-devel@vger.kernel.org \
--cc=quic_wcheng@quicinc.com \
--cc=robh@kernel.org \
--cc=srini@kernel.org \
--cc=stephan.gerhold@linaro.org \
--cc=tiwai@suse.com \
--cc=~postmarketos/upstreaming@lists.sr.ht \
/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).