From: Kukjin Kim <kgene.kim@samsung•com>
To: 'Stephen Rothwell' <sfr@canb•auug.org.au>
Cc: linux-next@vger•kernel.org, linux-kernel@vger•kernel.org,
'Joonyoung Shim' <jy0922.shim@samsung•com>,
'Kyungmin Park' <kyungmin.park@samsung•com>,
'Dmitry Torokhov' <dmitry.torokhov@gmail•com>,
'Russell King - ARM Linux' <linux@arm•linux.org.uk>
Subject: RE: linux-next: manual merge of the input tree with the s5p tree
Date: Fri, 06 Aug 2010 13:33:27 +0900 [thread overview]
Message-ID: <006b01cb3520$869ca6f0$93d5f4d0$%kim@samsung.com> (raw)
In-Reply-To: <20100806114314.6d15d4fb.sfr@canb.auug.org.au>
Stephen Rothwell wrote:
>
> Hi,
>
> On Fri, 06 Aug 2010 09:43:34 +0900 Kukjin Kim <kgene.kim@samsung•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.
>
Thanks for your kindly reply.
I will merge Dmitry's merge commit that you inform to me in my tree.
Then, conflict may be not happened tomorrow. :-)
Cc'ed Russell...
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?
Thanks.
Best regards,
Kgene.
--
Kukjin Kim <kgene.kim@samsung•com>, Senior Engineer,
SW Solution Development Team, Samsung Electronics Co., Ltd.
next prev parent reply other threads:[~2010-08-06 4:33 UTC|newest]
Thread overview: 15+ messages / expand[flat|nested] mbox.gz Atom feed top
2010-07-22 1:46 linux-next: manual merge of the input tree with the s5p tree Stephen Rothwell
2010-08-06 0:24 ` Stephen Rothwell
2010-08-06 0:43 ` Kukjin Kim
2010-08-06 1:43 ` Stephen Rothwell
2010-08-06 3:20 ` Joonyoung Shim
2010-08-06 5:15 ` Kukjin Kim
2010-08-06 4:33 ` Kukjin Kim [this message]
2010-08-06 5:17 ` Stephen Rothwell
-- strict thread matches above, loose matches on Subject: below --
2011-11-11 2:11 Stephen Rothwell
2011-11-11 3:42 ` Dmitry Torokhov
2011-11-11 2:11 Stephen Rothwell
2011-11-11 3:41 ` Dmitry Torokhov
2011-11-11 5:57 ` Stephen Rothwell
2011-11-15 7:26 ` Kukjin Kim
2011-11-11 8:40 ` Thomas Abraham
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to='006b01cb3520$869ca6f0$93d5f4d0$%kim@samsung.com' \
--to=kgene.kim@samsung$(echo .)com \
--cc=dmitry.torokhov@gmail$(echo .)com \
--cc=jy0922.shim@samsung$(echo .)com \
--cc=kyungmin.park@samsung$(echo .)com \
--cc=linux-kernel@vger$(echo .)kernel.org \
--cc=linux-next@vger$(echo .)kernel.org \
--cc=linux@arm$(echo .)linux.org.uk \
--cc=sfr@canb$(echo .)auug.org.au \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox