alistair23-linux/arch/s390
David S. Miller 68aaf44595 Merge git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net
Minor conflict in r8169, bug fix had two versions in net
and net-next, take the net-next hunks.

Signed-off-by: David S. Miller <davem@davemloft.net>
2019-08-27 14:23:31 -07:00
..
appldata proc/sysctl: add shared variables for range check 2019-07-18 17:08:07 -07:00
boot s390/protvirt: avoid memory sharing for diag 308 set/store 2019-08-06 13:58:34 +02:00
configs s390: update configs 2019-07-29 18:05:02 +02:00
crypto s390/crypto: sha: Use -ENODEV instead of -EOPNOTSUPP 2019-06-15 12:24:48 +02:00
hypfs s390/hypfs: fix a typo in the name of a function 2019-07-23 10:45:32 +02:00
include s390/qeth: add TX NAPI support for IQD devices 2019-08-24 16:39:18 -07:00
kernel s390/vdso: map vdso also for statically linked binaries 2019-08-09 11:03:28 +02:00
kvm KVM: remove kvm_arch_has_vcpu_debugfs() 2019-08-05 12:55:48 +02:00
lib s390/lib: add missing include 2019-07-29 18:05:02 +02:00
mm s390/mm: fix dump_pagetables top level page table walking 2019-08-06 13:58:34 +02:00
net s390/bpf: use 32-bit index for tail calls 2019-08-13 16:07:13 +02:00
numa treewide: add checks for the return value of memblock_alloc*() 2019-03-12 10:04:02 -07:00
oprofile s390/unwind: introduce stack unwind API 2019-05-02 13:54:11 +02:00
pci s390 updates for the 5.3 merge window #2 2019-07-12 15:39:22 -07:00
purgatory s390/purgatory: update .gitignore 2019-06-04 15:03:42 +02:00
scripts s390/build: use size command to perform empty .bss check 2019-08-08 14:36:53 +02:00
tools s390/disassembler: update opcode table 2019-06-04 15:03:58 +02:00
Kbuild s390/kexec_file: Add purgatory 2018-04-16 09:10:22 +02:00
Kconfig dma-direct: Force unencrypted DMA under SME for certain DMA masks 2019-07-16 22:15:46 +02:00
Kconfig.debug Kconfig: consolidate the "Kernel hacking" menu 2018-08-02 08:06:48 +09:00
Makefile Kconfig updates for v5.3 2019-07-12 16:06:27 -07:00