Hi Dave,

Today's linux-next merge of the net tree got a conflict in
net/8021q/vlan_core.c between commit
9b22ea560957de1484e6b3e8538f7eef202e3596 ("net: fix packet socket
delivery in rx irq handler") from the net-current tree and commit
d2ad3ca88da02baeccd5216780f1fe983c6953ba ("net/: Kill now superfluous
->last_rx stores") from the net tree.

The former moved the code around that the latter was removing.  It seems
that the net-current change supercedes the net one (I may be wrong).  I
assume that this will be fixed in your tree soon.

-- 
Cheers,
Stephen Rothwell                    sfr@canb.auug.org.au
http://www.canb.auug.org.au/~sfr/