linux-kernel - Re: linux-next: manual merge of the input 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] [thread-next>] [day] [month] [year] [list]

Message-Id: <20100806114314.6d15d4fb.sfr@canb.auug.org.au>
Date:	Fri, 6 Aug 2010 11:43:14 +1000
From:	Stephen Rothwell <sfr@...b.auug.org.au>
To:	Kukjin Kim <kgene.kim@...sung.com>
Cc:	linux-next@...r.kernel.org, linux-kernel@...r.kernel.org,
	'Joonyoung Shim' <jy0922.shim@...sung.com>,
	'Kyungmin Park' <kyungmin.park@...sung.com>,
	'Dmitry Torokhov' <dmitry.torokhov@...il.com>
Subject: Re: linux-next: manual merge of the input tree with the s5p tree

Hi,

On Fri, 06 Aug 2010 09:43:34 +0900 Kukjin Kim <kgene.kim@...sung.com> wrote:
>
> I know that Dmitry's 'Input: samsung-keypad...patch' which includes
> plat/keypad.h has been merged Linus' tree in this merge window.
> And Joonyoung's another patch which is in my tree needs to update it, but my
> tree is don't having it against Linus' 2.6.35.
> 
> So happened conflict...how can/should I handle this...
> Should I rebase my tree against Linus' latest?

Either rebase (worst), or just merge Linus' tree (better) into yours or
(best) merge what Dmitry merged into Linus' tree.  To do this last, you
need to merge commit d01d0756f75e7a5b4b43764ad45b83c4340f11d6 from Linus'
tree.  Doing this brings in the minimum amount of extra stuff to your
tree, but allows you to sort out the conflict.

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

Content of type "application/pgp-signature" skipped