From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S933248Ab0GUCbX (ORCPT ); Tue, 20 Jul 2010 22:31:23 -0400 Received: from helcar.apana.org.au ([209.40.204.226]:36506 "EHLO fornost.hengli.com.au" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S933031Ab0GUCbV (ORCPT ); Tue, 20 Jul 2010 22:31:21 -0400 Date: Wed, 21 Jul 2010 10:31:15 +0800 From: Herbert Xu To: Stephen Rothwell Cc: David Miller , netdev@vger.kernel.org, linux-next@vger.kernel.org, linux-kernel@vger.kernel.org Subject: Re: linux-next: manual merge of the net tree with Linus' tree Message-ID: <20100721023114.GA14529@gondor.apana.org.au> References: <20100721120448.31e325fd.sfr@canb.auug.org.au> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <20100721120448.31e325fd.sfr@canb.auug.org.au> User-Agent: Mutt/1.5.18 (2008-05-17) Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org On Wed, Jul 21, 2010 at 12:04:48PM +1000, Stephen Rothwell wrote: > Hi all, > > Today's linux-next merge of the net tree got a conflict in > net/bridge/br_device.c between commit > 573201f36fd9c7c6d5218cdcd9948cee700b277d ("bridge: Partially disable > netpoll support") from Linus' tree and commit > 91d2c34a4eed32876ca333b0ca44f3bc56645805 ("bridge: Fix netpoll support") > from the net tree. > > The net tree commit seems to be a fuller fix, so I used that. Yeah, 573201f is just the temporary fix for 2.6.35. Thanks, -- Email: Herbert Xu Home Page: http://gondor.apana.org.au/~herbert/ PGP Key: http://gondor.apana.org.au/~herbert/pubkey.txt