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

Conflicts:
	drivers/net/usb/asix_common.c
	net/ipv4/inet_connection_sock.c
	net/switchdev/switchdev.c

In the inet_connection_sock.c case the request socket hashing scheme
is completely different in net-next.

The other two conflicts were overlapping changes.

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

1 files changed, 7 insertions, 6 deletions

diff --git a/arch/mips/net/bpf_jit_asm.S b/arch/mips/net/bpf_jit_asm.S
index dabf4179cd7e..5d2e0c8d29c0 100644
--- a/arch/mips/net/bpf_jit_asm.S
+++ b/arch/mips/net/bpf_jit_asm.S
@@ -57,12 +57,13 @@
 
 LEAF(sk_load_word)
         is_offset_negative(word)
-        .globl sk_load_word_positive
-sk_load_word_positive:
+FEXPORT(sk_load_word_positive)
         is_offset_in_header(4, word)
         /* Offset within header boundaries */
         PTR_ADDU t1, $r_skb_data, offset
+        .set    reorder
         lw      $r_A, 0(t1)
+        .set    noreorder
 #ifdef CONFIG_CPU_LITTLE_ENDIAN
 # if defined(__mips_isa_rev) && (__mips_isa_rev >= 2)
         wsbh    t0, $r_A
@@ -85,12 +86,13 @@ sk_load_word_positive:
 
 LEAF(sk_load_half)
         is_offset_negative(half)
-        .globl sk_load_half_positive
-sk_load_half_positive:
+FEXPORT(sk_load_half_positive)
         is_offset_in_header(2, half)
         /* Offset within header boundaries */
         PTR_ADDU t1, $r_skb_data, offset
+        .set    reorder
         lh      $r_A, 0(t1)
+        .set    noreorder
 #ifdef CONFIG_CPU_LITTLE_ENDIAN
 # if defined(__mips_isa_rev) && (__mips_isa_rev >= 2)
         wsbh    t0, $r_A
@@ -109,8 +111,7 @@ sk_load_half_positive:
 
 LEAF(sk_load_byte)
         is_offset_negative(byte)
-        .globl sk_load_byte_positive
-sk_load_byte_positive:
+FEXPORT(sk_load_byte_positive)
         is_offset_in_header(1, byte)
         /* Offset within header boundaries */
         PTR_ADDU t1, $r_skb_data, offset