[GIT PULL] Qualcomm Arm64 DeviceTree updates for v6.12
Arnd Bergmann
arnd at arndb.de
Thu Sep 5 03:31:44 PDT 2024
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
More information about the linux-arm-kernel
mailing list