From: Stephen Rothwell <sfr@xxxxxxxxxxxxxxxx>
Date: Mon, 22 Apr 2013 12:43:34 +1000
> Today's linux-next merge of the net-next tree got a conflict in
> drivers/net/ethernet/emulex/benet/be_main.c between commit f11a869d4e38
> ("be2net: take care of __vlan_put_tag return value") from Linus' tree and
> commit 86a9bad3ab6b ("net: vlan: add protocol argument to packet tagging
> functions") from the net-next tree.
>
> I fixed it up (see below) and can carry the fix as necessary (no action
> is required).
I took care of this during the net --> net-next merge, thanks!
--
To unsubscribe from this list: send the line "unsubscribe linux-next" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
