Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1754065AbbDNGpW (ORCPT ); Tue, 14 Apr 2015 02:45:22 -0400 Received: from e06smtp16.uk.ibm.com ([195.75.94.112]:47826 "EHLO e06smtp16.uk.ibm.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1753966AbbDNGpE (ORCPT ); Tue, 14 Apr 2015 02:45:04 -0400 Date: Tue, 14 Apr 2015 08:44:56 +0200 From: Martin Schwidefsky To: Linus Torvalds Cc: linux-kernel , linux-s390 , Heiko Carstens Subject: [GIT PULL] s390 patches for the 4.1 merge window Message-ID: <20150414084456.70e09aff@mschwide> X-Mailer: Claws Mail 3.9.3 (GTK+ 2.24.23; x86_64-pc-linux-gnu) MIME-Version: 1.0 Content-Type: text/plain; charset=US-ASCII Content-Transfer-Encoding: 7bit X-TM-AS-MML: disable X-Content-Scanned: Fidelis XPS MAILER x-cbid: 15041406-0025-0000-0000-000004B5C71F Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Length: 9580 Lines: 185 Hi Linus, please pull from the 'for-linus' branch of git://git.kernel.org/pub/scm/linux/kernel/git/s390/linux.git for-linus to receive the following updates: The major change in this merge is the removal of the support for 31-bit kernels. Naturally 31-bit user space will continue to work via the compat layer. And then some cleanup, some improvements and bug fixes. Heiko Carstens (17): s390: remove 31 bit support s390: remove "64" suffix from a couple of files s390: remove 31 bit syscalls s390/cmpxchg: simplify cmpxchg_double s390: remove test_facility(2) (== z/Architecture mode active) checks s390/traps: panic() instead of die() on translation exception s390/maccess: remove potentially broken probe_kernel_write() s390/maccess: improve s390_kernel_write() s390: make couple of functions and variables static s390: add missing arch_release_task_struct() declaration s390/uprobes: fix address space annotation s390: remove "64" suffix from mem64.S and swsusp_asm64.S s390/irq: enforce correct irqclass_sub_desc array size s390/syscalls: simplify syscall_get_arch() s390/cacheinfo: add missing facility check s390/hibernate: fix save and restore of kernel text section s390/smp: wait until secondaries are active & online Sebastian Ott (3): s390/ipl: cleanup bin attr usage s390/ipl: cleanup shutdown_action attributes s390/ipl: cleanup macro usage Stefan Haberland (1): s390/dasd: remove setting of scheduler from driver Xu Wang (2): s390/watchdog: enable KEEPALIVE for /dev/watchdog s390/watchdog: support for KVM hypervisors and delete pr_info messages arch/s390/Kbuild | 1 - arch/s390/Kconfig | 79 +- arch/s390/Makefile | 16 +- arch/s390/boot/compressed/Makefile | 12 +- arch/s390/boot/compressed/{head64.S => head.S} | 0 arch/s390/boot/compressed/head31.S | 51 - arch/s390/boot/compressed/vmlinux.lds.S | 5 - arch/s390/crypto/crypt_s390.h | 8 +- arch/s390/hypfs/hypfs_diag0c.c | 4 - arch/s390/include/asm/appldata.h | 24 - arch/s390/include/asm/atomic.h | 95 - arch/s390/include/asm/bitops.h | 28 - arch/s390/include/asm/cmpxchg.h | 7 +- arch/s390/include/asm/cputime.h | 26 - arch/s390/include/asm/ctl_reg.h | 14 +- arch/s390/include/asm/elf.h | 4 - arch/s390/include/asm/idals.h | 16 - arch/s390/include/asm/jump_label.h | 12 +- arch/s390/include/asm/lowcore.h | 159 -- arch/s390/include/asm/mman.h | 2 +- arch/s390/include/asm/mmu_context.h | 4 - arch/s390/include/asm/percpu.h | 4 - arch/s390/include/asm/perf_event.h | 3 - arch/s390/include/asm/pgalloc.h | 24 - arch/s390/include/asm/pgtable.h | 125 +- arch/s390/include/asm/processor.h | 66 +- arch/s390/include/asm/ptrace.h | 4 - arch/s390/include/asm/qdio.h | 10 - arch/s390/include/asm/runtime_instr.h | 10 +- arch/s390/include/asm/rwsem.h | 81 - arch/s390/include/asm/setup.h | 35 - arch/s390/include/asm/sfp-util.h | 10 - arch/s390/include/asm/sparsemem.h | 9 - arch/s390/include/asm/switch_to.h | 21 +- arch/s390/include/asm/syscall.h | 2 +- arch/s390/include/asm/thread_info.h | 11 +- arch/s390/include/asm/tlb.h | 4 - arch/s390/include/asm/tlbflush.h | 7 - arch/s390/include/asm/types.h | 17 - arch/s390/include/asm/uaccess.h | 1 + arch/s390/include/asm/unistd.h | 8 - arch/s390/include/asm/vdso.h | 2 - arch/s390/kernel/Makefile | 24 +- arch/s390/kernel/asm-offsets.c | 4 - arch/s390/kernel/base.S | 76 - arch/s390/kernel/cache.c | 4 + arch/s390/kernel/cpcmd.c | 10 - arch/s390/kernel/diag.c | 15 - arch/s390/kernel/dis.c | 48 +- arch/s390/kernel/dumpstack.c | 26 +- arch/s390/kernel/early.c | 69 - arch/s390/kernel/entry.S | 1005 ++++++----- arch/s390/kernel/entry64.S | 1059 ----------- arch/s390/kernel/ftrace.c | 12 +- arch/s390/kernel/head.S | 49 - arch/s390/kernel/head31.S | 106 -- arch/s390/kernel/head_kdump.S | 8 - arch/s390/kernel/ipl.c | 157 +- arch/s390/kernel/irq.c | 3 +- arch/s390/kernel/jump_label.c | 2 +- arch/s390/kernel/kprobes.c | 2 +- arch/s390/kernel/module.c | 12 - arch/s390/kernel/nmi.c | 92 +- arch/s390/kernel/pgm_check.S | 22 +- arch/s390/kernel/process.c | 29 +- arch/s390/kernel/ptrace.c | 46 +- arch/s390/kernel/reipl.S | 133 +- arch/s390/kernel/reipl64.S | 155 -- arch/s390/kernel/relocate_kernel.S | 63 +- arch/s390/kernel/relocate_kernel64.S | 121 -- arch/s390/kernel/sclp.S | 10 - arch/s390/kernel/setup.c | 72 - arch/s390/kernel/signal.c | 10 - arch/s390/kernel/smp.c | 36 +- arch/s390/kernel/suspend.c | 4 + arch/s390/kernel/{swsusp_asm64.S => swsusp.S} | 0 arch/s390/kernel/sys_s390.c | 49 - arch/s390/kernel/syscalls.S | 716 ++++---- arch/s390/kernel/topology.c | 2 +- arch/s390/kernel/traps.c | 155 +- arch/s390/kernel/uprobes.c | 4 +- arch/s390/kernel/vdso.c | 16 +- arch/s390/kernel/vmlinux.lds.S | 7 - arch/s390/lib/Makefile | 3 +- arch/s390/lib/div64.c | 147 -- arch/s390/lib/{mem64.S => mem.S} | 0 arch/s390/lib/mem32.S | 92 - arch/s390/lib/qrnnd.S | 78 - arch/s390/lib/uaccess.c | 136 +- arch/s390/lib/ucmpdi2.c | 26 - arch/s390/math-emu/Makefile | 7 - arch/s390/math-emu/math.c | 2255 ------------------------ arch/s390/mm/dump_pagetables.c | 24 +- arch/s390/mm/extmem.c | 14 - arch/s390/mm/fault.c | 36 - arch/s390/mm/gup.c | 4 - arch/s390/mm/init.c | 5 - arch/s390/mm/maccess.c | 70 +- arch/s390/mm/mem_detect.c | 4 - arch/s390/mm/mmap.c | 27 +- arch/s390/mm/pageattr.c | 2 +- arch/s390/mm/pgtable.c | 8 - arch/s390/mm/vmem.c | 10 +- arch/s390/oprofile/Makefile | 2 +- arch/s390/oprofile/init.c | 11 - arch/s390/pci/pci.c | 3 +- drivers/s390/block/dasd.c | 13 +- drivers/s390/block/dasd_diag.h | 42 - drivers/s390/block/dasd_eckd.c | 6 - drivers/s390/block/dasd_fba.c | 2 - drivers/s390/char/Kconfig | 2 +- drivers/s390/char/sclp_sdias.c | 4 - drivers/s390/char/zcore.c | 32 - drivers/s390/cio/cio.c | 2 - drivers/s390/cio/qdio.h | 7 - drivers/s390/cio/qdio_setup.c | 3 - drivers/s390/crypto/ap_bus.c | 24 +- drivers/s390/net/ctcm_mpc.c | 12 - drivers/watchdog/diag288_wdt.c | 20 +- 119 files changed, 1337 insertions(+), 7250 deletions(-) rename arch/s390/boot/compressed/{head64.S => head.S} (100%) delete mode 100644 arch/s390/boot/compressed/head31.S delete mode 100644 arch/s390/kernel/entry64.S delete mode 100644 arch/s390/kernel/head31.S delete mode 100644 arch/s390/kernel/reipl64.S delete mode 100644 arch/s390/kernel/relocate_kernel64.S rename arch/s390/kernel/{swsusp_asm64.S => swsusp.S} (100%) delete mode 100644 arch/s390/lib/div64.c rename arch/s390/lib/{mem64.S => mem.S} (100%) delete mode 100644 arch/s390/lib/mem32.S delete mode 100644 arch/s390/lib/qrnnd.S delete mode 100644 arch/s390/lib/ucmpdi2.c delete mode 100644 arch/s390/math-emu/Makefile delete mode 100644 arch/s390/math-emu/math.c -- To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/