Merge branch 'master' into sh/hwblk (4b6b9879) · Commits · e / devices / android_kernel_oneplus_sm7250

Documentation/ABI/testing/sysfs-block

+23 −14

Original line number	Diff line number	Diff line
		@@ -94,28 +94,37 @@ What: /sys/block/<disk>/queue/physical_block_size
		Date: May 2009
		Contact: Martin K. Petersen <martin.petersen@oracle.com>
		Description:
		This is the smallest unit the storage device can write
		without resorting to read-modify-write operation. It is
		usually the same as the logical block size but may be
		bigger. One example is SATA drives with 4KB sectors
		that expose a 512-byte logical block size to the
		operating system.
		This is the smallest unit a physical storage device can
		write atomically. It is usually the same as the logical
		block size but may be bigger. One example is SATA
		drives with 4KB sectors that expose a 512-byte logical
		block size to the operating system. For stacked block
		devices the physical_block_size variable contains the
		maximum physical_block_size of the component devices.

		What: /sys/block/<disk>/queue/minimum_io_size
		Date: April 2009
		Contact: Martin K. Petersen <martin.petersen@oracle.com>
		Description:
		Storage devices may report a preferred minimum I/O size,
		which is the smallest request the device can perform
		without incurring a read-modify-write penalty. For disk
		drives this is often the physical block size. For RAID
		arrays it is often the stripe chunk size.
		Storage devices may report a granularity or preferred
		minimum I/O size which is the smallest request the
		device can perform without incurring a performance
		penalty. For disk drives this is often the physical
		block size. For RAID arrays it is often the stripe
		chunk size. A properly aligned multiple of
		minimum_io_size is the preferred request size for
		workloads where a high number of I/O operations is
		desired.

		What: /sys/block/<disk>/queue/optimal_io_size
		Date: April 2009
		Contact: Martin K. Petersen <martin.petersen@oracle.com>
		Description:
		Storage devices may report an optimal I/O size, which is
		the device's preferred unit of receiving I/O. This is
		rarely reported for disk drives. For RAID devices it is
		usually the stripe width or the internal block size.
		the device's preferred unit for sustained I/O. This is
		rarely reported for disk drives. For RAID arrays it is
		usually the stripe width or the internal track size. A
		properly aligned multiple of optimal_io_size is the
		preferred request size for workloads where sustained
		throughput is desired. If no optimal I/O size is
		reported this file contains 0.

Documentation/DocBook/kernel-hacking.tmpl

+2 −2

Original line number	Diff line number	Diff line
		@@ -449,8 +449,8 @@ printk(KERN_INFO "i = %u\n", i);
		</para>

		<programlisting>
		__u32 ipaddress;
		printk(KERN_INFO "my ip: %d.%d.%d.%d\n", NIPQUAD(ipaddress));
		__be32 ipaddress;
		printk(KERN_INFO "my ip: %pI4\n", &ipaddress);
		</programlisting>

		<para>

Documentation/arm/memory.txt

+2 −0

Original line number	Diff line number	Diff line
		@@ -21,6 +21,8 @@ ffff8000 ffffffff copy_user_page / clear_user_page use.
		For SA11xx and Xscale, this is used to
		setup a minicache mapping.

		ffff4000 ffffffff cache aliasing on ARMv6 and later CPUs.

		ffff1000 ffff7fff Reserved.
		Platforms must not use this address range.

Documentation/ioctl/ioctl-number.txt

+1 −0

Original line number	Diff line number	Diff line
		@@ -139,6 +139,7 @@ Code Seq# Include File Comments
		'm' all linux/synclink.h conflict!
		'm' 00-1F net/irda/irmod.h conflict!
		'n' 00-7F linux/ncp_fs.h
		'n' 80-8F linux/nilfs2_fs.h NILFS2
		'n' E0-FF video/matrox.h matroxfb
		'o' 00-1F fs/ocfs2/ocfs2_fs.h OCFS2
		'o' 00-03 include/mtd/ubi-user.h conflict! (OCFS2 and UBI overlaps)

Documentation/kernel-parameters.txt

+4 −0

Original line number	Diff line number	Diff line
		@@ -1116,6 +1116,10 @@ and is between 256 and 4096 characters. It is defined in the file
		Combinations also work, so libata.dma=3 enables DMA
		for disks and CDROMs, but not CFs.

		libata.ignore_hpa= [LIBATA] Ignore HPA limit
		libata.ignore_hpa=0 keep BIOS limits (default)
		libata.ignore_hpa=1 ignore limits, using full disk

		libata.noacpi [LIBATA] Disables use of ACPI in libata suspend/resume
		when set.
		Format: <int>