linux-kernel - RE: linux-next: manual merge of the s5p tree with the arm 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: <00f801cccb52$8234ffd0$869eff70$%kim@samsung.com>
Date:	Thu, 05 Jan 2012 11:34:11 +0900
From:	Kukjin Kim <kgene.kim@...sung.com>
To:	'Stephen Rothwell' <sfr@...b.auug.org.au>
Cc:	linux-next@...r.kernel.org, linux-kernel@...r.kernel.org,
	'Russell King' <rmk@....linux.org.uk>
Subject: RE: linux-next: manual merge of the s5p tree with the arm tree

Stephen Rothwell wrote:
> 
> Hi Kukjin,
> 
> Today's linux-next merge of the s5p tree got a lot of conflicts caused by
> duplicates of commits in your tree and Russell's.  It looks like you have
> merged a version of Russell's tree and then it has been rebased and added
> to.  You need to fix up your tree with respect to Russell's.
> 
Oops, yeah. I will remove Russell's old tree in my next and sorry for
bothering.

Thanks.

Best regards,
Kgene.
--
Kukjin Kim <kgene.kim@...sung.com>, Senior Engineer,
SW Solution Development Team, Samsung Electronics Co., Ltd.

--
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/