Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 7cd2541c authored by Ingo Molnar's avatar Ingo Molnar
Browse files

Merge commit 'v2.6.36-rc7' into perf/core 



Conflicts:
	arch/x86/kernel/module.c

Merge reason: Resolve the conflict, pick up fixes.

Signed-off-by: default avatarIngo Molnar <mingo@elte.hu>
parents c62f981f cb655d0f

CREDITS

+4 −4
Original line number Diff line number Diff line
@@ -3554,12 +3554,12 @@ E: cvance@nai.com 
D: portions of the Linux Security Module (LSM) framework and security modules



N: Petr Vandrovec

E: vandrove@vc.cvut.cz

E: petr@vandrovec.name

D: Small contributions to ncpfs

D: Matrox framebuffer driver

S: Chudenicka 8

S: 10200 Prague 10, Hostivar

S: Czech Republic

S: 21513 Conradia Ct

S: Cupertino, CA 95014

S: USA



N: Thibaut Varene

E: T-Bone@parisc-linux.org

MAINTAINERS

+27 −11
Original line number Diff line number Diff line
@@ -962,6 +962,13 @@ W: http://www.fluff.org/ben/linux/ 
S:	Maintained

F:	arch/arm/mach-s3c6410/



ARM/S5P ARM ARCHITECTURES

M:	Kukjin Kim <kgene.kim@samsung.com>

L:	linux-arm-kernel@lists.infradead.org (moderated for non-subscribers)

L:	linux-samsung-soc@vger.kernel.org (moderated for non-subscribers)

S:	Maintained

F:	arch/arm/mach-s5p*/



ARM/SHMOBILE ARM ARCHITECTURE

M:	Paul Mundt <lethal@linux-sh.org>

M:	Magnus Damm <magnus.damm@gmail.com>
@@ -1220,7 +1227,7 @@ F: drivers/auxdisplay/ 
F:	include/linux/cfag12864b.h



AVR32 ARCHITECTURE

M:	Haavard Skinnemoen <hskinnemoen@atmel.com>

M:	Hans-Christian Egtvedt <hans-christian.egtvedt@atmel.com>

W:	http://www.atmel.com/products/AVR32/

W:	http://avr32linux.org/

W:	http://avrfreaks.net/
@@ -1228,7 +1235,7 @@ S: Supported 
F:	arch/avr32/



AVR32/AT32AP MACHINE SUPPORT

M:	Haavard Skinnemoen <hskinnemoen@atmel.com>

M:	Hans-Christian Egtvedt <hans-christian.egtvedt@atmel.com>

S:	Supported

F:	arch/avr32/mach-at32ap/
@@ -2199,6 +2206,12 @@ W: http://acpi4asus.sf.net 
S:	Maintained

F:	drivers/platform/x86/eeepc-laptop.c



EFIFB FRAMEBUFFER DRIVER

L:	linux-fbdev@vger.kernel.org

M:	Peter Jones <pjones@redhat.com>

S:	Maintained

F:	drivers/video/efifb.c



EFS FILESYSTEM

W:	http://aeschi.ch.eu.org/efs/

S:	Orphan
@@ -2662,6 +2675,8 @@ M: Guenter Roeck <guenter.roeck@ericsson.com> 
L:	lm-sensors@lm-sensors.org

W:	http://www.lm-sensors.org/

T:	quilt kernel.org/pub/linux/kernel/people/jdelvare/linux-2.6/jdelvare-hwmon/

T:	quilt kernel.org/pub/linux/kernel/people/groeck/linux-staging/

T:	git git://git.kernel.org/pub/scm/linux/kernel/git/groeck/linux-staging.git

S:	Maintained

F:	Documentation/hwmon/

F:	drivers/hwmon/
@@ -3773,9 +3788,8 @@ W: http://www.syskonnect.com 
S:	Supported



MATROX FRAMEBUFFER DRIVER

M:	Petr Vandrovec <vandrove@vc.cvut.cz>

L:	linux-fbdev@vger.kernel.org

S:	Maintained

S:	Orphan

F:	drivers/video/matrox/matroxfb_*

F:	include/linux/matroxfb.h
@@ -3899,10 +3913,8 @@ F: Documentation/serial/moxa-smartio 
F:	drivers/char/mxser.*



MSI LAPTOP SUPPORT

M:	Lennart Poettering <mzxreary@0pointer.de>

M:	Lee, Chun-Yi <jlee@novell.com>

L:	platform-driver-x86@vger.kernel.org

