MERGE net into net-next

[David Miller]

Daniel please look at how I resolved the BPF conflicts and build
failures.

The test_align.c one was pretty simple, but the one that fixes the
build failure due to overlap of the BPF call vs. JIT always on changes
is bit less trivial.

Thanks.