Prev: [PATCH 2/2] Staging: wlan-ng: removed typedef from prism2fw.c
Next: (none)
From: Stephen Rothwell on 21 Jul 2010 21:50
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 sfr(a)canb.auug.org.au
http://www.canb.auug.org.au/~sfr/
From: Stephen Rothwell on 5 Aug 2010 20:30
Hi all,

On Thu, 22 Jul 2010 11:46:55 +1000 Stephen Rothwell <sfr(a)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.
--
Cheers,
Stephen Rothwell sfr(a)canb.auug.org.au
http://www.canb.auug.org.au/~sfr/
From: Kukjin Kim on 5 Aug 2010 20:50
Stephen Rothwell wrote:
>
> Hi all,
>
> On Thu, 22 Jul 2010 11:46:55 +1000 Stephen Rothwell <sfr(a)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(a)samsung.com>, Senior Engineer,
SW Solution Development Team, Samsung Electronics Co., Ltd.

--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo(a)vger.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/
From: Stephen Rothwell on 5 Aug 2010 21:50
Hi,

On Fri, 06 Aug 2010 09:43:34 +0900 Kukjin Kim <kgene.kim(a)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(a)canb.auug.org.au
http://www.canb.auug.org.au/~sfr/
From: Joonyoung Shim on 5 Aug 2010 23:30
On 8/6/2010 10:43 AM, Stephen Rothwell wrote:
> Hi,
>
> On Fri, 06 Aug 2010 09:43:34 +0900 Kukjin Kim <kgene.kim(a)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.
>

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.
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo(a)vger.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/
 |  Next  |  Last
Pages: 1 2
Prev: [PATCH 2/2] Staging: wlan-ng: removed typedef from prism2fw.c
Next: (none)