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

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

Date:	Thu, 10 May 2012 17:34:01 +1000
From:	Stephen Rothwell <sfr@...b.auug.org.au>
To:	Greg KH <greg@...ah.com>
Cc:	linux-next@...r.kernel.org, linux-kernel@...r.kernel.org,
	Chanwoo Choi <cw00.choi@...sung.com>,
	Myungjoo Ham <myungjoo.ham@...sung.com>,
	Kyungmin Park <kyungmin.park@...sung.com>
Subject: linux-next: manual merge of the staging tree with the driver-core
 tree

Hi Greg,

Today's linux-next merge of the staging tree got a conflict in
drivers/misc/Makefile between commit 6a7e2618b3db ("misc: MAX8997: Remove
max8997-muic driver") from the driver-core tree and commit ffc2825c2942
("Staging: mei: move the mei code out of staging") from the staging 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/misc/Makefile
index b26495a,0f6af6a..0000000
--- a/drivers/misc/Makefile
+++ b/drivers/misc/Makefile
@@@ -48,3 -48,5 +48,4 @@@ obj-y				+= lis3lv02d
  obj-y				+= carma/
  obj-$(CONFIG_USB_SWITCH_FSA9480) += fsa9480.o
  obj-$(CONFIG_ALTERA_STAPL)	+=altera-stapl/
 -obj-$(CONFIG_MAX8997_MUIC)	+= max8997-muic.o
+ obj-$(CONFIG_INTEL_MEI)		+= mei/

Content of type "application/pgp-signature" skipped