David S. Miller 3118e6e19d 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>		2017-08-09 16:28:45 -07:00
..
boot	Xtensa improvements for v4.11:	2017-03-03 16:17:55 -08:00
configs	xtensa: add default memmap and mmio32native options to defconfigs	2016-09-20 20:43:24 -07:00
include	Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net	2017-08-09 16:28:45 -07:00
kernel	xtensa: don't limit csum_partial export by CONFIG_NET	2017-08-01 11:17:30 -07:00
lib	xtensa: get rid of zeroing, use RAW_COPY_USER	2017-03-28 18:24:07 -04:00
mm	xtensa: mm/cache: add missing EXPORT_SYMBOLs	2017-08-01 11:17:35 -07:00
oprofile	xtensa: move oprofile stack tracing to stacktrace.c	2015-08-17 07:32:49 +03:00
platforms	Xtensa fixes for v4.12-rc6	2017-06-13 15:09:10 +09:00
variants	xtensa: Added Cadence CSP kernel configuration for Xtensa	2016-09-09 18:39:09 -07:00
Kconfig	drivers: dma-mapping: allow dma_common_mmap() for NOMMU	2017-06-30 10:03:07 -07:00
Kconfig.debug	xtensa: disable link optimization	2014-12-15 23:47:24 -08:00
Makefile	xtensa: clean up bootable image build targets	2017-03-01 12:32:50 -08:00