From mboxrd@z Thu Jan 1 00:00:00 1970 From: Jiri Kosina Subject: Re: linux-next: manual merge of the trivial tree with the powerpc tree Date: Fri, 16 Mar 2012 12:10:25 +0100 (CET) Message-ID: References: <20120316145658.3fb06c5213dbca29d6898c4b@canb.auug.org.au> Mime-Version: 1.0 Content-Type: TEXT/PLAIN; charset=US-ASCII Return-path: Received: from cantor2.suse.de ([195.135.220.15]:37201 "EHLO mx2.suse.de" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1422674Ab2CPLKa (ORCPT ); Fri, 16 Mar 2012 07:10:30 -0400 In-Reply-To: <20120316145658.3fb06c5213dbca29d6898c4b@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, Masanari Iida , Benjamin Herrenschmidt , Paul Mackerras , linuxppc-dev@lists.ozlabs.org On Fri, 16 Mar 2012, Stephen Rothwell wrote: > Today's linux-next merge of the trivial tree got a conflict in > drivers/char/viotape.c between commit ba7a4822b48f ("powerpc: Remove some > of the legacy iSeries specific device drivers") from the powerpc tree and > commit a7ccf3775219 ("char: Fix typo in viotape.c") from the trivial tree. Dropped a7ccf3775219 in my tree, thanks for report Stephen. -- Jiri Kosina SUSE Labs