* [GIT PULL] s390 patches for 3.3
@ 2012-01-07 19:01 Martin Schwidefsky
2012-01-08 23:17 ` Linus Torvalds
0 siblings, 1 reply; 4+ messages in thread
From: Martin Schwidefsky @ 2012-01-07 19:01 UTC (permalink / raw)
To: Linus Torvalds; +Cc: linux-kernel, linux-s390, Heiko Carstens
Hi Linus,
please pull from 'for-linus' branch of
git://git.kernel.org/pub/scm/linux/kernel/git/s390/linux.git for-linus
to receive the following updates:
Carsten Otte (1):
[S390] disable MACHINE_IS_VM check for pfault
Christian Borntraeger (1):
[S390] kvm: fix sleeping function ... at mm/page_alloc.c:2260
Heiko Carsten (1):
[S390] sysctl: get rid of dead declaration
Heiko Carstens (9):
[S390] irq: fix accounting of external call/emergency signal
[S390] topology: get rid of ifdefs
[S390] qdio: fix qdio_allocate_aob() declaration
[S390] topology: cleanup z10 topology handling
[S390] topology: increase poll frequency if change is anticipated
[S390] Remove Kerntypes leftovers
[S390] ipc: call generic sys_ipc demultiplexer
[S390] Enable exception traces by default
[S390] disassembler: mark exception causing instructions
Holger Dengler (2):
[S390] zcrypt: Rework length parameter checking.
[S390] zcrypt: Fix error return codes.
Jan Glauber (1):
[S390] make arch/s390 subdirectories depend on config option
Martin Schwidefsky (6):
[S390] add support for physical memory > 4TB
[S390] kvm: move cmf host id constant out of lowcore
[S390] entry[64].S improvements
[S390] cleanup trap handling
[S390] outstanding interrupts vs. smp_send_stop
[S390] return address of compat signals
Michael Holzheu (6):
[S390] Check for NULL termination in command line setup
[S390] Rework create_mem_hole() function
[S390] Remove useless newline in reserve_kdump_bootmem()
[S390] kernel: Fix smp_switch_to_ipl_cpu() stack frame setup
[S390] Add VMCOREINFO_SYMBOL(high_memory) to vmcoreinfo
[S390] Add s390x description to Documentation/kdump/kdump.txt
Stefan Haberland (2):
[S390] dasd: add sanity check to detect path connection error
[S390] dasd: fix fixpoint divide exception in define_extent
Stefan Weinhuber (1):
[S390] dasd: fix expiration handling for recovery requests
Steffen Maier (1):
[S390] qdio: fix kernel panic for zfcp 31-bit
--
blue skies,
Martin.
"Reality continues to ruin my life." - Calvin.
^ permalink raw reply [flat|nested] 4+ messages in thread* Re: [GIT PULL] s390 patches for 3.3 2012-01-07 19:01 [GIT PULL] s390 patches for 3.3 Martin Schwidefsky @ 2012-01-08 23:17 ` Linus Torvalds 2012-01-09 7:47 ` Martin Schwidefsky 0 siblings, 1 reply; 4+ messages in thread From: Linus Torvalds @ 2012-01-08 23:17 UTC (permalink / raw) To: Martin Schwidefsky; +Cc: linux-kernel, linux-s390, Heiko Carstens On Sat, Jan 7, 2012 at 11:01 AM, Martin Schwidefsky <schwidefsky@de.ibm.com> wrote: > > please pull from 'for-linus' branch of > > git://git.kernel.org/pub/scm/linux/kernel/git/s390/linux.git for-linus > > to receive the following updates: Where did the diffstat go? I'm pretty sure you usually send it, and I really want diffstat (in addition to the shortlog) to verify pull requests.. Linus ^ permalink raw reply [flat|nested] 4+ messages in thread
* Re: [GIT PULL] s390 patches for 3.3 2012-01-08 23:17 ` Linus Torvalds @ 2012-01-09 7:47 ` Martin Schwidefsky 2012-01-09 9:23 ` Martin Schwidefsky 0 siblings, 1 reply; 4+ messages in thread From: Martin Schwidefsky @ 2012-01-09 7:47 UTC (permalink / raw) To: Linus Torvalds; +Cc: linux-kernel, linux-s390, Heiko Carstens On Sun, 8 Jan 2012 15:17:38 -0800 Linus Torvalds <torvalds@linux-foundation.org> wrote: > On Sat, Jan 7, 2012 at 11:01 AM, Martin Schwidefsky > <schwidefsky@de.ibm.com> wrote: > > > > please pull from 'for-linus' branch of > > > > git://git.kernel.org/pub/scm/linux/kernel/git/s390/linux.git for-linus > > > > to receive the following updates: > > Where did the diffstat go? I'm pretty sure you usually send it, and I > really want diffstat (in addition to the shortlog) to verify pull > requests.. >From the merge window pulls I usually remove the patch itself. Seems like I removed the diffstat as well. Once more with feeling: please pull from 'for-linus' branch of git://git.kernel.org/pub/scm/linux/kernel/git/s390/linux.git for-linus to receive the following updates: Carsten Otte (1): [S390] disable MACHINE_IS_VM check for pfault Christian Borntraeger (1): [S390] kvm: fix sleeping function ... at mm/page_alloc.c:2260 Heiko Carsten (1): [S390] sysctl: get rid of dead declaration Heiko Carstens (9): [S390] irq: fix accounting of external call/emergency signal [S390] topology: get rid of ifdefs [S390] qdio: fix qdio_allocate_aob() declaration [S390] topology: cleanup z10 topology handling [S390] topology: increase poll frequency if change is anticipated [S390] Remove Kerntypes leftovers [S390] ipc: call generic sys_ipc demultiplexer [S390] Enable exception traces by default [S390] disassembler: mark exception causing instructions Holger Dengler (2): [S390] zcrypt: Rework length parameter checking. [S390] zcrypt: Fix error return codes. Jan Glauber (1): [S390] make arch/s390 subdirectories depend on config option Martin Schwidefsky (6): [S390] add support for physical memory > 4TB [S390] kvm: move cmf host id constant out of lowcore [S390] entry[64].S improvements [S390] cleanup trap handling [S390] outstanding interrupts vs. smp_send_stop [S390] return address of compat signals Michael Holzheu (6): [S390] Check for NULL termination in command line setup [S390] Rework create_mem_hole() function [S390] Remove useless newline in reserve_kdump_bootmem() [S390] kernel: Fix smp_switch_to_ipl_cpu() stack frame setup [S390] Add VMCOREINFO_SYMBOL(high_memory) to vmcoreinfo [S390] Add s390x description to Documentation/kdump/kdump.txt Stefan Haberland (2): [S390] dasd: add sanity check to detect path connection error [S390] dasd: fix fixpoint divide exception in define_extent Stefan Weinhuber (1): [S390] dasd: fix expiration handling for recovery requests Steffen Maier (1): [S390] qdio: fix kernel panic for zfcp 31-bit Documentation/dontdiff | 1 - Documentation/kdump/kdump.txt | 35 +- Documentation/s390/Debugging390.txt | 34 -- arch/s390/Kbuild | 13 +- arch/s390/Kconfig | 11 +- arch/s390/Makefile | 1 - arch/s390/boot/Makefile | 2 +- arch/s390/include/asm/kdebug.h | 2 +- arch/s390/include/asm/lowcore.h | 142 +++--- arch/s390/include/asm/pgtable.h | 23 +- arch/s390/include/asm/processor.h | 2 - arch/s390/include/asm/ptrace.h | 3 +- arch/s390/include/asm/qdio.h | 5 +- arch/s390/include/asm/sigp.h | 1 + arch/s390/include/asm/smp.h | 1 - arch/s390/include/asm/sparsemem.h | 4 +- arch/s390/include/asm/syscall.h | 2 +- arch/s390/include/asm/system.h | 2 - arch/s390/include/asm/topology.h | 40 ++- arch/s390/include/asm/unistd.h | 1 + arch/s390/kernel/Makefile | 3 +- arch/s390/kernel/asm-offsets.c | 8 +- arch/s390/kernel/base.S | 16 +- arch/s390/kernel/compat_linux.c | 3 - arch/s390/kernel/compat_signal.c | 12 +- arch/s390/kernel/dis.c | 9 +- arch/s390/kernel/early.c | 20 +- arch/s390/kernel/entry.S | 1103 +++++++++++++++-------------------- arch/s390/kernel/entry.h | 10 +- arch/s390/kernel/entry64.S | 976 ++++++++++++++----------------- arch/s390/kernel/head.S | 4 +- arch/s390/kernel/machine_kexec.c | 1 + arch/s390/kernel/mem_detect.c | 122 +++-- arch/s390/kernel/reipl64.S | 4 +- arch/s390/kernel/setup.c | 69 ++- arch/s390/kernel/signal.c | 20 +- arch/s390/kernel/smp.c | 173 +++---- arch/s390/kernel/sys_s390.c | 76 +-- arch/s390/kernel/topology.c | 275 ++++++--- arch/s390/kernel/traps.c | 170 ++---- arch/s390/mm/fault.c | 107 ++-- arch/s390/mm/init.c | 16 +- arch/s390/mm/pgtable.c | 14 +- drivers/s390/block/dasd_3990_erp.c | 4 +- drivers/s390/block/dasd_alias.c | 10 + drivers/s390/block/dasd_eckd.c | 411 ++++++++++---- drivers/s390/cio/qdio_setup.c | 10 +- drivers/s390/crypto/zcrypt_pcixcc.c | 32 +- drivers/s390/net/qeth_core_main.c | 2 +- 49 files changed, 1986 insertions(+), 2019 deletions(-) ^ permalink raw reply [flat|nested] 4+ messages in thread
* Re: [GIT PULL] s390 patches for 3.3 2012-01-09 7:47 ` Martin Schwidefsky @ 2012-01-09 9:23 ` Martin Schwidefsky 0 siblings, 0 replies; 4+ messages in thread From: Martin Schwidefsky @ 2012-01-09 9:23 UTC (permalink / raw) To: Linus Torvalds; +Cc: linux-kernel, linux-s390, Heiko Carstens On Mon, 9 Jan 2012 08:47:28 +0100 Martin Schwidefsky <schwidefsky@de.ibm.com> wrote: > On Sun, 8 Jan 2012 15:17:38 -0800 > Linus Torvalds <torvalds@linux-foundation.org> wrote: > > > On Sat, Jan 7, 2012 at 11:01 AM, Martin Schwidefsky > > <schwidefsky@de.ibm.com> wrote: > > > > > > please pull from 'for-linus' branch of > > > > > > git://git.kernel.org/pub/scm/linux/kernel/git/s390/linux.git for-linus > > > > > > to receive the following updates: > > > > Where did the diffstat go? I'm pretty sure you usually send it, and I > > really want diffstat (in addition to the shortlog) to verify pull > > requests.. > > From the merge window pulls I usually remove the patch itself. Seems like > I removed the diffstat as well. Once more with feeling: > > please pull from 'for-linus' branch of > > git://git.kernel.org/pub/scm/linux/kernel/git/s390/linux.git for-linus > Crap, commit 83a24e32908476 "[S390] topology: get rid of ifdefs" now creates a non-trivial merge conflict with upstream. And commits 4baeb964d96d38df "[S390] topology: cleanup z10 topology handling" and d68bddb7329a4d47 "[S390] topology: increase poll frequency if change is anticipated" depend on 83a24e32908476. I sorted it out in my local tree but I know that you don't like late rebases. This is how I fixed the conflict: diff -urpN linux/arch/s390/kernel/smp.c linux-s390/arch/s390/kernel/smp.c --- linux/arch/s390/kernel/smp.c 2012-01-09 10:16:34.000000000 +0100 +++ linux-s390/arch/s390/kernel/smp.c 2012-01-09 10:18:20.000000000 +0100 @@ -926,42 +926,8 @@ out: static DEVICE_ATTR(configure, 0644, cpu_configure_show, cpu_configure_store); #endif /* CONFIG_HOTPLUG_CPU */ -<<<<<<< HEAD -static ssize_t cpu_polarization_show(struct device *dev, - struct device_attribute *attr, char *buf) -{ - int cpu = dev->id; - ssize_t count; - - mutex_lock(&smp_cpu_state_mutex); - switch (smp_cpu_polarization[cpu]) { - case POLARIZATION_HRZ: - count = sprintf(buf, "horizontal\n"); - break; - case POLARIZATION_VL: - count = sprintf(buf, "vertical:low\n"); - break; - case POLARIZATION_VM: - count = sprintf(buf, "vertical:medium\n"); - break; - case POLARIZATION_VH: - count = sprintf(buf, "vertical:high\n"); - break; - default: - count = sprintf(buf, "unknown\n"); - break; - } - mutex_unlock(&smp_cpu_state_mutex); - return count; -} -static DEVICE_ATTR(polarization, 0444, cpu_polarization_show, NULL); - static ssize_t show_cpu_address(struct device *dev, struct device_attribute *attr, char *buf) -======= -static ssize_t show_cpu_address(struct sys_device *dev, - struct sysdev_attribute *attr, char *buf) ->>>>>>> FETCH_HEAD { return sprintf(buf, "%d\n", __cpu_logical_map[dev->id]); } @@ -971,12 +937,7 @@ static struct attribute *cpu_common_attr #ifdef CONFIG_HOTPLUG_CPU &dev_attr_configure.attr, #endif -<<<<<<< HEAD &dev_attr_address.attr, - &dev_attr_polarization.attr, -======= - &attr_address.attr, ->>>>>>> FETCH_HEAD NULL, }; @@ -1162,51 +1123,7 @@ static ssize_t __ref rescan_store(struct static DEVICE_ATTR(rescan, 0200, NULL, rescan_store); #endif /* CONFIG_HOTPLUG_CPU */ -<<<<<<< HEAD -static ssize_t dispatching_show(struct device *dev, - struct device_attribute *attr, - char *buf) -{ - ssize_t count; - - mutex_lock(&smp_cpu_state_mutex); - count = sprintf(buf, "%d\n", cpu_management); - mutex_unlock(&smp_cpu_state_mutex); - return count; -} - -static ssize_t dispatching_store(struct device *dev, - struct device_attribute *attr, - const char *buf, - size_t count) -{ - int val, rc; - char delim; - - if (sscanf(buf, "%d %c", &val, &delim) != 1) - return -EINVAL; - if (val != 0 && val != 1) - return -EINVAL; - rc = 0; - get_online_cpus(); - mutex_lock(&smp_cpu_state_mutex); - if (cpu_management == val) - goto out; - rc = topology_set_cpu_management(val); - if (!rc) - cpu_management = val; -out: - mutex_unlock(&smp_cpu_state_mutex); - put_online_cpus(); - return rc ? rc : count; -} -static DEVICE_ATTR(dispatching, 0644, dispatching_show, - dispatching_store); - -static int __init topology_init(void) -======= static int __init s390_smp_init(void) ->>>>>>> FETCH_HEAD { int cpu, rc; @@ -1216,12 +1133,6 @@ static int __init s390_smp_init(void) if (rc) return rc; #endif -<<<<<<< HEAD - rc = device_create_file(cpu_subsys.dev_root, &dev_attr_dispatching); - if (rc) - return rc; -======= ->>>>>>> FETCH_HEAD for_each_present_cpu(cpu) { rc = smp_add_present_cpu(cpu); if (rc) diff -urpN linux/arch/s390/kernel/topology.c linux-s390/arch/s390/kernel/topology.c --- linux/arch/s390/kernel/topology.c 2012-01-09 10:16:34.000000000 +0100 +++ linux-s390/arch/s390/kernel/topology.c 2012-01-09 10:13:29.000000000 +0100 @@ -366,8 +366,8 @@ void __init s390_init_cpu_topology(void) static int cpu_management; -static ssize_t dispatching_show(struct sysdev_class *class, - struct sysdev_class_attribute *attr, +static ssize_t dispatching_show(struct device *dev, + struct device_attribute *attr, char *buf) { ssize_t count; @@ -378,8 +378,8 @@ static ssize_t dispatching_show(struct s return count; } -static ssize_t dispatching_store(struct sysdev_class *dev, - struct sysdev_class_attribute *attr, +static ssize_t dispatching_store(struct device *dev, + struct device_attribute *attr, const char *buf, size_t count) { @@ -405,11 +405,11 @@ out: put_online_cpus(); return rc ? rc : count; } -static SYSDEV_CLASS_ATTR(dispatching, 0644, dispatching_show, +static DEVICE_ATTR(dispatching, 0644, dispatching_show, dispatching_store); -static ssize_t cpu_polarization_show(struct sys_device *dev, - struct sysdev_attribute *attr, char *buf) +static ssize_t cpu_polarization_show(struct device *dev, + struct device_attribute *attr, char *buf) { int cpu = dev->id; ssize_t count; @@ -435,10 +435,10 @@ static ssize_t cpu_polarization_show(str mutex_unlock(&smp_cpu_state_mutex); return count; } -static SYSDEV_ATTR(polarization, 0444, cpu_polarization_show, NULL); +static DEVICE_ATTR(polarization, 0444, cpu_polarization_show, NULL); static struct attribute *topology_cpu_attrs[] = { - &attr_polarization.attr, + &dev_attr_polarization.attr, NULL, }; @@ -448,7 +448,7 @@ static struct attribute_group topology_c int topology_cpu_init(struct cpu *cpu) { - return sysfs_create_group(&cpu->sysdev.kobj, &topology_cpu_attr_group); + return sysfs_create_group(&cpu->dev.kobj, &topology_cpu_attr_group); } static int __init topology_init(void) @@ -460,6 +460,6 @@ static int __init topology_init(void) set_topology_timer(); out: update_cpu_core_map(); - return sysdev_class_create_file(&cpu_sysdev_class, &attr_dispatching); + return device_create_file(cpu_subsys.dev_root, &dev_attr_dispatching); } device_initcall(topology_init); -- blue skies, Martin. "Reality continues to ruin my life." - Calvin. ^ permalink raw reply [flat|nested] 4+ messages in thread
end of thread, other threads:[~2012-01-09 9:23 UTC | newest] Thread overview: 4+ messages (download: mbox.gz / follow: Atom feed) -- links below jump to the message on this page -- 2012-01-07 19:01 [GIT PULL] s390 patches for 3.3 Martin Schwidefsky 2012-01-08 23:17 ` Linus Torvalds 2012-01-09 7:47 ` Martin Schwidefsky 2012-01-09 9:23 ` Martin Schwidefsky
This is a public inbox, see mirroring instructions for how to clone and mirror all data and code used for this inbox; as well as URLs for NNTP newsgroup(s).