linux-kernel - linux-next: manual merge of the char-misc tree with the staging 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: <20141110165316.5c122b47@canb.auug.org.au>
Date:	Mon, 10 Nov 2014 16:53:16 +1100
From:	Stephen Rothwell <sfr@...b.auug.org.au>
To:	Greg KH <greg@...ah.com>, Arnd Bergmann <arnd@...db.de>
Cc:	linux-next@...r.kernel.org, linux-kernel@...r.kernel.org,
	Pratik Patel <pratikp@...eaurora.org>
Subject: linux-next: manual merge of the char-misc tree with the staging
 tree

Hi all,

Today's linux-next merge of the char-misc tree got a conflict in
drivers/Makefile between commit 777783e0abae ("staging: android:
binder: move to the "real" part of the kernel") from the staging tree and
commit a06ae8609b3d ("coresight: add CoreSight core layer framework")
from the char-misc 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/Makefile
index 60d19820a4d4,628b512b625b..000000000000
--- a/drivers/Makefile
+++ b/drivers/Makefile
@@@ -161,4 -161,4 +161,5 @@@ obj-$(CONFIG_POWERCAP)		+= powercap
  obj-$(CONFIG_MCB)		+= mcb/
  obj-$(CONFIG_RAS)		+= ras/
  obj-$(CONFIG_THUNDERBOLT)	+= thunderbolt/
 +obj-$(CONFIG_ANDROID)		+= android/
+ obj-$(CONFIG_CORESIGHT)		+= coresight/

Content of type "application/pgp-signature" skipped