From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753112AbZK3MgO (ORCPT ); Mon, 30 Nov 2009 07:36:14 -0500 Received: (majordomo@vger.kernel.org) by vger.kernel.org id S1752597AbZK3MgO (ORCPT ); Mon, 30 Nov 2009 07:36:14 -0500 Received: from cantor.suse.de ([195.135.220.2]:43048 "EHLO mx1.suse.de" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752501AbZK3MgN (ORCPT ); Mon, 30 Nov 2009 07:36:13 -0500 Date: Mon, 30 Nov 2009 13:36:18 +0100 (CET) From: Jiri Kosina X-X-Sender: jkosina@wotan.suse.de To: Stephen Rothwell Cc: linux-next@vger.kernel.org, linux-kernel@vger.kernel.org, Ben Hutchings , "David S. Miller" , =?ISO-8859-15?Q?=22Andr=E9_Goddard_Rosa=22?= Subject: Re: linux-next: manual merge of the trivial tree with the net tree In-Reply-To: <20091130135320.215722a2.sfr@canb.auug.org.au> Message-ID: References: <20091130135320.215722a2.sfr@canb.auug.org.au> User-Agent: Alpine 2.00 (LSU 1167 2008-08-23) MIME-Version: 1.0 Content-Type: TEXT/PLAIN; charset=US-ASCII Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org On Mon, 30 Nov 2009, Stephen Rothwell wrote: > Today's linux-next merge of the trivial tree got a conflict in > drivers/net/sfc/falcon.c between commit > 127e6e10ad17585c48cba8e1dcf30d98b90ee583 ("sfc: Fix bugs in RX queue > flushing") from the net tree and commit > 4e5cf22a6f45b6489f84de03d3a1dfa60cc4b4e4 ("tree-wide: fix assorted typos > all over the place") from the trivial tree. > > The former removed the comment that the latter was fixing. Dropped the falcon.c hunk from the pile, so the conflict should be gone. Thanks, -- Jiri Kosina SUSE Labs, Novell Inc.