tree 0584a3a4639424733bad7714796f858aa7addee7
parent 8c2e6c904fd8701a8d02d2bdb86871dc3ec4e85b
parent 1545dec46db3858bbce84c2065b579e2925706ab
author David S. Miller <davem@davemloft.net> 1515724074 -0500
committer David S. Miller <davem@davemloft.net> 1515726822 -0500

Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net

BPF alignment tests got a conflict because the registers
are output as Rn_w instead of just Rn in net-next, and
in net a fixup for a testcase prohibits logical operations
on pointers before using them.

Also, we should attempt to patch BPF call args if JIT always on is
enabled.  Instead, if we fail to JIT the subprogs we should pass
an error back up and fail immediately.

Signed-off-by: David S. Miller <davem@davemloft.net>