Commit 6ddafdaa authored by Ingo Molnar's avatar Ingo Molnar
Browse files

Merge branch 'sched/locking' into sched/core 



Merge reason: the rq locking changes are stable,
              propagate them into the .40 queue.

Signed-off-by: default avatarIngo Molnar <mingo@elte.hu>
parents 3905c54f bd8e7dde

Documentation/feature-removal-schedule.txt

+0 −20
Original line number Original line Diff line number Diff line
@@ -387,26 +387,6 @@ Who: Tejun Heo <tj@kernel.org> 




----------------------------

----------------------------





What:	Support for lcd_switch and display_get in asus-laptop driver

When:	March 2010

Why:	These two features use non-standard interfaces. There are the

	only features that really need multiple path to guess what's

	the right method name on a specific laptop.



	Removing them will allow to remove a lot of code an significantly

	clean the drivers.



	This will affect the backlight code which won't be able to know

	if the backlight is on or off. The platform display file will also be

	write only (like the one in eeepc-laptop).



	This should'nt affect a lot of user because they usually know

	when their display is on or off.



Who:	Corentin Chary <corentin.chary@gmail.com>



----------------------------



What:	sysfs-class-rfkill state file

What:	sysfs-class-rfkill state file

When:	Feb 2014

When:	Feb 2014

Files:	net/rfkill/core.c

Files:	net/rfkill/core.c

MAINTAINERS

+7 −0
Original line number Original line Diff line number Diff line
@@ -6916,6 +6916,13 @@ T: git git://git.kernel.org/pub/scm/linux/kernel/git/mjg59/platform-drivers-x86. 
S:	Maintained

S:	Maintained

F:	drivers/platform/x86

F:	drivers/platform/x86





XEN NETWORK BACKEND DRIVER

M:	Ian Campbell <ian.campbell@citrix.com>

L:	xen-devel@lists.xensource.com (moderated for non-subscribers)

L:	netdev@vger.kernel.org

S:	Supported

F:	drivers/net/xen-netback/*



XEN PCI SUBSYSTEM

XEN PCI SUBSYSTEM

M:	Konrad Rzeszutek Wilk <konrad.wilk@oracle.com>

M:	Konrad Rzeszutek Wilk <konrad.wilk@oracle.com>

L:	xen-devel@lists.xensource.com (moderated for non-subscribers)

L:	xen-devel@lists.xensource.com (moderated for non-subscribers)

Makefile

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

VERSION = 2

PATCHLEVEL = 6

PATCHLEVEL = 6

SUBLEVEL = 39

SUBLEVEL = 39

EXTRAVERSION = -rc2

EXTRAVERSION = -rc3

NAME = Flesh-Eating Bats with Fangs

NAME = Flesh-Eating Bats with Fangs





# *DOCUMENTATION*

# *DOCUMENTATION*

arch/alpha/kernel/smp.c

+1 −2
Original line number Original line Diff line number Diff line
@@ -585,8 +585,7 @@ handle_ipi(struct pt_regs *regs) 




		switch (which) {

		switch (which) {

		case IPI_RESCHEDULE:

		case IPI_RESCHEDULE:

			/* Reschedule callback.  Everything to be done

			scheduler_ipi();

			   is done by the interrupt return path.  */

			break;

			break;





		case IPI_CALL_FUNC:

		case IPI_CALL_FUNC:

arch/arm/kernel/smp.c

+1 −4
Original line number Original line Diff line number Diff line
@@ -560,10 +560,7 @@ asmlinkage void __exception_irq_entry do_IPI(int ipinr, struct pt_regs *regs) 
		break;

		break;





	case IPI_RESCHEDULE:

	case IPI_RESCHEDULE:

		/*

		scheduler_ipi();

		 * nothing more to do - eveything is

		 * done on the interrupt return path

		 */

		break;

		break;





	case IPI_CALL_FUNC:

	case IPI_CALL_FUNC: