David S. Miller 0ddead90b2 Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net ... The conflicts were two cases of overlapping changes in batman-adv and the qed driver. Signed-off-by: David S. Miller <davem@davemloft.net>		2017-06-15 11:59:32 -04: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/crypt: use the correct module alias for paes_s390.	2017-04-26 16:52:57 +02:00
hypfs	s390: hypfs: make inode explicitly non-modular	2016-10-31 17:55:40 +01:00
include	Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net	2017-06-15 11:59:32 -04:00
kernel	s390/kvm: do not rely on the ILC on kvm host protection fauls	2017-05-17 12:34:03 +02:00
kvm	KVM: s390: fix ais handling vs cpu model	2017-05-31 19:54:49 +02:00
lib	s390/uaccess: use sane length for __strncpy_from_user()	2017-05-09 10:43:24 +02:00
mm	s390: use set_memory.h header	2017-05-08 17:15:13 -07:00
net	bpf: Add jited_len to struct bpf_prog	2017-06-06 15:41:24 -04:00
numa	s390/numa: pin all possible cpus to nodes early	2016-12-07 07:23:33 +01:00
oprofile	s390/dumpstack: restore reliable indicator for call traces	2016-10-17 14:44:30 +02:00
pci	s390/pci: remove forward declaration	2017-04-05 07:35:24 +02:00
tools	s390: kvm: Cpu model support for msa6, msa7 and msa8	2017-04-26 14:19:01 +02:00
Kbuild	s390/crypto: Provide s390 specific arch random functionality.	2017-04-26 13:41:35 +02:00
Kconfig	security/keys: add CONFIG_KEYS_COMPAT to Kconfig	2017-06-09 13:29:45 +10: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	s390: add assembler include path for vx-insn.h	2016-09-06 11:00:04 +02:00
defconfig	s390: update defconfig	2017-06-08 15:53:48 +02:00