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
..
appldata	sched/headers: Move task statistics APIs from <linux/sched.h> to <linux/sched/stat.h>	2017-03-03 01:43:43 +01:00
boot	s390/decompressor: fix initrd corruption caused by bss clear	2017-03-22 08:21:20 +01:00
configs	s390: update defconfig	2017-06-08 15:53:48 +02:00
crypto	s390/crypto: fix aes/paes Kconfig dependeny	2017-06-12 16:25:58 +02:00
hypfs	s390: hypfs: make inode explicitly non-modular	2016-10-31 17:55:40 +01:00
include	sock: add SOCK_ZEROCOPY sockopt	2017-08-03 21:37:29 -07:00
kernel	Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/s390/linux	2017-07-25 08:44:27 -07:00
kvm	KVM: s390: take srcu lock when getting/setting storage keys	2017-07-25 14:59:52 +02:00
lib	s390/uaccess: use sane length for __strncpy_from_user()	2017-05-09 10:43:24 +02:00
mm	s390/mm: set change and reference bit on lazy key enablement	2017-07-13 11:28:29 +02:00
net	bpf, s390: fix jit branch offset related to ldimm64	2017-08-04 11:18:01 -07:00
numa	s390/numa: pin all possible cpus to nodes early	2016-12-07 07:23:33 +01:00
oprofile
pci	This is the first pull request for the new dma-mapping subsystem	2017-07-06 19:20:54 -07:00
tools	s390/facilities: remove stfle requirement	2017-06-12 16:25:59 +02:00
defconfig	s390: update defconfig	2017-06-08 15:53:48 +02:00
Kbuild	s390/crypto: Provide s390 specific arch random functionality.	2017-04-26 13:41:35 +02:00
Kconfig	mm/hugetlb: clean up ARCH_HAS_GIGANTIC_PAGE	2017-07-06 16:24:33 -07:00
Kconfig.debug	Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/s390/linux	2017-02-22 10:20:04 -08:00
Makefile