Messages in this thread | | | Date | Fri, 26 Apr 2013 13:24:47 +1000 | From | Stephen Rothwell <> | Subject | linux-next: manual merge of the net-next tree with the net tree |
| |
Hi all,
Today's linux-next merge of the net-next tree got a conflict in drivers/net/ethernet/broadcom/bnx2x/bnx2x_main.c between commit ecf01c22be03 ("bnx2x: Prevent NULL pointer dereference in kdump") from the net tree and commit 5b0752c863d7 ("bnx2x: Fix VF statistics") from the net-next tree.
I am not sure about this, but I just used the net tree version but I assume something more may be needed and can carry the fix as necessary (no action is required).
-- Cheers, Stephen Rothwell sfr@canb.auug.org.au [unhandled content-type:application/pgp-signature] | |