linux-kernel - Re: 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: Windows password security audit tool. GUI, reports in PDF.

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

Message-ID: <20120427170548.GB2789@kroah.com>
Date:	Fri, 27 Apr 2012 10:05:48 -0700
From:	Greg KH <greg@...ah.com>
To:	Stephen Rothwell <sfr@...b.auug.org.au>
Cc:	linux-next@...r.kernel.org, linux-kernel@...r.kernel.org,
	Jonathan Cameron <jic23@...nel.org>,
	MyungJoo Ham <myungjoo.ham@...sung.com>
Subject: Re: linux-next: manual merge of the staging tree with the
 driver-core tree

On Fri, Apr 27, 2012 at 02:31:14PM +1000, Stephen Rothwell wrote:
> Hi Greg,
> 
> Today's linux-next merge of the staging tree got a conflict in
> drivers/Kconfig drivers/Makefile between commit de55d8716ac5 ("Extcon
> (external connector): import Android's switch class and modify") from the
> driver-core tree and commits a980e046098b ("IIO: Move the core files to
> drivers/iio") and db3b9e990e75 ("Staging: VME: move VME drivers out of
> staging") from the staging tree.
> 
> Just context changes.  I fixed it up (see below) and can carry the fix as
> necessary.

Thanks, that looks correct.

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/