Merge branch 'x86/core' into x86/headers (d040c161) · Commits · e / devices / android_kernel_xiaomi_nabu

Documentation/cputopology.txt

+3 −3

Original line number	Diff line number	Diff line
		@@ -18,11 +18,11 @@ For an architecture to support this feature, it must define some of
		these macros in include/asm-XXX/topology.h:
		#define topology_physical_package_id(cpu)
		#define topology_core_id(cpu)
		#define topology_thread_siblings(cpu)
		#define topology_core_siblings(cpu)
		#define topology_thread_cpumask(cpu)
		#define topology_core_cpumask(cpu)

		The type of **_id is int.
		The type of siblings is cpumask_t.
		The type of siblings is (const) struct cpumask *.

		To be consistent on all architectures, include/linux/topology.h
		provides default definitions for any of the above macros that are

Documentation/kernel-doc-nano-HOWTO.txt

+4 −3

Original line number	Diff line number	Diff line
		@@ -43,7 +43,8 @@ Only comments so marked will be considered by the kernel-doc scripts,
		and any comment so marked must be in kernel-doc format. Do not use
		"/**" to be begin a comment block unless the comment block contains
		kernel-doc formatted comments. The closing comment marker for
		kernel-doc comments can be either "/" or "*/".
		kernel-doc comments can be either "/" or "/", but "/" is
		preferred in the Linux kernel tree.

		Kernel-doc comments should be placed just before the function
		or data structure being described.
		@@ -63,7 +64,7 @@ Example kernel-doc function comment:
		* comment lines.
		*
		* The longer description can have multiple paragraphs.
		**/
		*/

		The first line, with the short description, must be on a single line.

		@@ -85,7 +86,7 @@ Example kernel-doc data structure comment.
		* perhaps with more lines and words.
		*
		* Longer description of this structure.
		**/
		*/

		The kernel-doc function comments describe each parameter to the
		function, in order, with the @name lines.

Documentation/kernel-parameters.txt

+2 −0

Original line number	Diff line number	Diff line
		@@ -937,6 +937,8 @@ and is between 256 and 4096 characters. It is defined in the file


		intel_iommu= [DMAR] Intel IOMMU driver (DMAR) option
		on
		Enable intel iommu driver.
		off
		Disable intel iommu driver.
		igfx_off [Default Off]

Documentation/x86/boot.txt

+7 −6

Original line number	Diff line number	Diff line
		@@ -158,7 +158,7 @@ Offset Proto Name Meaning
		0202/4 2.00+ header Magic signature "HdrS"
		0206/2 2.00+ version Boot protocol version supported
		0208/4 2.00+ realmode_swtch Boot loader hook (see below)
		020C/2 2.00+ start_sys The load-low segment (0x1000) (obsolete)
		020C/2 2.00+ start_sys_seg The load-low segment (0x1000) (obsolete)
		020E/2 2.00+ kernel_version Pointer to kernel version string
		0210/1 2.00+ type_of_loader Boot loader identifier
		0211/1 2.00+ loadflags Boot protocol option flags
		@@ -170,10 +170,11 @@ Offset Proto Name Meaning
		0224/2 2.01+ heap_end_ptr Free memory after setup end
		0226/2 N/A pad1 Unused
		0228/4 2.02+ cmd_line_ptr 32-bit pointer to the kernel command line
		022C/4 2.03+ initrd_addr_max Highest legal initrd address
		022C/4 2.03+ ramdisk_max Highest legal initrd address
		0230/4 2.05+ kernel_alignment Physical addr alignment required for kernel
		0234/1 2.05+ relocatable_kernel Whether kernel is relocatable or not
		0235/3 N/A pad2 Unused
		0235/1 N/A pad2 Unused
		0236/2 N/A pad3 Unused
		0238/4 2.06+ cmdline_size Maximum size of the kernel command line
		023C/4 2.07+ hardware_subarch Hardware subarchitecture
		0240/8 2.07+ hardware_subarch_data Subarchitecture-specific data
		@@ -299,14 +300,14 @@ Protocol: 2.00+
		e.g. 0x0204 for version 2.04, and 0x0a11 for a hypothetical version
		10.17.

		Field name: readmode_swtch
		Field name: realmode_swtch
		Type: modify (optional)
		Offset/size: 0x208/4
		Protocol: 2.00+

		Boot loader hook (see ADVANCED BOOT LOADER HOOKS below.)

		Field name: start_sys
		Field name: start_sys_seg
		Type: read
		Offset/size: 0x20c/2
		Protocol: 2.00+
		@@ -468,7 +469,7 @@ Protocol: 2.02+
		zero, the kernel will assume that your boot loader does not support
		the 2.02+ protocol.

		Field name: initrd_addr_max
		Field name: ramdisk_max
		Type: read
		Offset/size: 0x22c/4
		Protocol: 2.03+

MAINTAINERS

+10 −2

Original line number	Diff line number	Diff line
		@@ -1202,6 +1202,8 @@ S: Supported
		CONTROL GROUPS (CGROUPS)
		P: Paul Menage
		M: menage@google.com
		P: Li Zefan
		M: lizf@cn.fujitsu.com
		L: containers@lists.linux-foundation.org
		S: Maintained

		@@ -3537,6 +3539,12 @@ S: Maintained
		PXA MMCI DRIVER
		S: Orphan

		PXA RTC DRIVER
		P: Robert Jarzmik
		M: robert.jarzmik@free.fr
		L: rtc-linux@googlegroups.com
		S: Maintained

		QLOGIC QLA2XXX FC-SCSI DRIVER
		P: Andrew Vasquez
		M: linux-driver@qlogic.com
		@@ -4285,8 +4293,8 @@ P: Rajiv Andrade
		M: srajiv@linux.vnet.ibm.com
		W: http://tpmdd.sourceforge.net
		P: Marcel Selhorst
		M: tpm@selhorst.net
		W: http://www.prosec.rub.de/tpm/
		M: m.selhorst@sirrix.com
		W: http://www.sirrix.com
		L: tpmdd-devel@lists.sourceforge.net (moderated for non-subscribers)
		S: Maintained