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 for Android: free password hash cracker in your pocket

[<prev] [next>] [<thread-prev] [thread-next>] [day] [month] [year] [list]

Date:	Fri, 06 Aug 2010 12:20:26 +0900
From:	Joonyoung Shim <jy0922.shim@...sung.com>
To:	Kukjin Kim <kgene.kim@...sung.com>
Cc:	Stephen Rothwell <sfr@...b.auug.org.au>,
	linux-next@...r.kernel.org, linux-kernel@...r.kernel.org,
	'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

On 8/6/2010 10:43 AM, Stephen Rothwell wrote:
> 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.
> 

Kukjin,

If you rebase and need, i can send updated patches. It uses "ARM:
SAMSUNG: Add helper to clone and set platform data" patch of Ben Dooks.

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