Merge branch 'for-arm-soc/arch-timers' of... (9ae9e253) · Commits · e / devices / android_kernel_xiaomi_nabu

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/devicetree/bindings/arm/arch_timer.txt

+4 −3

Original line number	Original line	Diff line number	Diff line
	* ARM architected timer		* ARM architected timer

	ARM Cortex-A7 and Cortex-A15 have a per-core architected timer, which		ARM cores may have a per-core architected timer, which provides per-cpu timers.
	provides per-cpu timers.

	The timer is attached to a GIC to deliver its per-processor interrupts.		The timer is attached to a GIC to deliver its per-processor interrupts.

	** Timer node properties:		** Timer node properties:

	- compatible : Should at least contain "arm,armv7-timer".		- compatible : Should at least contain one of
			"arm,armv7-timer"
			"arm,armv8-timer"

	- interrupts : Interrupt list for secure, non-secure, virtual and		- interrupts : Interrupt list for secure, non-secure, virtual and
	hypervisor timers, in that order.		hypervisor timers, in that order.

Documentation/devicetree/bindings/pinctrl/atmel,at91-pinctrl.txt

+3 −2

Original line number	Original line	Diff line number	Diff line
	@@ -81,7 +81,8 @@ PA31 TXD4
	Required properties for pin configuration node:		Required properties for pin configuration node:
	- atmel,pins: 4 integers array, represents a group of pins mux and config		- atmel,pins: 4 integers array, represents a group of pins mux and config
	setting. The format is atmel,pins = <PIN_BANK PIN_BANK_NUM PERIPH CONFIG>.		setting. The format is atmel,pins = <PIN_BANK PIN_BANK_NUM PERIPH CONFIG>.
	The PERIPH 0 means gpio.		The PERIPH 0 means gpio, PERIPH 1 is periph A, PERIPH 2 is periph B...
			PIN_BANK 0 is pioA, PIN_BANK 1 is pioB...

	Bits used for CONFIG:		Bits used for CONFIG:
	PULL_UP (1 << 0): indicate this pin need a pull up.		PULL_UP (1 << 0): indicate this pin need a pull up.
	@@ -126,7 +127,7 @@ pinctrl@fffff400 {
	pinctrl_dbgu: dbgu-0 {		pinctrl_dbgu: dbgu-0 {
	atmel,pins =		atmel,pins =
	<1 14 0x1 0x0 /* PB14 periph A */		<1 14 0x1 0x0 /* PB14 periph A */
	1 15 0x1 0x1>; /* PB15 periph with pullup */		1 15 0x1 0x1>; /* PB15 periph A with pullup */
	};		};
	};		};
	};		};

Documentation/filesystems/f2fs.txt

+9 −9

Original line number	Original line	Diff line number	Diff line
	@@ -175,9 +175,9 @@ consists of multiple segments as described below.
	align with the zone size <-\|		align with the zone size <-\|
	\|-> align with the segment size		\|-> align with the segment size
	_________________________________________________________________________		_________________________________________________________________________
	\| \| \| Node \| Segment \| Segment \| \|		\| \| \| Segment \| Node \| Segment \| \|
	\| Superblock \| Checkpoint \| Address \| Info. \| Summary \| Main \|		\| Superblock \| Checkpoint \| Info. \| Address \| Summary \| Main \|
	\| (SB) \| (CP) \| Table (NAT) \| Table (SIT) \| Area (SSA) \| \|		\| (SB) \| (CP) \| Table (SIT) \| Table (NAT) \| Area (SSA) \| \|
	\|____________\|_____2______\|______N______\|______N______\|______N_____\|__N___\|		\|____________\|_____2______\|______N______\|______N______\|______N_____\|__N___\|
	. .		. .
	. .		. .
	@@ -200,14 +200,14 @@ consists of multiple segments as described below.
	: It contains file system information, bitmaps for valid NAT/SIT sets, orphan		: It contains file system information, bitmaps for valid NAT/SIT sets, orphan
	inode lists, and summary entries of current active segments.		inode lists, and summary entries of current active segments.

	- Node Address Table (NAT)
	: It is composed of a block address table for all the node blocks stored in
	Main area.

	- Segment Information Table (SIT)		- Segment Information Table (SIT)
	: It contains segment information such as valid block count and bitmap for the		: It contains segment information such as valid block count and bitmap for the
	validity of all the blocks.		validity of all the blocks.

			- Node Address Table (NAT)
			: It is composed of a block address table for all the node blocks stored in
			Main area.

	- Segment Summary Area (SSA)		- Segment Summary Area (SSA)
	: It contains summary entries which contains the owner information of all the		: It contains summary entries which contains the owner information of all the
	data and node blocks stored in Main area.		data and node blocks stored in Main area.
	@@ -236,13 +236,13 @@ For file system consistency, each CP points to which NAT and SIT copies are
	valid, as shown as below.		valid, as shown as below.

	+--------+----------+---------+		+--------+----------+---------+
	\| CP \| NAT \| SIT \|		\| CP \| SIT \| NAT \|
	+--------+----------+---------+		+--------+----------+---------+
	. . . .		. . . .
	. . . .		. . . .
	. . . .		. . . .
	+-------+-------+--------+--------+--------+--------+		+-------+-------+--------+--------+--------+--------+
	\| CP #0 \| CP #1 \| NAT #0 \| NAT #1 \| SIT #0 \| SIT #1 \|		\| CP #0 \| CP #1 \| SIT #0 \| SIT #1 \| NAT #0 \| NAT #1 \|
	+-------+-------+--------+--------+--------+--------+		+-------+-------+--------+--------+--------+--------+
	\| ^ ^		\| ^ ^
	\| \| \|		\| \| \|

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