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] [day] [month] [year] [list]

Message-Id: <20100806151719.b4b58107.sfr@canb.auug.org.au>
Date:	Fri, 6 Aug 2010 15:17:19 +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>,
	'Russell King - ARM Linux' <linux@....linux.org.uk>
Subject: Re: linux-next: manual merge of the input tree with the s5p tree

Hi,

On Fri, 06 Aug 2010 13:33:27 +0900 Kukjin Kim <kgene.kim@...sung.com> wrote:
>
> I will merge Dmitry's merge commit that you inform to me in my tree.
> Then, conflict may be not happened tomorrow. :-)

OK.  Thanks.

> I wonder...as you know, my tree will going to upstream through Russell's
> tree...if his tree doesn't having it, is it no problem when he merges my
> tree?
> I mean, is it no problem that there are Dmitry's stuff which has been merged
> into Linus' in my tree when I'm sending 'pull request' to Russell?

It should cause no problem to Russell or Linus - git is good at ignoring
common subtrees when merging.

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

Content of type "application/pgp-signature" skipped