Re: linux-next: manual merge of the net-next tree with the net tree
From: David Miller
Date: Tue Apr 30 2013 - 04:03:37 EST
From: Stephen Rothwell <sfr@xxxxxxxxxxxxxxxx>
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@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/