diff options
| author | David S. Miller <davem@davemloft.net> | 2015-10-20 15:08:27 +0200 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2015-10-20 15:08:27 +0200 |
| commit | 26440c835f8b1a491e2704118ac55bf87334366c (patch) | |
| tree | 3c2d23b59fd49b252fdbf6c09efc41b354933fc6 /arch/arm/net | |
| parent | Merge git://git.kernel.org/pub/scm/linux/kernel/git/pablo/nf-next (diff) | |
| parent | Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net (diff) | |
| download | linux-26440c835f8b1a491e2704118ac55bf87334366c.tar.xz linux-26440c835f8b1a491e2704118ac55bf87334366c.zip | |
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>
Diffstat (limited to 'arch/arm/net')
| -rw-r--r-- | arch/arm/net/bpf_jit_32.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/arch/arm/net/bpf_jit_32.c b/arch/arm/net/bpf_jit_32.c index 6be415111eec..2f4b14cfddb4 100644 --- a/arch/arm/net/bpf_jit_32.c +++ b/arch/arm/net/bpf_jit_32.c @@ -626,6 +626,7 @@ load_common: case BPF_LD | BPF_B | BPF_IND: load_order = 0; load_ind: + update_on_xread(ctx); OP_IMM3(ARM_ADD, r_off, r_X, k, ctx); goto load_common; case BPF_LDX | BPF_IMM: |