linux-kernel - linux-next: manual merge of the arm-soc tree with the battery 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>] [thread-next>] [day] [month] [year] [list]

Message-Id: <20121127155223.849e73a08fc1b382d4622ff8@canb.auug.org.au>
Date:	Tue, 27 Nov 2012 15:52:23 +1100
From:	Stephen Rothwell <sfr@...b.auug.org.au>
To:	Olof Johansson <olof@...om.net>, Arnd Bergmann <arnd@...db.de>,
	<linux-arm-kernel@...ts.infradead.org>
Cc:	linux-next@...r.kernel.org, linux-kernel@...r.kernel.org,
	Jamie Lentin <jm@...tin.co.uk>, Andrew Lunn <andrew@...n.ch>,
	Jason Cooper <jason@...edaemon.net>,
	"Rajanikanth H.V" <rajanikanth.hv@...ricsson.com>,
	Anton Vorontsov <avorontsov@...mvista.com>
Subject: linux-next: manual merge of the arm-soc tree with the battery tree

Hi all,

Today's linux-next merge of the arm-soc tree got a conflict in
drivers/power/Kconfig between commit bd9e8ab2d58d ("ab8500: Add
devicetree support for btemp") from the battery tree and commit
96ff0f5c7efd ("power: Add simple poweroff-gpio driver") from the arm-soc
tree.

I fixed it up (see below) and can carry the fix as necessary (no action
is required).

-- 
Cheers,
Stephen Rothwell                    sfr@...b.auug.org.au

diff --cc drivers/power/Kconfig
index 263499f,b1d956d..0000000
--- a/drivers/power/Kconfig
+++ b/drivers/power/Kconfig
@@@ -346,6 -329,15 +346,8 @@@ config AB8500_B
  	help
  	  Say Y to include support for AB8500 battery management.
  
 -config AB8500_BATTERY_THERM_ON_BATCTRL
 -	bool "Thermistor connected on BATCTRL ADC"
 -	depends on AB8500_BM
 -	help
 -	  Say Y to enable battery temperature measurements using
 -	  thermistor connected on BATCTRL ADC.
 -
+ source "drivers/power/reset/Kconfig"
+ 
  endif # POWER_SUPPLY
  
  source "drivers/power/avs/Kconfig"

Content of type "application/pgp-signature" skipped