Hi Dmitry,
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).
--
Cheers,
Stephen Rothwell [email protected]
http://www.canb.auug.org.au/~sfr/
Hi all,
On Thu, 22 Jul 2010 11:46:55 +1000 Stephen Rothwell <[email protected]> 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.
--
Cheers,
Stephen Rothwell [email protected]
http://www.canb.auug.org.au/~sfr/
Stephen Rothwell wrote:
>
> Hi all,
>
> On Thu, 22 Jul 2010 11:46:55 +1000 Stephen Rothwell <[email protected]>
> 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 <[email protected]>, Senior Engineer,
SW Solution Development Team, Samsung Electronics Co., Ltd.
Hi,
On Fri, 06 Aug 2010 09:43:34 +0900 Kukjin Kim <[email protected]> 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 [email protected]
http://www.canb.auug.org.au/~sfr/
On 8/6/2010 10:43 AM, Stephen Rothwell wrote:
> Hi,
>
> On Fri, 06 Aug 2010 09:43:34 +0900 Kukjin Kim <[email protected]> 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.
Stephen Rothwell wrote:
>
> Hi,
>
> On Fri, 06 Aug 2010 09:43:34 +0900 Kukjin Kim <[email protected]>
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 <[email protected]>, Senior Engineer,
SW Solution Development Team, Samsung Electronics Co., Ltd.
Joonyoung Shim wrote:
>
> On 8/6/2010 10:43 AM, Stephen Rothwell wrote:
> > Hi,
> >
> > On Fri, 06 Aug 2010 09:43:34 +0900 Kukjin Kim <[email protected]>
> 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.
Ok...please send it in today.
I have a plan to send 'pull request' to Russell in this weekend or the beginning of next week.
Thanks.
Best regards,
Kgene.
--
Kukjin Kim <[email protected]>, Senior Engineer,
SW Solution Development Team, Samsung Electronics Co., Ltd.
Hi,
On Fri, 06 Aug 2010 13:33:27 +0900 Kukjin Kim <[email protected]> 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 [email protected]
http://www.canb.auug.org.au/~sfr/