linux-kernel - linux-next: manual merge of the qcom tree with the asahi-soc tree

lists.openwall.net		lists / announce owl-users owl-dev john-users john-dev passwdqc-users yescrypt popa3d-users / oss-security kernel-hardening musl sabotage tlsify passwords / crypt-dev xvendor / Bugtraq Full-Disclosure linux-kernel linux-netdev linux-ext4 linux-hardening linux-cve-announce PHC
Open Source and information security mailing list archives

Hash Suite: Windows password security audit tool. GUI, reports in PDF.

[<prev] [next>] [day] [month] [year] [list]

Message-ID: <20260109104121.3f56ed64@canb.auug.org.au>
Date: Fri, 9 Jan 2026 10:41:21 +1100
From: Stephen Rothwell <sfr@...b.auug.org.au>
To: Andy Gross <agross@...nel.org>, Hector Martin <marcan@...can.st>
Cc: Bjorn Andersson <andersson@...nel.org>, Janne Grunau <j@...nau.net>,
 Krzysztof Kozlowski <krzk@...nel.org>, Linux Kernel Mailing List
 <linux-kernel@...r.kernel.org>, Linux Next Mailing List
 <linux-next@...r.kernel.org>, Sven Peter <sven@...nel.org>
Subject: linux-next: manual merge of the qcom tree with the asahi-soc tree

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

Content of type "application/pgp-signature" skipped