Date: Tue, 22 May 2012 11:16:03 +0200 (CEST)
From: Jiri Kosina <jkosina@suse.cz>
To: Stephen Rothwell <sfr@canb.auug.org.au>
Cc: linux-next@vger.kernel.org, linux-kernel@vger.kernel.org,
        Masanari Iida <standby24x7@gmail.com>,
        John Crispin <blogic@openwrt.org>, Ralf Baechle <ralf@linux-mips.org>
Subject: Re: linux-next: manual merge of the trivial tree with the  tree
In-Reply-To: <20120522145432.aa4d97df7f08af54229f1338@canb.auug.org.au>
Message-ID: <alpine.LNX.2.00.1205221115390.16396@pobox.suse.cz>
References: <20120522145432.aa4d97df7f08af54229f1338@canb.auug.org.au>
User-Agent: Alpine 2.00 (LNX 1167 2008-08-23)
MIME-Version: 1.0
Content-Type: TEXT/PLAIN; charset=US-ASCII
Sender: linux-kernel-owner@vger.kernel.org
Content-Length: 946
Lines: 26

On Tue, 22 May 2012, Stephen Rothwell wrote:

> Hi Jiri,
> 
> Today's linux-next merge of the trivial tree got a conflict in
> arch/mips/lantiq/xway/gpio_ebu.c arch/mips/lantiq/xway/gpio_stp.c between
> commit 5238f7bc3566 ("GPIO: MIPS: lantiq: move gpio-stp and gpio-ebu to
> the subsystem folder") from the  tree and commit 6997991ab0db ("mips: Fix
> printk typos in arc/mips") from the trivial tree.
> 
> The typos fixed in the latter probably need to be applied to the renamed
> files drivers/gpio/gpio-mm-lantiq.c and drivers/gpio/gpio-stp-xway.c
> (resp).
> 
> I have removed the old versions.

I will probably keep this trivial conflict for Linus to resolve. Thanks,

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