From: Peter Chen <peter.chen@cixtech.com>
To: soc@kernel.org, arm@kernel.org, soc@lists.linux.dev
Cc: fugang.duan@cixtech.com, linux-arm-kernel@lists.infradead.org,
cix-kernel-upstream@cixtech.com
Subject: [GIT PULL] CIX arm64 defconfig changes for v7.2-rc1
Date: Mon, 11 May 2026 10:27:35 +0800 [thread overview]
Message-ID: <agE+l8yT5a48G4XT@nchen-desktop> (raw)
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
reply other threads:[~2026-05-11 2:28 UTC|newest]
Thread overview: [no followups] expand[flat|nested] mbox.gz Atom feed
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=agE+l8yT5a48G4XT@nchen-desktop \
--to=peter.chen@cixtech.com \
--cc=arm@kernel.org \
--cc=cix-kernel-upstream@cixtech.com \
--cc=fugang.duan@cixtech.com \
--cc=linux-arm-kernel@lists.infradead.org \
--cc=soc@kernel.org \
--cc=soc@lists.linux.dev \
/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