Please merge net into net-next

[Edward Cree]

Hi Dave,

Could you please merge net into net-next, so I can rebase my BPF patches?
Otherwise there's likely to be merge conflicts with the BPF_SUB fix.

Thanks,
-Ed