linux_dsm_epyc7002/arch/s390
David S. Miller 6f6e434aa2 Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net
S390 bpf_jit.S is removed in net-next and had changes in 'net',
since that code isn't used any more take the removal.

TLS data structures split the TX and RX components in 'net-next',
put the new struct members from the bug fix in 'net' into the RX
part.

The 'net-next' tree had some reworking of how the ERSPAN code works in
the GRE tunneling code, overlapping with a one-line headroom
calculation fix in 'net'.

Overlapping changes in __sock_map_ctx_update_elem(), keep the bits
that read the prog members via READ_ONCE() into local variables
before using them.

Signed-off-by: David S. Miller <davem@davemloft.net>
2018-05-21 16:01:54 -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: update defconfigs 2018-04-27 06:51:31 +02:00
crypto s390/crc32-vx: use expoline for indirect branches 2018-05-07 09:07:34 +02:00
hypfs hypfs_kill_super(): deal with failed allocations 2018-04-15 23:48:04 -04:00
include s390: extend expoline to BC instructions 2018-05-07 21:12:42 +02:00
kernel s390/cpum_sf: ensure sample frequency of perf event attributes is non-zero 2018-05-08 15:56:36 +02:00
kvm KVM: s390: provide counters for all interrupt injects/delivery 2018-03-14 19:21:18 +00:00
lib s390/lib: use expoline for indirect branches 2018-05-07 09:07:36 +02:00
mm mm/gup.c: document return value 2018-04-13 17:10:27 -07:00
net Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net 2018-05-21 16:01:54 -04: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