linux-kernel - linux-next: manual merge of the broadcom tree with Linus' 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: <20250603115255.5639c99b@canb.auug.org.au>
Date: Tue, 3 Jun 2025 11:52:55 +1000
From: Stephen Rothwell <sfr@...b.auug.org.au>
To: Florian Fainelli <f.fainelli@...il.com>
Cc: Andrea della Porta <andrea.porta@...e.com>, Dominik Haller
 <d.haller@...tec.de>, Florian Fainelli <florian.fainelli@...adcom.com>,
 Linux Kernel Mailing List <linux-kernel@...r.kernel.org>, Linux Next
 Mailing List <linux-next@...r.kernel.org>, Nishanth Menon <nm@...com>
Subject: linux-next: manual merge of the broadcom tree with Linus' tree

Hi all,

Today's linux-next merge of the broadcom tree got a conflict in:

  arch/arm64/configs/defconfig

between commit:

  8d8f28da8f90 ("arm64: defconfig: Enable TMP102 as module")

from Linus' tree and commit:

  10c68f40b86e ("arm64: defconfig: Enable RP1 misc/clock/gpio drivers")

from the broadcom 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 1e99db100607,ccf2f50673a3..000000000000
--- a/arch/arm64/configs/defconfig
+++ b/arch/arm64/configs/defconfig
@@@ -706,7 -703,7 +707,8 @@@ CONFIG_SENSORS_RASPBERRYPI_HWMON=
  CONFIG_SENSORS_SL28CPLD=m
  CONFIG_SENSORS_INA2XX=m
  CONFIG_SENSORS_INA3221=m
 +CONFIG_SENSORS_TMP102=m
+ CONFIG_MISC_RP1=m
  CONFIG_THERMAL_GOV_POWER_ALLOCATOR=y
  CONFIG_CPU_THERMAL=y
  CONFIG_DEVFREQ_THERMAL=y

Content of type "application/pgp-signature" skipped