linux-kernel - Re: 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 for Android: free password hash cracker in your pocket

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

Date:	Mon, 10 Nov 2014 14:58:05 +0900
From:	Greg KH <greg@...ah.com>
To:	Stephen Rothwell <sfr@...b.auug.org.au>
Cc:	Arnd Bergmann <arnd@...db.de>, linux-next@...r.kernel.org,
	linux-kernel@...r.kernel.org, Pratik Patel <pratikp@...eaurora.org>
Subject: Re: linux-next: manual merge of the char-misc tree with the staging
 tree

On Mon, Nov 10, 2014 at 04:53:16PM +1100, Stephen Rothwell wrote:
> 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/


Looks good, thanks.

greg k-h
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@...r.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/