Merge branch 'linus' into x86/boot, to pick up fixes (9a1f4150) · Commits · 戴 / test

.mailmap

+4 −0

Original line number	Diff line number	Diff line
		@@ -137,6 +137,7 @@ Ricardo Ribalda Delgado <ricardo.ribalda@gmail.com>
		Rudolf Marek <R.Marek@sh.cvut.cz>
		Rui Saraiva <rmps@joel.ist.utl.pt>
		Sachin P Sant <ssant@in.ibm.com>
		Sarangdhar Joshi <spjoshi@codeaurora.org>
		Sam Ravnborg <sam@mars.ravnborg.org>
		Santosh Shilimkar <ssantosh@kernel.org>
		Santosh Shilimkar <santosh.shilimkar@oracle.org>
		@@ -150,10 +151,13 @@ Shuah Khan <shuah@kernel.org> <shuah.kh@samsung.com>
		Simon Kelley <simon@thekelleys.org.uk>
		Stéphane Witzmann <stephane.witzmann@ubpmes.univ-bpclermont.fr>
		Stephen Hemminger <shemminger@osdl.org>
		Subash Abhinov Kasiviswanathan <subashab@codeaurora.org>
		Subhash Jadavani <subhashj@codeaurora.org>
		Sudeep Holla <sudeep.holla@arm.com> Sudeep KarkadaNagesha <sudeep.karkadanagesha@arm.com>
		Sumit Semwal <sumit.semwal@ti.com>
		Tejun Heo <htejun@gmail.com>
		Thomas Graf <tgraf@suug.ch>
		Thomas Pedersen <twp@codeaurora.org>
		Tony Luck <tony.luck@intel.com>
		Tsuneo Yoshioka <Tsuneo.Yoshioka@f-secure.com>
		Uwe Kleine-König <ukleinek@informatik.uni-freiburg.de>

deleted100644 → 0

+0 −12

Original line number	Diff line number	Diff line
		What: /sys/devices/.../deferred_probe
		Date: August 2016
		Contact: Ben Hutchings <ben.hutchings@codethink.co.uk>
		Description:
		The /sys/devices/.../deferred_probe attribute is
		present for all devices. If a driver detects during
		probing a device that a related device is not yet
		ready, it may defer probing of the first device. The
		kernel will retry probing the first device after any
		other device is successfully probed. This attribute
		reads as 1 if probing of this device is currently
		deferred, or 0 otherwise.

+1 −1

Original line number	Diff line number	Diff line
		@@ -12,7 +12,7 @@ DOCBOOKS := z8530book.xml \
		kernel-api.xml filesystems.xml lsm.xml kgdb.xml \
		gadget.xml libata.xml mtdnand.xml librs.xml rapidio.xml \
		genericirq.xml s390-drivers.xml uio-howto.xml scsi.xml \
		80211.xml sh.xml regulator.xml w1.xml \
		sh.xml regulator.xml w1.xml \
		writing_musb_glue_layer.xml iio.xml

		ifeq ($(DOCBOOKS),)

+12 −1

Original line number	Diff line number	Diff line
		@@ -106,6 +106,16 @@
		use by PCI
		Format: <irq>,<irq>...

		acpi_mask_gpe= [HW,ACPI]
		Due to the existence of _Lxx/_Exx, some GPEs triggered
		by unsupported hardware/firmware features can result in
		GPE floodings that cannot be automatically disabled by
		the GPE dispatcher.
		This facility can be used to prevent such uncontrolled
		GPE floodings.
		Format: <int>
		Support masking of GPEs numbered from 0x00 to 0x7f.

		acpi_no_auto_serialize [HW,ACPI]
		Disable auto-serialization of AML methods
		AML control methods that contain the opcodes to create
		@@ -3811,10 +3821,11 @@
		it if 0 is given (See Documentation/cgroup-v1/memory.txt)

		swiotlb= [ARM,IA-64,PPC,MIPS,X86]
		Format: { <int> \| force }
		Format: { <int> \| force \| noforce }
		<int> -- Number of I/O TLB slabs
		force -- force using of bounce buffers even if they
		wouldn't be automatically used by the kernel
		noforce -- Never use bounce buffers (for debugging)

		switches= [HW,M68k]

+3 −3

Original line number	Diff line number	Diff line
		@@ -54,9 +54,9 @@ This is the hardware sector size of the device, in bytes.

		io_poll (RW)
		------------
		When read, this file shows the total number of block IO polls and how
		many returned success. Writing '0' to this file will disable polling
		for this device. Writing any non-zero value will enable this feature.
		When read, this file shows whether polling is enabled (1) or disabled
		(0). Writing '0' to this file will disable polling for this device.
		Writing any non-zero value will enable this feature.

		io_poll_delay (RW)
		------------------