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

lists.openwall.net		lists / announce owl-users owl-dev john-users john-dev passwdqc-users yescrypt popa3d-users / oss-security kernel-hardening musl sabotage tlsify passwords / crypt-dev xvendor / Bugtraq Full-Disclosure linux-kernel linux-netdev linux-ext4 linux-hardening linux-cve-announce PHC
Open Source and information security mailing list archives

Hash Suite: Windows password security audit tool. GUI, reports in PDF.

[<prev] [next>] [<thread-prev] [thread-next>] [day] [month] [year] [list]

Date:	Mon, 20 Sep 2010 22:24:38 -0700
From:	Dmitry Torokhov <dmitry.torokhov@...il.com>
To:	Stephen Rothwell <sfr@...b.auug.org.au>
Cc:	linux-next@...r.kernel.org, linux-kernel@...r.kernel.org,
	Cyril Chemparathy <cyril@...com>,
	Kevin Hilman <khilman@...prootsystems.com>,
	Abraham Arce <x0066660@...com>,
	Syed Rafiuddin <rafiuddin.syed@...com>
Subject: Re: linux-next: manual merge of the input tree with the davinci tree

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@...r.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/