Messages in this thread | | | Date | Mon, 2 Feb 2015 13:40:53 +1100 | 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 include/linux/if_vlan.h between commit d4bcef3fbe88 ("net: Fix vlan_get_protocol for stacked vlan") from the net tree and commit df8a39defad4 ("net: rename vlan_tx_* helpers since "tx" is misleading there") from the net-next tree.
I fixed it up (the former removed the code modified by the latter) 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] | |