> 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 <yuval...@broadcom.com>
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majord...@vger.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/
