From: "Arnd Bergmann" <arnd@arndb.de>
To: "Bjorn Andersson" <andersson@kernel.org>, arm <arm@kernel.org>,
soc@kernel.org
Cc: linux-arm-msm@vger.kernel.org,
linux-arm-kernel@lists.infradead.org,
"Olof Johansson" <olof@lixom.net>,
"Kevin Hilman" <khilman@baylibre.com>,
"Johan Hovold" <johan+linaro@kernel.org>,
"Dang Huynh" <danct12@riseup.net>,
"Bjorn Andersson" <quic_bjorande@quicinc.com>,
"Konrad Dybcio" <konrad.dybcio@linaro.org>,
"Ajit Pandey" <quic_ajipan@quicinc.com>,
"André Apitzsch" <git@apitzsch.eu>,
"Bartosz Golaszewski" <bartosz.golaszewski@linaro.org>,
"Dmitry Baryshkov" <dmitry.baryshkov@linaro.org>,
"Konrad Dybcio" <quic_kdybcio@quicinc.com>,
"Srinivas Kandagatla" <srinivas.kandagatla@linaro.org>,
Meng-Bo <linmengbo06890@proton.me>,
"Naina Mehta" <quic_nainmeht@quicinc.com>,
"Rayyan Ansari" <rayyan.ansari@linaro.org>,
"Tengfei Fan" <quic_tengfan@quicinc.com>,
"Varadarajan Narayanan" <quic_varada@quicinc.com>,
"Abel Vesa" <abel.vesa@linaro.org>,
"Alexander Reimelt" <alexander.reimelt@posteo.de>,
"AngeloGioacchino Del Regno"
<angelogioacchino.delregno@somainline.org>,
"Barnabás Czémán" <barnabas.czeman@mainlining.org>,
"Neil Armstrong" <neil.armstrong@linaro.org>,
"Nikita Travkin" <nikita@trvn.ru>,
"Raymond Hackley" <raymondhackley@protonmail.com>,
"Satya Priya Kakitapalli" <quic_skakitap@quicinc.com>,
"Vladimir Zapolskiy" <vladimir.zapolskiy@linaro.org>,
"Adam Słaboń" <asaillen@protonmail.com>,
"Amit Pundir" <amit.pundir@linaro.org>,
"Ankit Sharma" <quic_anshar@quicinc.com>,
"Anton Bambura" <jenneron@postmarketos.org>,
"Bryan O'Donoghue" <bryan.odonoghue@linaro.org>,
"Danila Tikhonov" <danila@jiaxyga.com>,
"Krishna Kurapati" <quic_kriskura@quicinc.com>,
"Krzysztof Kozlowski" <krzysztof.kozlowski@linaro.org>,
"Ling Xu" <quic_lxu5@quicinc.com>,
"Patrick Wildt" <patrick@blueri.se>,
"Qingqing Zhou" <quic_qqzhou@quicinc.com>,
"Rajendra Nayak" <quic_rjendra@quicinc.com>,
"Rob Clark" <robdclark@chromium.org>,
"Sachin Gupta" <quic_sachgupt@quicinc.com>,
"Sagar Cheluvegowda" <quic_scheluve@quicinc.com>,
"Stephan Gerhold" <stephan.gerhold@linaro.org>
Subject: Re: [GIT PULL] Qualcomm Arm64 DeviceTree updates for v6.12
Date: Thu, 05 Sep 2024 10:31:44 +0000 [thread overview]
Message-ID: <23cb916f-9870-4c5c-bf1d-6a281b99dea0@app.fastmail.com> (raw)
In-Reply-To: <20240904215752.24465-1-andersson@kernel.org>
On Wed, Sep 4, 2024, at 21:57, Bjorn Andersson wrote:
> The following changes since commit 8400291e289ee6b2bf9779ff1c83a291501f017b:
>
> Linux 6.11-rc1 (2024-07-28 14:19:55 -0700)
>
> are available in the Git repository at:
>
> https://git.kernel.org/pub/scm/linux/kernel/git/qcom/linux.git
> tags/qcom-arm64-for-6.12
>
> for you to fetch changes up to ba728bda663b0e812cb20450d18af5d0edd803a2:
>
> arm64: dts: qcom: x1e80100: Fix PHY for DP2 (2024-08-30 21:40:28 -0500)
FYI, this had the same issue as the drivers branch, with contents
of the previously merged upstream branch showing up again:
> Johan Hovold (24):
> arm64: dts: qcom: sc8280xp-crd: disable PCIe perst pull downs
> arm64: dts: qcom: sc8280xp-crd: clean up PCIe2a pinctrl node
> arm64: dts: qcom: sc8280xp-x13s: disable PCIe perst pull downs
> arm64: dts: qcom: sc8280xp-x13s: clean up PCIe2a pinctrl node
> arm64: dts: qcom: x1e80100-crd: fix PCIe4 PHY supply
> arm64: dts: qcom: x1e80100: fix PCIe domain numbers
> ...
I assume you also included these to avoid merge conflicts, but if there
are only a few trivial conflicts, I would normally prefer to resolve
them myself and get a cleaner merge history.
I verified that the commits above are the ones I already merged, rather
than another copy with different commit IDs and merged the branch now.
Arnd
parent reply other threads:[~2024-09-05 10:33 UTC|newest]
Thread overview: expand[flat|nested] mbox.gz Atom feed
[parent not found: <20240904215752.24465-1-andersson@kernel.org>]
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=23cb916f-9870-4c5c-bf1d-6a281b99dea0@app.fastmail.com \
--to=arnd@arndb.de \
--cc=abel.vesa@linaro.org \
--cc=alexander.reimelt@posteo.de \
--cc=amit.pundir@linaro.org \
--cc=andersson@kernel.org \
--cc=angelogioacchino.delregno@somainline.org \
--cc=arm@kernel.org \
--cc=asaillen@protonmail.com \
--cc=barnabas.czeman@mainlining.org \
--cc=bartosz.golaszewski@linaro.org \
--cc=bryan.odonoghue@linaro.org \
--cc=danct12@riseup.net \
--cc=danila@jiaxyga.com \
--cc=dmitry.baryshkov@linaro.org \
--cc=git@apitzsch.eu \
--cc=jenneron@postmarketos.org \
--cc=johan+linaro@kernel.org \
--cc=khilman@baylibre.com \
--cc=konrad.dybcio@linaro.org \
--cc=krzysztof.kozlowski@linaro.org \
--cc=linmengbo06890@proton.me \
--cc=linux-arm-kernel@lists.infradead.org \
--cc=linux-arm-msm@vger.kernel.org \
--cc=neil.armstrong@linaro.org \
--cc=nikita@trvn.ru \
--cc=olof@lixom.net \
--cc=patrick@blueri.se \
--cc=quic_ajipan@quicinc.com \
--cc=quic_anshar@quicinc.com \
--cc=quic_bjorande@quicinc.com \
--cc=quic_kdybcio@quicinc.com \
--cc=quic_kriskura@quicinc.com \
--cc=quic_lxu5@quicinc.com \
--cc=quic_nainmeht@quicinc.com \
--cc=quic_qqzhou@quicinc.com \
--cc=quic_rjendra@quicinc.com \
--cc=quic_sachgupt@quicinc.com \
--cc=quic_scheluve@quicinc.com \
--cc=quic_skakitap@quicinc.com \
--cc=quic_tengfan@quicinc.com \
--cc=quic_varada@quicinc.com \
--cc=raymondhackley@protonmail.com \
--cc=rayyan.ansari@linaro.org \
--cc=robdclark@chromium.org \
--cc=soc@kernel.org \
--cc=srinivas.kandagatla@linaro.org \
--cc=stephan.gerhold@linaro.org \
--cc=vladimir.zapolskiy@linaro.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).