Commit 3118e6e1 authored by David S. Miller's avatar David S. Miller
Browse files

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: default avatarDavid 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