* Re: [GIT PULL] Qualcomm Arm64 DeviceTree updates for v6.12
[not found] <20240904215752.24465-1-andersson@kernel.org>
@ 2024-09-05 10:31 ` Arnd Bergmann
0 siblings, 0 replies; only message in thread
From: Arnd Bergmann @ 2024-09-05 10:31 UTC (permalink / raw)
To: Bjorn Andersson, arm, soc
Cc: linux-arm-msm, linux-arm-kernel, Olof Johansson, Kevin Hilman,
Johan Hovold, Dang Huynh, Bjorn Andersson, Konrad Dybcio,
Ajit Pandey, André Apitzsch, Bartosz Golaszewski,
Dmitry Baryshkov, Konrad Dybcio, Srinivas Kandagatla, Meng-Bo,
Naina Mehta, Rayyan Ansari, Tengfei Fan, Varadarajan Narayanan,
Abel Vesa, Alexander Reimelt, AngeloGioacchino Del Regno,
Barnabás Czémán, Neil Armstrong, Nikita Travkin,
Raymond Hackley, Satya Priya Kakitapalli, Vladimir Zapolskiy,
Adam Słaboń, Amit Pundir, Ankit Sharma, Anton Bambura,
Bryan O'Donoghue, Danila Tikhonov, Krishna Kurapati,
Krzysztof Kozlowski, Ling Xu, Patrick Wildt, Qingqing Zhou,
Rajendra Nayak, Rob Clark, Sachin Gupta, Sagar Cheluvegowda,
Stephan Gerhold
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
^ permalink raw reply [flat|nested] only message in thread