W:	https://tango.0pointer.de/mailman/listinfo/s270-linux

W:	http://0pointer.de/lennart/tchibo.html

S:	Maintained

F:	drivers/platform/x86/msi-laptop.c
@@ -3919,8 +3931,10 @@ S: Supported 
F:	drivers/mfd/



MULTIMEDIA CARD (MMC), SECURE DIGITAL (SD) AND SDIO SUBSYSTEM

S:	Orphan

M:	Chris Ball <cjb@laptop.org>

L:	linux-mmc@vger.kernel.org

T:	git git://git.kernel.org/pub/scm/linux/kernel/git/cjb/mmc.git

S:	Maintained

F:	drivers/mmc/

F:	include/linux/mmc/
@@ -3962,8 +3976,8 @@ S: Maintained 
F:	drivers/net/natsemi.c



NCP FILESYSTEM

M:	Petr Vandrovec <vandrove@vc.cvut.cz>

S:	Maintained

M:	Petr Vandrovec <petr@vandrovec.name>

S:	Odd Fixes

F:	fs/ncpfs/



NCR DUAL 700 SCSI DRIVER (MICROCHANNEL)
@@ -5091,8 +5105,10 @@ S: Maintained 
F:	drivers/mmc/host/sdricoh_cs.c



SECURE DIGITAL HOST CONTROLLER INTERFACE (SDHCI) DRIVER

S:	Orphan

M:	Chris Ball <cjb@laptop.org>

L:	linux-mmc@vger.kernel.org

T:	git git://git.kernel.org/pub/scm/linux/kernel/git/cjb/mmc.git

S:	Maintained

F:	drivers/mmc/host/sdhci.*



SECURE DIGITAL HOST CONTROLLER INTERFACE, OPEN FIRMWARE BINDINGS (SDHCI-OF)

Makefile

+1 −1
Original line number Diff line number Diff line 
VERSION = 2

PATCHLEVEL = 6

SUBLEVEL = 36

EXTRAVERSION = -rc5

EXTRAVERSION = -rc7

NAME = Sheep on Meth



# *DOCUMENTATION*

arch/alpha/kernel/entry.S

+7 −13
Original line number Diff line number Diff line
@@ -73,8 +73,6 @@ 
	ldq	$20, HAE_REG($19);	\

	stq	$21, HAE_CACHE($19);	\

	stq	$21, 0($20);		\

	ldq	$0, 0($sp);		\

	ldq	$1, 8($sp);		\

99:;					\

	ldq	$19, 72($sp);		\

	ldq	$20, 80($sp);		\
@@ -316,7 +314,7 @@ ret_from_sys_call: 
	cmovne	$26, 0, $19		/* $19 = 0 => non-restartable */

	ldq	$0, SP_OFF($sp)

	and	$0, 8, $0

	beq	$0, restore_all

	beq	$0, ret_to_kernel

ret_to_user:

	/* Make sure need_resched and sigpending don't change between

		sampling and the rti.  */
@@ -329,6 +327,11 @@ restore_all: 
	RESTORE_ALL

	call_pal PAL_rti



ret_to_kernel:

	lda	$16, 7

	call_pal PAL_swpipl

	br restore_all



	.align 3

$syscall_error:

	/*
@@ -657,7 +660,7 @@ kernel_thread: 
	/* We don't actually care for a3 success widgetry in the kernel.

	   Not for positive errno values.  */

	stq	$0, 0($sp)		/* $0 */

	br	restore_all

	br	ret_to_kernel

.end kernel_thread



/*
@@ -911,15 +914,6 @@ sys_execve: 
	jmp	$31, do_sys_execve

.end sys_execve



	.align	4

	.globl	osf_sigprocmask

	.ent	osf_sigprocmask

osf_sigprocmask:

	.prologue 0

	mov	$sp, $18

	jmp	$31, sys_osf_sigprocmask

.end osf_sigprocmask



	.align	4

	.globl	alpha_ni_syscall

	.ent	alpha_ni_syscall

arch/alpha/kernel/process.c

+1 −1
Original line number Diff line number Diff line
@@ -356,7 +356,7 @@ dump_elf_thread(elf_greg_t *dest, struct pt_regs *pt, struct thread_info *ti) 
	dest[27] = pt->r27;

	dest[28] = pt->r28;

	dest[29] = pt->gp;

	dest[30] = rdusp();

	dest[30] = ti == current_thread_info() ? rdusp() : ti->pcb.usp;

	dest[31] = pt->pc;



	/* Once upon a time this was the PS value.  Which is stupid