linux-kernel - Re: linux-next: manual merge of the usb tree with the s5p 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]

Date:	Wed, 13 Apr 2011 21:52:24 -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,
	Joonyoung Shim <jy0922.shim@...sung.com>,
	Kyungmin Park <kyungmin.park@...sung.com>,
	Kukjin Kim <kgene.kim@...sung.com>
Subject: Re: linux-next: manual merge of the usb tree with the s5p tree

On Thu, Apr 14, 2011 at 02:15:26PM +1000, Stephen Rothwell wrote:
> Hi Greg,
> 
> Today's linux-next merge of the usb tree got a conflict in
> arch/arm/mach-exynos4/mach-nuri.c between commit d2a852f78de6 ("ARM:
> EXYNOS4: Add Atmel mXT touchscreen device to the NURI board") from the
> s5p tree and commit 01da92f7f643 ("ARM: EXYNOS4: Add usb ehci device to
> the NURI board") from the usb tree.
> 
> I fixed it up (see below) and can carry the fix as necessary.

Thanks, the fix looks fine, I knew something like this would happen, and
it would be easy to handle the merge.

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/