Merge branch 'timers/for-arm' of... (d954896e) · Commits · e / devices / android_kernel_sony_msm8998

Documentation/device-mapper/dm-raid.txt

+1 −0

Original line number	Original line	Diff line number	Diff line
	@@ -141,3 +141,4 @@ Version History
	1.2.0 Handle creation of arrays that contain failed devices.		1.2.0 Handle creation of arrays that contain failed devices.
	1.3.0 Added support for RAID 10		1.3.0 Added support for RAID 10
	1.3.1 Allow device replacement/rebuild for RAID 10		1.3.1 Allow device replacement/rebuild for RAID 10
			1.3.2 Fix/improve redundancy checking for RAID10

Documentation/x86/boot.txt

+26 −1

Original line number	Original line	Diff line number	Diff line
	@@ -57,6 +57,10 @@ Protocol 2.10: (Kernel 2.6.31) Added a protocol for relaxed alignment
	Protocol 2.11: (Kernel 3.6) Added a field for offset of EFI handover		Protocol 2.11: (Kernel 3.6) Added a field for offset of EFI handover
	protocol entry point.		protocol entry point.

			Protocol 2.12: (Kernel 3.9) Added the xloadflags field and extension fields
			to struct boot_params for for loading bzImage and ramdisk
			above 4G in 64bit.

	**** MEMORY LAYOUT		**** MEMORY LAYOUT

	The traditional memory map for the kernel loader, used for Image or		The traditional memory map for the kernel loader, used for Image or
	@@ -182,7 +186,7 @@ Offset Proto Name Meaning
	0230/4 2.05+ kernel_alignment Physical addr alignment required for kernel		0230/4 2.05+ kernel_alignment Physical addr alignment required for kernel
	0234/1 2.05+ relocatable_kernel Whether kernel is relocatable or not		0234/1 2.05+ relocatable_kernel Whether kernel is relocatable or not
	0235/1 2.10+ min_alignment Minimum alignment, as a power of two		0235/1 2.10+ min_alignment Minimum alignment, as a power of two
	0236/2 N/A pad3 Unused		0236/2 2.12+ xloadflags Boot protocol option flags
	0238/4 2.06+ cmdline_size Maximum size of the kernel command line		0238/4 2.06+ cmdline_size Maximum size of the kernel command line
	023C/4 2.07+ hardware_subarch Hardware subarchitecture		023C/4 2.07+ hardware_subarch Hardware subarchitecture
	0240/8 2.07+ hardware_subarch_data Subarchitecture-specific data		0240/8 2.07+ hardware_subarch_data Subarchitecture-specific data
	@@ -582,6 +586,27 @@ Protocol: 2.10+
	misaligned kernel. Therefore, a loader should typically try each		misaligned kernel. Therefore, a loader should typically try each
	power-of-two alignment from kernel_alignment down to this alignment.		power-of-two alignment from kernel_alignment down to this alignment.

			Field name: xloadflags
			Type: read
			Offset/size: 0x236/2
			Protocol: 2.12+

			This field is a bitmask.

			Bit 0 (read): XLF_KERNEL_64
			- If 1, this kernel has the legacy 64-bit entry point at 0x200.

			Bit 1 (read): XLF_CAN_BE_LOADED_ABOVE_4G
			- If 1, kernel/boot_params/cmdline/ramdisk can be above 4G.

			Bit 2 (read): XLF_EFI_HANDOVER_32
			- If 1, the kernel supports the 32-bit EFI handoff entry point
			given at handover_offset.

			Bit 3 (read): XLF_EFI_HANDOVER_64
			- If 1, the kernel supports the 64-bit EFI handoff entry point
			given at handover_offset + 0x200.

	Field name: cmdline_size		Field name: cmdline_size
	Type: read		Type: read
	Offset/size: 0x238/4		Offset/size: 0x238/4

Documentation/x86/zero-page.txt

+4 −0

