Hi Simon, The ipvs-next tree appears to contain a set of patches that have been merged into the net-next tree as different commits (some of them slightly different). This is just causing conflicts.
-- Cheers, Stephen Rothwell
pgpIl_KCDzubv.pgp
Description: OpenPGP digital signature
