public inbox for linux-next@vger.kernel.org 
 help / color / mirror / Atom feed

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>
Subject: RE: linux-next: manual merge of the input tree with the s5p tree
Date: Fri, 06 Aug 2010 09:43:34 +0900	[thread overview]
Message-ID: <004801cb3500$69824bd0$3c86e370$%kim@samsung.com> (raw)
In-Reply-To: <20100806102419.3e875933.sfr@canb.auug.org.au>

Stephen Rothwell wrote:
> 
> Hi all,
> 
> On Thu, 22 Jul 2010 11:46:55 +1000 Stephen Rothwell <sfr@canb•auug.org.au>
> wrote:
> >
> > Today's linux-next merge of the input tree got a conflict in
> > arch/arm/plat-samsung/include/plat/keypad.h between commit
> > 1e3241300503df18a098dd35098f6975dcf622e2 ("ARM: SAMSUNG: Add keypad
> > device support") from the s5p tree and commit
> > 0fffed27f92d9d7a34de9fe017b7082b5958bb93 ("Input: samsung-keypad - Add
> > samsung keypad driver") from the input tree.
> >
> > This just looks like two versions of the same driver (or two drivers
> > sharing the same header) - please sort this out.  I have fixed up the
> > header for today (by including both versions where necessary).
> 
> I got this again (something obviously changed a little) but the input
> tree version is now in Linus' tree.  Please fix this up.

Hi Stephen,

Yeah,

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?

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  0:43 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 [this message]
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
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='004801cb3500$69824bd0$3c86e370$%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=sfr@canb$(echo .)auug.org.au \
    /path/to/YOUR_REPLY

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

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox