linux-kernel - Re: linux-next: manual merge of the tegra 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]

Message-Id: <20100730140331.04c60f73.sfr@canb.auug.org.au>
Date:	Fri, 30 Jul 2010 14:03:31 +1000
From:	Stephen Rothwell <sfr@...b.auug.org.au>
To:	Kukjin Kim <kgene.kim@...sung.com>
Cc:	'Erik Gilling' <konkers@...roid.com>,
	'Colin Cross' <ccross@...roid.com>,
	'Olof Johansson' <olof@...om.net>, linux-next@...r.kernel.org,
	linux-kernel@...r.kernel.org,
	'Changhwan Youn' <chaos.youn@...sung.com>
Subject: Re: linux-next: manual merge of the tegra tree with the s5p tree

Hi,

On Fri, 30 Jul 2010 10:57:41 +0900 Kukjin Kim <kgene.kim@...sung.com> wrote:
>
> If there is some conflicts, how can/should I do for it...
> Stephen, please let me know.

In this case, do nothing :-)  The conflicts will get fixed up when either
Russell or Linus merges your tree into theirs.  My email was more of a
"heads up" to let you know that there is some conflict.

-- 
Cheers,
Stephen Rothwell                    sfr@...b.auug.org.au
http://www.canb.auug.org.au/~sfr/

Content of type "application/pgp-signature" skipped