From mboxrd@z Thu Jan 1 00:00:00 1970 From: "Yuval Mintz" Subject: Re: linux-next: manual merge of the pci tree with Linus' tree Date: Tue, 4 Sep 2012 09:57:11 +0300 Message-ID: <5045A647.8060904@broadcom.com> References: <20120904115900.9df1ae8f3f608975293dc715@canb.auug.org.au> Mime-Version: 1.0 Content-Type: text/plain; charset=iso-8859-1 Content-Transfer-Encoding: 7bit Return-path: Received: from mms2.broadcom.com ([216.31.210.18]:3996 "EHLO mms2.broadcom.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1753557Ab2IDHUJ (ORCPT ); Tue, 4 Sep 2012 03:20:09 -0400 In-Reply-To: <20120904115900.9df1ae8f3f608975293dc715@canb.auug.org.au> Sender: linux-next-owner@vger.kernel.org List-ID: To: Stephen Rothwell Cc: Bjorn Helgaas , linux-next@vger.kernel.org, linux-kernel@vger.kernel.org, Ariel Elior , Eilon Greenstein , Jiang Liu , "David S. Miller" > Today's linux-next merge of the pci tree got a conflict in > drivers/net/ethernet/broadcom/bnx2x/bnx2x_main.c between commit > 8eee694c3e66 ("bnx2x: fix unload previous driver flow when flr-capable") > from Linus' tree and commit 2a80eebcbf3e ("bnx2x: Use PCI Express > Capability accessors") from the pci tree. > > The former removes the function updated by the latter, so I just removed > the function (see below) and can carry the fix as necessary. Acked-by: Yuval Mintz