linux-next: build failure after merge of the net-next tree

[Stephen Rothwell]

Hi all,

After merging the net-next tree, today's linux-next build (powerpc
ppc64_defconfig) failed like this:

drivers/net/ethernet/ibm/ehea/ehea_main.c: In function 'ehea_proc_rwqes':
drivers/net/ethernet/ibm/ehea/ehea_main.c:728:5: error: too few arguments to function '__vlan_hwaccel_put_tag'
include/linux/if_vlan.h:237:31: note: declared here

Caused by commit 86a9bad3ab6b ("net: vlan: add protocol argument to
packet tagging functions").  Grep is your friend.  :-(

drivers/net/ethernet/ibm/ehea/ehea_main.c: In function 'ehea_setup_single_port':
drivers/net/ethernet/ibm/ehea/ehea_main.c:3027:9: error: expected expression before '|' token

Caused by commit f646968f8f7c ("net: vlan: rename NETIF_F_HW_VLAN_*
feature flags to NETIF_F_HW_VLAN_CTAG_*").

I have used the net-net tree from next-20130419 for today.
-- 
Cheers,
Stephen Rothwell                    sfr@xxxxxxxxxxxxxxxx

Attachment: pgp00000.pgp
Description: PGP signature