From mboxrd@z Thu Jan 1 00:00:00 1970 From: Dmitry Torokhov Subject: Re: linux-next: manual merge of the input tree with the input-current tree Date: Wed, 1 Sep 2010 19:46:17 -0700 Message-ID: <20100902024617.GA9303@core.coreip.homeip.net> References: <20100902115958.982d7618.sfr@canb.auug.org.au> Mime-Version: 1.0 Content-Type: text/plain; charset=us-ascii Return-path: Received: from mail-gx0-f174.google.com ([209.85.161.174]:62821 "EHLO mail-gx0-f174.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752297Ab0IBCqZ (ORCPT ); Wed, 1 Sep 2010 22:46:25 -0400 Content-Disposition: inline In-Reply-To: <20100902115958.982d7618.sfr@canb.auug.org.au> Sender: linux-next-owner@vger.kernel.org List-ID: To: Stephen Rothwell Cc: linux-next@vger.kernel.org, linux-kernel@vger.kernel.org, Kevin Wells 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