Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 3118e6e1 authored Aug 09, 2017 by David S. Miller

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



The UDP offload conflict is dealt with by simply taking what is
in net-next where we have removed all of the UFO handling code
entirely.

The TCP conflict was a case of local variables in a function
being removed from both net and net-next.

In netvsc we had an assignment right next to where a missing
set of u64 stats sync object inits were added.

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

parents feca7d8c 48fb6f4d

MAINTAINERS

+2 −2

Original line number	Diff line number	Diff line
		@@ -1161,7 +1161,7 @@ M: Brendan Higgins <brendanhiggins@google.com>
		R: Benjamin Herrenschmidt <benh@kernel.crashing.org>
		R: Joel Stanley <joel@jms.id.au>
		L: linux-i2c@vger.kernel.org
		L: openbmc@lists.ozlabs.org
		L: openbmc@lists.ozlabs.org (moderated for non-subscribers)
		S: Maintained
		F: drivers/irqchip/irq-aspeed-i2c-ic.c
		F: drivers/i2c/busses/i2c-aspeed.c
		@@ -5835,7 +5835,7 @@ F: drivers/staging/greybus/spi.c
		F: drivers/staging/greybus/spilib.c
		F: drivers/staging/greybus/spilib.h

		GREYBUS LOOBACK/TIME PROTOCOLS DRIVERS
		GREYBUS LOOPBACK/TIME PROTOCOLS DRIVERS
		M: Bryan O'Donoghue <pure.logic@nexus-software.ie>
		S: Maintained
		F: drivers/staging/greybus/loopback.c

arch/mips/net/ebpf_jit.c

0 → 100644

+1950 −0

File added.

Preview size limit exceeded, changes collapsed.

arch/s390/net/bpf_jit_comp.c

+2 −1

Original line number	Diff line number	Diff line
		@@ -1253,7 +1253,8 @@ static int bpf_jit_prog(struct bpf_jit jit, struct bpf_prog fp)
		insn_count = bpf_jit_insn(jit, fp, i);
		if (insn_count < 0)
		return -1;
		jit->addrs[i + 1] = jit->prg; /* Next instruction address */
		/* Next instruction address */
		jit->addrs[i + insn_count] = jit->prg;
		}
		bpf_jit_epilogue(jit);

arch/xtensa/include/asm/Kbuild

+2 −0

Original line number	Diff line number	Diff line
		generic-y += bug.h
		generic-y += clkdev.h
		generic-y += device.h
		generic-y += div64.h
		generic-y += dma-contiguous.h
		generic-y += emergency-restart.h
		@@ -17,6 +18,7 @@ generic-y += local.h
		generic-y += local64.h
		generic-y += mcs_spinlock.h
		generic-y += mm-arch-hooks.h
		generic-y += param.h
		generic-y += percpu.h
		generic-y += preempt.h
		generic-y += rwsem.h

arch/xtensa/include/asm/device.h

deleted100644 → 0

+0 −15

Original line number	Diff line number	Diff line
		/*
		* Arch specific extensions to struct device
		*
		* This file is released under the GPLv2
		*/
		#ifndef _ASM_XTENSA_DEVICE_H
		#define _ASM_XTENSA_DEVICE_H

		struct dev_archdata {
		};

		struct pdev_archdata {
		};

		#endif /* _ASM_XTENSA_DEVICE_H */