* [GIT PULL] CIX arm64 defconfig changes for v7.2-rc1
@ 2026-05-11 2:27 Peter Chen
0 siblings, 0 replies; only message in thread
From: Peter Chen @ 2026-05-11 2:27 UTC (permalink / raw)
To: soc, arm, soc; +Cc: fugang.duan, linux-arm-kernel, cix-kernel-upstream
Hi Arnd,
Please note: it may get merge conflict with soc/defconfig branch
since I got below merge conflict message from Thierry Reding at
May 8th.
Today's linux-next merge of the cix tree got a conflict in:
arch/arm64/configs/defconfig
between commit:
f54f7979ff88 ("arm64: defconfig: Move entries to match savedefconfig")
from the arm-soc trees and commit:
f4f1e3bdb5f9 ("arm64: defconfig: Enable CIX Sky1 pinctrl, PCIe host, and Cadence GPIO")
from the cix tree.
The following changes since commit 254f49634ee16a731174d2ae34bc50bd5f45e731:
Linux 7.1-rc1 (2026-04-26 14:19:00 -0700)
are available in the Git repository at:
git://git.kernel.org/pub/scm/linux/kernel/git/peter.chen/cix.git/ tags/cix-defconfig-v7.2-rc1
for you to fetch changes up to 246e37739f24b00a5559535dc814a315e7774639:
arm64: defconfig: Enable CIX Sky1 pinctrl, PCIe host, and Cadence GPIO (2026-05-09 18:15:49 +0800)
----------------------------------------------------------------
- Enable CIX Sky1 pinctrl, PCIe host, and Cadence GPIO for CIX platform
----------------------------------------------------------------
Peter Chen (1):
arm64: defconfig: Enable CIX Sky1 pinctrl, PCIe host, and Cadence GPIO
arch/arm64/configs/defconfig | 3 +++
1 file changed, 3 insertions(+)
--
Best regards,
Peter
^ permalink raw reply [flat|nested] only message in thread
only message in thread, other threads:[~2026-05-11 2:28 UTC | newest]
Thread overview: (only message) (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2026-05-11 2:27 [GIT PULL] CIX arm64 defconfig changes for v7.2-rc1 Peter Chen
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox