mirror of https://lore.kernel.org/lkml/
 help / color / mirror / Atom feed
From: Stephen Rothwell <sfr@canb.auug.org.au>
To: Kukjin Kim <kgene.kim@samsung.com>
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>
Subject: Re: linux-next: manual merge of the input tree with the s5p tree
Date: Fri, 6 Aug 2010 11:43:14 +1000	[thread overview]
Message-ID: <20100806114314.6d15d4fb.sfr@canb.auug.org.au> (raw)
In-Reply-To: <004801cb3500$69824bd0$3c86e370$%kim@samsung.com>

[-- Attachment #1: Type: text/plain, Size: 919 bytes --]

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.

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

[-- Attachment #2: Type: application/pgp-signature, Size: 490 bytes --]

  reply	other threads:[~2010-08-06  1:43 UTC|newest]

Thread overview: 15+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2010-07-22  1:46 Stephen Rothwell
2010-08-06  0:24 ` Stephen Rothwell
2010-08-06  0:43   ` Kukjin Kim
2010-08-06  1:43     ` Stephen Rothwell [this message]
2010-08-06  3:20       ` Joonyoung Shim
2010-08-06  5:15         ` Kukjin Kim
2010-08-06  4:33       ` Kukjin Kim
2010-08-06  5:17         ` Stephen Rothwell
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=20100806114314.6d15d4fb.sfr@canb.auug.org.au \
    --to=sfr@canb.auug.org.au \
    --cc=dmitry.torokhov@gmail.com \
    --cc=jy0922.shim@samsung.com \
    --cc=kgene.kim@samsung.com \
    --cc=kyungmin.park@samsung.com \
    --cc=linux-kernel@vger.kernel.org \
    --cc=linux-next@vger.kernel.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
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

all inboxes | Powered by JetHome®