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

Commit a4c98f8b authored by Ingo Molnar's avatar Ingo Molnar
Browse files

Merge branch 'linus' into sched/locking 



Merge reason: Pick up this upstream commit:

  6631e635: block: don't flush plugged IO on forced preemtion scheduling

As it modifies the scheduler and we'll queue up dependent patches.

Signed-off-by: default avatarIngo Molnar <mingo@elte.hu>
parents f4ad9bd2 85f2e689

Documentation/feature-removal-schedule.txt

+0 −20
Original line number 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

When:	Feb 2014

Files:	net/rfkill/core.c

MAINTAINERS

+7 −0
Original line number 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

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

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

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

Makefile

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

PATCHLEVEL = 6

SUBLEVEL = 39

EXTRAVERSION = -rc2

EXTRAVERSION = -rc3

NAME = Flesh-Eating Bats with Fangs



# *DOCUMENTATION*

arch/avr32/include/asm/setup.h

+9 −0
Original line number Diff line number Diff line
@@ -94,6 +94,13 @@ struct tag_ethernet { 


#define ETH_INVALID_PHY	0xff



/* board information */

#define ATAG_BOARDINFO	0x54410008



struct tag_boardinfo {

	u32	board_number;

};



struct tag {

	struct tag_header hdr;

	union {
@@ -102,6 +109,7 @@ struct tag { 
		struct tag_cmdline cmdline;

		struct tag_clock clock;

		struct tag_ethernet ethernet;

		struct tag_boardinfo boardinfo;

	} u;

};
@@ -128,6 +136,7 @@ extern struct tag *bootloader_tags; 


extern resource_size_t fbmem_start;

extern resource_size_t fbmem_size;

extern u32 board_number;



void setup_processor(void);

arch/avr32/kernel/setup.c

+15 −0
Original line number Diff line number Diff line
@@ -390,6 +390,21 @@ static int __init parse_tag_clock(struct tag *tag) 
}

__tagtable(ATAG_CLOCK, parse_tag_clock);



/*

 * The board_number correspond to the bd->bi_board_number in U-Boot. This

 * parameter is only available during initialisation and can be used in some

 * kind of board identification.

 */

u32 __initdata board_number;



static int __init parse_tag_boardinfo(struct tag *tag)

{

	board_number = tag->u.boardinfo.board_number;



	return 0;

}

__tagtable(ATAG_BOARDINFO, parse_tag_boardinfo);



/*

 * Scan the tag table for this tag, and call its parse function. The

 * tag table is built by the linker from all the __tagtable