From: Bjorn Andersson <andersson@kernel.org>
Date: Thu, 6 Jun 2024 22:38:08 +0000 (-0500)
Subject: Merge branch 'arm64-fixes-for-6.10' into arm64-for-6.11
X-Git-Tag: io_uring-6.11-20240722~96^2~8^2~116
X-Git-Url: https://git.kernel.dk/?a=commitdiff_plain;h=80edfc18de69508e37b6668d668194a3e9556f5e;p=linux-block.git

Merge branch 'arm64-fixes-for-6.10' into arm64-for-6.11

Merge the arm64-fixes-for-6.10 branch into arm64-for-6.11 to resolve the
merge conflict caused by pmic-glink and reserved-memory introduction at
the same place in the x1e80100 crd and qcp dts files.
---

80edfc18de69508e37b6668d668194a3e9556f5e