> * The mbuf flags PKT_RX_VLAN_PKT and PKT_RX_QINQ_PKT are deprecated and
> are respectively replaced by PKT_RX_VLAN_STRIPPED and
> PKT_RX_QINQ_STRIPPED, that are better described. The old flags and
> their behavior will be kept in 16.07 and will be removed in 16.11.

Although the changes to PKT_RX_VLAN_PKT and PKT_RX_QINQ_PKT should be
mostly dealt with upstream, there are a few changes required to

vnet/vnet/devices/dpdk/node.c
vnet/vnet/devices/dpdk/format.c

Other stuff looks to be covered by the recent integration work.