Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/s390/linux
Pull more s390 updates from Martin Schwidefsky: "The big thing in this second merge for s390 is the new eBPF JIT from Michael which replaces the old 32-bit backend. The remaining commits are bug fixes" * 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/s390/linux: s390/pci: add locking for fmb access s390/pci: extract software counters from fmb s390/dasd: Fix unresumed device after suspend/resume having no paths s390/dasd: fix unresumed device after suspend/resume s390/dasd: fix inability to set a DASD device offline s390/mm: Fix memory hotplug for unaligned standby memory s390/bpf: Add s390x eBPF JIT compiler backend s390: Use bool function return values of true/false not 1/0
Showing
- arch/s390/Kconfig 1 addition, 1 deletionarch/s390/Kconfig
- arch/s390/include/asm/dma-mapping.h 1 addition, 1 deletionarch/s390/include/asm/dma-mapping.h
- arch/s390/include/asm/pci.h 6 additions, 4 deletionsarch/s390/include/asm/pci.h
- arch/s390/net/bpf_jit.S 89 additions, 108 deletionsarch/s390/net/bpf_jit.S
- arch/s390/net/bpf_jit.h 58 additions, 0 deletionsarch/s390/net/bpf_jit.h
- arch/s390/net/bpf_jit_comp.c 1086 additions, 694 deletionsarch/s390/net/bpf_jit_comp.c
- arch/s390/pci/pci.c 6 additions, 0 deletionsarch/s390/pci/pci.c
- arch/s390/pci/pci_debug.c 22 additions, 11 deletionsarch/s390/pci/pci_debug.c
- arch/s390/pci/pci_dma.c 4 additions, 4 deletionsarch/s390/pci/pci_dma.c
- drivers/s390/block/dasd.c 27 additions, 15 deletionsdrivers/s390/block/dasd.c
- drivers/s390/block/dasd_eckd.c 2 additions, 1 deletiondrivers/s390/block/dasd_eckd.c
- drivers/s390/char/sclp_cmd.c 46 additions, 2 deletionsdrivers/s390/char/sclp_cmd.c
Please register or sign in to comment