The patch titled sysdev: fix missing s390 conversion has been removed from the -mm tree. Its filename was sysdev-fix-missing-s390-conversion.patch This patch was dropped because it was merged into mainline or a subsystem tree The current -mm tree may be found at http://userweb.kernel.org/~akpm/mmotm/ ------------------------------------------------------ Subject: sysdev: fix missing s390 conversion From: Heiko Carstens <heiko.carstens@xxxxxxxxxx> In linux-next "sysdev: Pass attribute in sysdev_class attributes show/store" forgot to convert one place in s390 code. Here is the missing part. Signed-off-by: Heiko Carstens <heiko.carstens@xxxxxxxxxx> Cc: Andi Kleen <ak@xxxxxxxxxxxxxxx> Cc: Martin Schwidefsky <schwidefsky@xxxxxxxxxx> Cc: Greg KH <greg@xxxxxxxxx> Signed-off-by: Andrew Morton <akpm@xxxxxxxxxxxxxxxxxxxx> --- arch/s390/kernel/smp.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff -puN arch/s390/kernel/smp.c~sysdev-fix-missing-s390-conversion arch/s390/kernel/smp.c --- a/arch/s390/kernel/smp.c~sysdev-fix-missing-s390-conversion +++ a/arch/s390/kernel/smp.c @@ -1033,7 +1033,9 @@ static ssize_t __ref rescan_store(struct static SYSDEV_CLASS_ATTR(rescan, 0200, NULL, rescan_store); #endif /* CONFIG_HOTPLUG_CPU */ -static ssize_t dispatching_show(struct sysdev_class *class, char *buf) +static ssize_t dispatching_show(struct sysdev_class *class, + struct sysdev_class_attribute *attr, + char *buf) { ssize_t count; _ Patches currently in -mm which might be from heiko.carstens@xxxxxxxxxx are origin.patch linux-next.patch vfs-introduce-fmode_neg_offset-for-allowing-negative-f_pos.patch cpumask-let-num__cpus-function-always-return-unsigned-values.patch add-generic-sys_old_select.patch add-generic-sys_old_mmap.patch add-generic-sys_ipc-wrapper.patch add-generic-sys_ipc-wrapper-fix.patch improve-sys_personality-for-compat-architectures.patch improve-sys_newuname-for-compat-architectures.patch add-generic-sys_olduname.patch -- To unsubscribe from this list: send the line "unsubscribe mm-commits" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html