From: Stephen Rothwell <sfr@canb•auug.org.au>
To: Andy Gross <agross@kernel•org>, Hector Martin <marcan@marcan•st>
Cc: Bjorn Andersson <andersson@kernel•org>,
Janne Grunau <j@jannau•net>,
Krzysztof Kozlowski <krzk@kernel•org>,
Linux Kernel Mailing List <linux-kernel@vger•kernel.org>,
Linux Next Mailing List <linux-next@vger•kernel.org>,
Sven Peter <sven@kernel•org>
Subject: linux-next: manual merge of the qcom tree with the asahi-soc tree
Date: Fri, 9 Jan 2026 10:41:21 +1100 [thread overview]
Message-ID: <20260109104121.3f56ed64@canb.auug.org.au> (raw)
[-- Attachment #1: Type: text/plain, Size: 1301 bytes --]
Hi all,
Today's linux-next merge of the qcom tree got a conflict in:
arch/arm64/configs/defconfig
between commit:
8c7a1d258d88 ("arm64: defconfig: Enable Apple Silicon drivers")
from the asahi-soc tree and commit:
9f262627a90c ("arm64: defconfig: Enable EC drivers for Qualcomm-based laptops")
from the qcom tree.
I fixed it up (see below) and can carry the fix as necessary. This
is now fixed as far as linux-next is concerned, but any non trivial
conflicts should be mentioned to your upstream maintainer when your tree
is submitted for merging. You may also want to consider cooperating
with the maintainer of the conflicting tree to minimise any particularly
complex conflicts.
--
Cheers,
Stephen Rothwell
diff --cc arch/arm64/configs/defconfig
index b68588559e2c,b260202c2480..000000000000
--- a/arch/arm64/configs/defconfig
+++ b/arch/arm64/configs/defconfig
@@@ -1381,7 -1364,10 +1383,11 @@@ CONFIG_CROS_EC_RPMSG=
CONFIG_CROS_EC_SPI=y
CONFIG_CROS_KBD_LED_BACKLIGHT=m
CONFIG_CROS_EC_CHARDEV=m
+ CONFIG_EC_ACER_ASPIRE1=m
+ CONFIG_EC_HUAWEI_GAOKUN=m
+ CONFIG_EC_LENOVO_YOGA_C630=m
+ CONFIG_EC_LENOVO_THINKPAD_T14S=m
+CONFIG_COMMON_CLK_APPLE_NCO=m
CONFIG_COMMON_CLK_RK808=y
CONFIG_COMMON_CLK_SCMI=y
CONFIG_COMMON_CLK_SCPI=y
[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 488 bytes --]
reply other threads:[~2026-01-08 23:41 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=20260109104121.3f56ed64@canb.auug.org.au \
--to=sfr@canb$(echo .)auug.org.au \
--cc=agross@kernel$(echo .)org \
--cc=andersson@kernel$(echo .)org \
--cc=j@jannau$(echo .)net \
--cc=krzk@kernel$(echo .)org \
--cc=linux-kernel@vger$(echo .)kernel.org \
--cc=linux-next@vger$(echo .)kernel.org \
--cc=marcan@marcan$(echo .)st \
--cc=sven@kernel$(echo .)org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
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