linux-kernel - Re: linux-next: manual merge of the driver-core tree with the arm-soc 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: <20110829193344.GA13418@kroah.com>
Date:	Mon, 29 Aug 2011 12:33:44 -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,
	"Uwe Kleine-König" 
	<u.kleine-koenig@...gutronix.de>, Arnd Bergmann <arnd@...db.de>
Subject: Re: linux-next: manual merge of the driver-core tree with the
 arm-soc tree

On Mon, Aug 29, 2011 at 02:31:50PM +1000, Stephen Rothwell wrote:
> Hi Greg,
> 
> Today's linux-next merge of the driver-core tree got a conflict in
> arch/arm/plat-mxc/devices.c between commit 160a84cfc975 ("ARM: mxc: drop
> now unused function mxc_register_device") from the arm-soc tree and
> commit 0e392412f334 ("ARM: mxc: convert device creation to use
> platform_device_register_full") from the driver-core tree.
> 
> Just context changes.  I fixed it up (see below) anc can carry the fix as
> necessary.

Thanks, that looks fine.

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/