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

There were quite a few overlapping sets of changes here.

Daniel's bug fix for off-by-ones in the new BPF branch instructions,
along with the added allowances for "data_end > ptr + x" forms
collided with the metadata additions.

Along with those three changes came veritifer test cases, which in
their final form I tried to group together properly.  If I had just
trimmed GIT's conflict tags as-is, this would have split up the
meta tests unnecessarily.

In the socketmap code, a set of preemption disabling changes
overlapped with the rename of bpf_compute_data_end() to
bpf_compute_data_pointers().

Changes were made to the mv88e6060.c driver set addr method
which got removed in net-next.

The hyperv transport socket layer had a locking change in 'net'
which overlapped with a change of socket state macro usage
in 'net-next'.

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

1 files changed, 8 insertions, 0 deletions

diff --git a/arch/arm/kernel/debug.S b/arch/arm/kernel/debug.S
index ea9646cc2a0e..0a498cb3fad8 100644
--- a/arch/arm/kernel/debug.S
+++ b/arch/arm/kernel/debug.S
@@ -115,7 +115,11 @@ ENTRY(printascii)
                 mov     r1, r0
                 mov     r0, #0x04               @ SYS_WRITE0
         ARM(    svc     #0x123456       )
+#ifdef CONFIG_CPU_V7M
+        THUMB(  bkpt    #0xab           )
+#else
         THUMB(  svc     #0xab           )
+#endif
                 ret     lr
 ENDPROC(printascii)
 
@@ -124,7 +128,11 @@ ENTRY(printch)
                 strb    r0, [r1]
                 mov     r0, #0x03               @ SYS_WRITEC
         ARM(    svc     #0x123456       )
+#ifdef CONFIG_CPU_V7M
+        THUMB(  bkpt    #0xab           )
+#else
         THUMB(  svc     #0xab           )
+#endif
                 ret     lr
 ENDPROC(printch)