Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1759434Ab3D3ID3 (ORCPT ); Tue, 30 Apr 2013 04:03:29 -0400 Received: from shards.monkeyblade.net ([149.20.54.216]:41410 "EHLO shards.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1759266Ab3D3IDW (ORCPT ); Tue, 30 Apr 2013 04:03:22 -0400 Date: Tue, 30 Apr 2013 04:03:20 -0400 (EDT) Message-Id: <20130430.040320.8958281566721040.davem@davemloft.net> To: sfr@canb.auug.org.au Cc: netdev@vger.kernel.org, linux-next@vger.kernel.org, linux-kernel@vger.kernel.org, ajit.khaparde@emulex.com, vasundhara.volam@emulex.com, sathya.perla@emulex.com Subject: Re: linux-next: manual merge of the net-next tree with the net tree From: David Miller In-Reply-To: <20130426132701.ab5ef20e111d529c2c0ae71d@canb.auug.org.au> References: <20130426132701.ab5ef20e111d529c2c0ae71d@canb.auug.org.au> X-Mailer: Mew version 6.5 on Emacs 24.1 / Mule 6.0 (HANACHIRUSATO) Mime-Version: 1.0 Content-Type: Text/Plain; charset=us-ascii Content-Transfer-Encoding: 7bit X-Greylist: Sender succeeded SMTP AUTH, not delayed by milter-greylist-4.2.7 (shards.monkeyblade.net [0.0.0.0]); Tue, 30 Apr 2013 01:03:22 -0700 (PDT) Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Length: 811 Lines: 18 From: Stephen Rothwell Date: Fri, 26 Apr 2013 13:27:01 +1000 > Today's linux-next merge of the net-next tree got a conflict in > drivers/net/ethernet/emulex/benet/be.h between commit bc0c3405abbb > ("be2net: fix a Tx stall bug caused by a specific ipv6 packet") from the > net tree and commit 0ad3157e813a ("be2net: Avoid flashing BE3 UFI on > BE3-R chip") from the net-next tree. > > I fixed it up (see below) and can carry the fix as necessary (no action > is required). I fixed it up identically when I merged net into net-next, thanks! -- 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/