Messages in this thread | | | Date | Tue, 4 Sep 2012 09:57:11 +0300 | From | "Yuval Mintz" <> | Subject | Re: linux-next: manual merge of the pci tree with Linus' tree |
| |
> 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 <yuvalmin@broadcom.com>
| |