linux-kernel - Re: linux-next: manual merge of the input tree with the input-current 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]

Message-ID: <20100902024617.GA9303@core.coreip.homeip.net>
Date:	Wed, 1 Sep 2010 19:46:17 -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,
	Kevin Wells <wellsk40@...il.com>
Subject: Re: linux-next: manual merge of the input tree with the
 input-current tree

On Thu, Sep 02, 2010 at 11:59:58AM +1000, Stephen Rothwell wrote:
> Hi Dmitry,
> 
> Today's linux-next merge of the input tree got a conflict in
> drivers/input/touchscreen/Makefile between commit
> 948e90e22f01287302d84b5b8d4ba330a41dbf8a ("Input: mrst-touchscreen - move
> out of staging") from the input-current tree and commit
> 3045a5f5202a1e0ab6ba2bf90a786cf4cae6932a ("Input: add LPC32xx touchscreen
> controller driver") from the input tree.
> 
> Just overlapping additions.  I fixed it up (see below) and can carry the
> fix for a while.

Doh! I did not mean to put mrst changes into 'for-linus'. It is too late
to re-fetch, isn't it?

-- 
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/