linux-kernel - linux-next: manual merge of the battery tree with the arm-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 for Android: free password hash cracker in your pocket

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

Message-ID: <20230206112143.71d626bd@canb.auug.org.au>
Date:   Mon, 6 Feb 2023 11:21:43 +1100
From:   Stephen Rothwell <sfr@...b.auug.org.au>
To:     Sebastian Reichel <sre@...nel.org>,
        Olof Johansson <olof@...om.net>, Arnd Bergmann <arnd@...db.de>
Cc:     ARM <linux-arm-kernel@...ts.infradead.org>,
        Alina Yu <alina_yu@...htek.com>,
        ChiYuan Huang <cy_huang@...htek.com>,
        ChiaEn Wu <chiaen_wu@...htek.com>,
        Linux Kernel Mailing List <linux-kernel@...r.kernel.org>,
        Linux Next Mailing List <linux-next@...r.kernel.org>,
        Sebastian Reichel <sebastian.reichel@...labora.com>
Subject: linux-next: manual merge of the battery tree with the arm-soc tree

Hi all,

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

  drivers/power/supply/Makefile

between commit:

  a0f831756b26 ("power: remove s3c adc battery driver")

from the arm-soc tree and commits:

  4a1a5f6781d8 ("power: supply: rt9471: Add Richtek RT9471 charger driver")
  6f7f70e3a8dd ("power: supply: rt9467: Add Richtek RT9467 charger driver")

from the battery 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 drivers/power/supply/Makefile
index 8cb3c7f5c111,f8f9716d3ba4..000000000000
--- a/drivers/power/supply/Makefile
+++ b/drivers/power/supply/Makefile
@@@ -52,8 -54,12 +52,10 @@@ obj-$(CONFIG_BATTERY_DA9150)	+= da9150-
  obj-$(CONFIG_BATTERY_MAX17040)	+= max17040_battery.o
  obj-$(CONFIG_BATTERY_MAX17042)	+= max17042_battery.o
  obj-$(CONFIG_BATTERY_MAX1721X)	+= max1721x_battery.o
 -obj-$(CONFIG_BATTERY_Z2)	+= z2_battery.o
  obj-$(CONFIG_BATTERY_RT5033)	+= rt5033_battery.o
  obj-$(CONFIG_CHARGER_RT9455)	+= rt9455_charger.o
+ obj-$(CONFIG_CHARGER_RT9467)	+= rt9467-charger.o
+ obj-$(CONFIG_CHARGER_RT9471)	+= rt9471.o
 -obj-$(CONFIG_BATTERY_S3C_ADC)	+= s3c_adc_battery.o
  obj-$(CONFIG_BATTERY_TWL4030_MADC)	+= twl4030_madc_battery.o
  obj-$(CONFIG_CHARGER_88PM860X)	+= 88pm860x_charger.o
  obj-$(CONFIG_CHARGER_PCF50633)	+= pcf50633-charger.o

Content of type "application/pgp-signature" skipped