linux_dsm_epyc7002/arch/s390
David S. Miller 01adc4851a Merge git://git.kernel.org/pub/scm/linux/kernel/git/bpf/bpf-next
Minor conflict, a CHECK was placed into an if() statement
in net-next, whilst a newline was added to that CHECK
call in 'net'.  Thanks to Daniel for the merge resolution.

Signed-off-by: David S. Miller <davem@davemloft.net>
2018-05-07 23:35:08 -04:00
..
appldata s390: add a few more SPDX identifiers 2017-12-05 07:51:09 +01:00
boot s390/boot: remove unused COMPILE_VERSION and ccflags-y 2018-04-16 09:10:24 +02:00
configs s390: rename default_defconfig to debug_defconfig 2018-04-16 10:29:35 +02:00
crypto s390/crypto: Adjust s390 aes and paes cipher priorities 2018-04-10 07:38:54 +02:00
hypfs hypfs_kill_super(): deal with failed allocations 2018-04-15 23:48:04 -04:00
include s390: update sampling tag after task pid change 2018-04-23 07:57:17 +02:00
kernel s390: correct module section names for expoline code revert 2018-04-23 07:57:17 +02:00
kvm KVM: s390: provide counters for all interrupt injects/delivery 2018-03-14 19:21:18 +00:00
lib s390: fix preemption race in disable_sacf_uaccess 2017-12-15 15:05:21 +01:00
mm mm/gup.c: document return value 2018-04-13 17:10:27 -07:00
net bpf, s390x: remove ld_abs/ld_ind 2018-05-03 16:49:20 -07:00
numa s390: add a few more SPDX identifiers 2017-12-05 07:51:09 +01:00
oprofile License cleanup: add SPDX GPL-2.0 license identifier to files with no license 2017-11-02 11:10:55 +01:00
pci s390/pci: handle insufficient resources during dma tlb flush 2017-12-13 10:51:33 +01:00
purgatory s390/kexec_file: add generated files to .gitignore 2018-04-16 09:10:23 +02:00
tools KVM: s390: implement CPU model only facilities 2018-03-09 09:44:17 +00:00
defconfig s390: update defconfig 2018-04-16 10:29:34 +02:00
Kbuild s390/kexec_file: Add purgatory 2018-04-16 09:10:22 +02:00
Kconfig s390: add support for IBM z14 Model ZR1 2018-04-16 09:10:24 +02:00
Kconfig.debug License cleanup: add SPDX GPL-2.0 license identifier to files with no license 2017-11-02 11:10:55 +01:00
Makefile s390: add automatic detection of the spectre defense 2018-03-28 08:38:24 +02:00