linux-kernel - linux-next: manual merge of the modem-shm tree with the driver-core 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]

Date:	Mon, 23 Apr 2012 15:44:20 +1000
From:	Stephen Rothwell <sfr@...b.auug.org.au>
To:	Linus Walleij <linus.walleij@...aro.org>,
	"Sjur Brændeland" 
	<sjur.brandeland@...ricsson.com>
Cc:	linux-next@...r.kernel.org, linux-kernel@...r.kernel.org,
	MyungJoo Ham <myungjoo.ham@...sung.com>,
	Greg KH <greg@...ah.com>
Subject: linux-next: manual merge of the modem-shm tree with the driver-core
 tree

Hi all,

Today's linux-next merge of the modem-shm tree got a conflict in
drivers/Kconfig between commit de55d8716ac5  ("Extcon (external
connector): import Android's switch class and modify") from the
driver-core tree and commit 021fd6178bcd ("modem_shm: Makefile and
Kconfig for M7400 Shared Memory Drivers") from the modem-shm tree.

Just context changes.  I fixed it up (see below) and can carry the fix as
necessary.
-- 
Cheers,
Stephen Rothwell                    sfr@...b.auug.org.au

diff --cc drivers/Kconfig
index 0233ad9,918e943..0000000
--- a/drivers/Kconfig
+++ b/drivers/Kconfig
@@@ -140,6 -136,6 +140,8 @@@ source "drivers/virt/Kconfig
  
  source "drivers/devfreq/Kconfig"
  
 +source "drivers/extcon/Kconfig"
 +
+ source "drivers/modem_shm/Kconfig"
+ 
  endmenu

Content of type "application/pgp-signature" skipped