Re: linux-next: manual merge of the input tree with the davinci tree

[Dmitry Torokhov]

On Tue, Sep 21, 2010 at 12:46:32PM +1000, Stephen Rothwell wrote:
> Hi Dmitry,
> 
> Today's linux-next merge of the input tree got a conflict in
> drivers/input/keyboard/Kconfig between commit
> 34dca1011e05d3965c0f60d51a69643789683877 ("input: add driver for
> tnetv107x on-chip keypad controller") from the davinci tree and commit
> a17f79553f052f04d47689a842118f775f81b7e3 ("Input: add support for OMAP4
> keyboard controller") from the input tree.
> 
> Just overlapping additions.  I fixed it up (see below) and can carry the
> fix as necessary.

I am afraid you'll have to carry this one till the next merge window -
it seemed that Davinci drivers better be merged through davinci tree so
we'll have this conflict.

Sorry about this.

-- 
Dmitry
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/