Original line number	Original line	Diff line number	Diff line
	@@ -19,6 +19,9 @@ Offset Proto Name Meaning
	090/010 ALL hd1_info hd1 disk parameter, OBSOLETE!!		090/010 ALL hd1_info hd1 disk parameter, OBSOLETE!!
	0A0/010 ALL sys_desc_table System description table (struct sys_desc_table)		0A0/010 ALL sys_desc_table System description table (struct sys_desc_table)
	0B0/010 ALL olpc_ofw_header OLPC's OpenFirmware CIF and friends		0B0/010 ALL olpc_ofw_header OLPC's OpenFirmware CIF and friends
			0C0/004 ALL ext_ramdisk_image ramdisk_image high 32bits
			0C4/004 ALL ext_ramdisk_size ramdisk_size high 32bits
			0C8/004 ALL ext_cmd_line_ptr cmd_line_ptr high 32bits
	140/080 ALL edid_info Video mode setup (struct edid_info)		140/080 ALL edid_info Video mode setup (struct edid_info)
	1C0/020 ALL efi_info EFI 32 information (struct efi_info)		1C0/020 ALL efi_info EFI 32 information (struct efi_info)
	1E0/004 ALL alk_mem_k Alternative mem check, in KB		1E0/004 ALL alk_mem_k Alternative mem check, in KB
	@@ -27,6 +30,7 @@ Offset Proto Name Meaning
	1E9/001 ALL eddbuf_entries Number of entries in eddbuf (below)		1E9/001 ALL eddbuf_entries Number of entries in eddbuf (below)
	1EA/001 ALL edd_mbr_sig_buf_entries Number of entries in edd_mbr_sig_buffer		1EA/001 ALL edd_mbr_sig_buf_entries Number of entries in edd_mbr_sig_buffer
	(below)		(below)
			1EF/001 ALL sentinel Used to detect broken bootloaders
	290/040 ALL edd_mbr_sig_buffer EDD MBR signatures		290/040 ALL edd_mbr_sig_buffer EDD MBR signatures
	2D0/A00 ALL e820_map E820 memory map table		2D0/A00 ALL e820_map E820 memory map table
	(array of struct e820entry)		(array of struct e820entry)

MAINTAINERS

+4 −4

Original line number	Original line	Diff line number	Diff line
	@@ -2966,7 +2966,7 @@ S: Maintained
	F: drivers/net/ethernet/i825xx/eexpress.*		F: drivers/net/ethernet/i825xx/eexpress.*

	ETHERNET BRIDGE		ETHERNET BRIDGE
	M: Stephen Hemminger <shemminger@vyatta.com>		M: Stephen Hemminger <stephen@networkplumber.org>
	L: bridge@lists.linux-foundation.org		L: bridge@lists.linux-foundation.org
	L: netdev@vger.kernel.org		L: netdev@vger.kernel.org
	W: http://www.linuxfoundation.org/en/Net:Bridge		W: http://www.linuxfoundation.org/en/Net:Bridge
	@@ -4905,7 +4905,7 @@ S: Maintained

	MARVELL GIGABIT ETHERNET DRIVERS (skge/sky2)		MARVELL GIGABIT ETHERNET DRIVERS (skge/sky2)
	M: Mirko Lindner <mlindner@marvell.com>		M: Mirko Lindner <mlindner@marvell.com>
	M: Stephen Hemminger <shemminger@vyatta.com>		M: Stephen Hemminger <stephen@networkplumber.org>
	L: netdev@vger.kernel.org		L: netdev@vger.kernel.org
	S: Maintained		S: Maintained
	F: drivers/net/ethernet/marvell/sk*		F: drivers/net/ethernet/marvell/sk*
	@@ -5180,7 +5180,7 @@ S: Supported
	F: drivers/infiniband/hw/nes/		F: drivers/infiniband/hw/nes/

	NETEM NETWORK EMULATOR		NETEM NETWORK EMULATOR
	M: Stephen Hemminger <shemminger@vyatta.com>		M: Stephen Hemminger <stephen@networkplumber.org>
	L: netem@lists.linux-foundation.org		L: netem@lists.linux-foundation.org
	S: Maintained		S: Maintained
	F: net/sched/sch_netem.c		F: net/sched/sch_netem.c
	@@ -7088,7 +7088,7 @@ F: include/uapi/sound/
	F: sound/		F: sound/

	SOUND - SOC LAYER / DYNAMIC AUDIO POWER MANAGEMENT (ASoC)		SOUND - SOC LAYER / DYNAMIC AUDIO POWER MANAGEMENT (ASoC)
	M: Liam Girdwood <lrg@ti.com>		M: Liam Girdwood <lgirdwood@gmail.com>
	M: Mark Brown <broonie@opensource.wolfsonmicro.com>		M: Mark Brown <broonie@opensource.wolfsonmicro.com>
	T: git git://git.kernel.org/pub/scm/linux/kernel/git/broonie/sound.git		T: git git://git.kernel.org/pub/scm/linux/kernel/git/broonie/sound.git
	L: alsa-devel@alsa-project.org (moderated for non-subscribers)		L: alsa-devel@alsa-project.org (moderated for non-subscribers)

arch/powerpc/kernel/entry_32.S

+2 −0

Original line number	Original line	Diff line number	Diff line
	@@ -439,6 +439,8 @@ ret_from_fork:
	ret_from_kernel_thread:		ret_from_kernel_thread:
	REST_NVGPRS(r1)		REST_NVGPRS(r1)
	bl schedule_tail		bl schedule_tail
			li r3,0
			stw r3,0(r1)
	mtlr r14		mtlr r14
	mr r3,r15		mr r3,r15
	PPC440EP_ERR42		PPC440EP_ERR42