Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/trivial

Pull trivial tree from Jiri Kosina:
 "It's indeed trivial -- mostly documentation updates and a bunch of
  typo fixes from Masanari.

  There are also several linux/version.h include removals from Jesper."

* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/trivial: (101 commits)
  kcore: fix spelling in read_kcore() comment
  constify struct pci_dev * in obvious cases
  Revert "char: Fix typo in viotape.c"
  init: fix wording error in mm_init comment
  usb: gadget: Kconfig: fix typo for 'different'
  Revert "power, max8998: Include linux/module.h just once in drivers/power/max8998_charger.c"
  writeback: fix fn name in writeback_inodes_sb_nr_if_idle() comment header
  writeback: fix typo in the writeback_control comment
  Documentation: Fix multiple typo in Documentation
  tpm_tis: fix tis_lock with respect to RCU
  Revert "media: Fix typo in mixer_drv.c and hdmi_drv.c"
  Doc: Update numastat.txt
  qla4xxx: Add missing spaces to error messages
  compiler.h: Fix typo
  security: struct security_operations kerneldoc fix
  Documentation: broken URL in libata.tmpl
  Documentation: broken URL in filesystems.tmpl
  mtd: simplify return logic in do_map_probe()
  mm: fix comment typo of truncate_inode_pages_range
  power: bq27x00: Fix typos in comment
  ...
This commit is contained in:
Linus Torvalds
2012-03-20 21:12:50 -07:00
131 changed files with 217 additions and 230 deletions
+2 -2
View File
@@ -7,8 +7,8 @@ Please try and keep the descriptions small enough to fit on one line.
Following translations are available on the WWW: Following translations are available on the WWW:
- Japanese, maintained by the JF Project (JF@linux.or.jp), at - Japanese, maintained by the JF Project (jf@listserv.linux.or.jp), at
http://www.linux.or.jp/JF/ http://linuxjf.sourceforge.jp/
00-INDEX 00-INDEX
- this file. - this file.
@@ -7,7 +7,7 @@ Date: 09-Jul-2007
KernelVersion v2.6.22 KernelVersion v2.6.22
Contact: linux-wireless@vger.kernel.org Contact: linux-wireless@vger.kernel.org
Description: Current state of the transmitter. Description: Current state of the transmitter.
This file is deprecated and sheduled to be removed in 2014, This file is deprecated and scheduled to be removed in 2014,
because its not possible to express the 'soft and hard block' because its not possible to express the 'soft and hard block'
state of the rfkill driver. state of the rfkill driver.
Values: A numeric value. Values: A numeric value.
+1 -1
View File
@@ -6,7 +6,7 @@ Description:
The name of the module that is in the kernel. This The name of the module that is in the kernel. This
module name will show up either if the module is built module name will show up either if the module is built
directly into the kernel, or if it is loaded as a directly into the kernel, or if it is loaded as a
dyanmic module. dynamic module.
/sys/module/MODULENAME/parameters /sys/module/MODULENAME/parameters
This directory contains individual files that are each This directory contains individual files that are each
+1 -1
View File
@@ -387,7 +387,7 @@ an example.
<title>See also</title> <title>See also</title>
<para> <para>
<citation> <citation>
<ulink url="ftp://ftp.uk.linux.org/pub/linux/sct/fs/jfs/journal-design.ps.gz"> <ulink url="http://kernel.org/pub/linux/kernel/people/sct/ext3/journal-design.ps.gz">
Journaling the Linux ext2fs Filesystem, LinuxExpo 98, Stephen Tweedie Journaling the Linux ext2fs Filesystem, LinuxExpo 98, Stephen Tweedie
</ulink> </ulink>
</citation> </citation>
+4 -4
View File
@@ -22,8 +22,8 @@
<para> <para>
The contents of this file are subject to the Open The contents of this file are subject to the Open
Software License version 1.1 that can be found at Software License version 1.1 that can be found at
<ulink url="http://www.opensource.org/licenses/osl-1.1.txt">http://www.opensource.org/licenses/osl-1.1.txt</ulink> and is included herein <ulink url="http://fedoraproject.org/wiki/Licensing:OSL1.1">http://fedoraproject.org/wiki/Licensing:OSL1.1</ulink>
by reference. and is included herein by reference.
</para> </para>
<para> <para>
@@ -945,7 +945,7 @@ and other resources, etc.
<listitem> <listitem>
<para> <para>
!BSY &amp;&amp; ERR after CDB tranfer starts but before the !BSY &amp;&amp; ERR after CDB transfer starts but before the
last byte of CDB is transferred. ATA/ATAPI standard states last byte of CDB is transferred. ATA/ATAPI standard states
that &quot;The device shall not terminate the PACKET command that &quot;The device shall not terminate the PACKET command
with an error before the last byte of the command packet has with an error before the last byte of the command packet has
@@ -1050,7 +1050,7 @@ and other resources, etc.
to complete a command. Combined with the fact that MWDMA to complete a command. Combined with the fact that MWDMA
and PIO transfer errors aren't allowed to use ICRC bit up to and PIO transfer errors aren't allowed to use ICRC bit up to
ATA/ATAPI-7, it seems to imply that ABRT bit alone could ATA/ATAPI-7, it seems to imply that ABRT bit alone could
indicate tranfer errors. indicate transfer errors.
</para> </para>
<para> <para>
However, ATA/ATAPI-8 draft revision 1f removes the part However, ATA/ATAPI-8 draft revision 1f removes the part
+2 -2
View File
@@ -444,7 +444,7 @@ linkend="pixfmt-rgb"><constant>V4L2_PIX_FMT_BGR24</constant></link></para></entr
<entry><para><link <entry><para><link
linkend="pixfmt-rgb"><constant>V4L2_PIX_FMT_BGR32</constant></link><footnote> linkend="pixfmt-rgb"><constant>V4L2_PIX_FMT_BGR32</constant></link><footnote>
<para>Presumably all V4L RGB formats are <para>Presumably all V4L RGB formats are
little-endian, although some drivers might interpret them according to machine endianess. V4L2 defines little-endian, big-endian and red/blue little-endian, although some drivers might interpret them according to machine endianness. V4L2 defines little-endian, big-endian and red/blue
swapped variants. For details see <xref linkend="pixfmt-rgb" />.</para> swapped variants. For details see <xref linkend="pixfmt-rgb" />.</para>
</footnote></para></entry> </footnote></para></entry>
</row> </row>
@@ -823,7 +823,7 @@ standard); 35468950&nbsp;Hz PAL and SECAM (625-line standards)</entry>
<row> <row>
<entry>sample_format</entry> <entry>sample_format</entry>
<entry>V4L2_PIX_FMT_GREY. The last four bytes (a <entry>V4L2_PIX_FMT_GREY. The last four bytes (a
machine endianess integer) contain a frame counter.</entry> machine endianness integer) contain a frame counter.</entry>
</row> </row>
<row> <row>
<entry>start[]</entry> <entry>start[]</entry>
+1 -1
View File
@@ -25,7 +25,7 @@ inline (either in the code emitted directly by the compiler, or part of
the implementation of a library call) when optimizing for a recent enough the implementation of a library call) when optimizing for a recent enough
processor that has the necessary native support, but only if resulting processor that has the necessary native support, but only if resulting
binaries are already to be incompatible with earlier ARM processors due to binaries are already to be incompatible with earlier ARM processors due to
useage of similar native instructions for other things. In other words usage of similar native instructions for other things. In other words
don't make binaries unable to run on earlier processors just for the sake don't make binaries unable to run on earlier processors just for the sake
of not using these kernel helpers if your compiled code is not going to of not using these kernel helpers if your compiled code is not going to
use new instructions for other purpose. use new instructions for other purpose.
+9 -9
View File
@@ -94,11 +94,11 @@ Throttling/Upper Limit policy
Hierarchical Cgroups Hierarchical Cgroups
==================== ====================
- Currently none of the IO control policy supports hierarhical groups. But - Currently none of the IO control policy supports hierarchical groups. But
cgroup interface does allow creation of hierarhical cgroups and internally cgroup interface does allow creation of hierarchical cgroups and internally
IO policies treat them as flat hierarchy. IO policies treat them as flat hierarchy.
So this patch will allow creation of cgroup hierarhcy but at the backend So this patch will allow creation of cgroup hierarchcy but at the backend
everything will be treated as flat. So if somebody created a hierarchy like everything will be treated as flat. So if somebody created a hierarchy like
as follows. as follows.
@@ -266,7 +266,7 @@ Proportional weight policy files
- blkio.idle_time - blkio.idle_time
- Debugging aid only enabled if CONFIG_DEBUG_BLK_CGROUP=y. - Debugging aid only enabled if CONFIG_DEBUG_BLK_CGROUP=y.
This is the amount of time spent by the IO scheduler idling for a This is the amount of time spent by the IO scheduler idling for a
given cgroup in anticipation of a better request than the exising ones given cgroup in anticipation of a better request than the existing ones
from other queues/cgroups. This is in nanoseconds. If this is read from other queues/cgroups. This is in nanoseconds. If this is read
when the cgroup is in an idling state, the stat will only report the when the cgroup is in an idling state, the stat will only report the
idle_time accumulated till the last idle period and will not include idle_time accumulated till the last idle period and will not include
@@ -283,34 +283,34 @@ Throttling/Upper limit policy files
----------------------------------- -----------------------------------
- blkio.throttle.read_bps_device - blkio.throttle.read_bps_device
- Specifies upper limit on READ rate from the device. IO rate is - Specifies upper limit on READ rate from the device. IO rate is
specified in bytes per second. Rules are per deivce. Following is specified in bytes per second. Rules are per device. Following is
the format. the format.
echo "<major>:<minor> <rate_bytes_per_second>" > /cgrp/blkio.throttle.read_bps_device echo "<major>:<minor> <rate_bytes_per_second>" > /cgrp/blkio.throttle.read_bps_device
- blkio.throttle.write_bps_device - blkio.throttle.write_bps_device
- Specifies upper limit on WRITE rate to the device. IO rate is - Specifies upper limit on WRITE rate to the device. IO rate is
specified in bytes per second. Rules are per deivce. Following is specified in bytes per second. Rules are per device. Following is
the format. the format.
echo "<major>:<minor> <rate_bytes_per_second>" > /cgrp/blkio.throttle.write_bps_device echo "<major>:<minor> <rate_bytes_per_second>" > /cgrp/blkio.throttle.write_bps_device
- blkio.throttle.read_iops_device - blkio.throttle.read_iops_device
- Specifies upper limit on READ rate from the device. IO rate is - Specifies upper limit on READ rate from the device. IO rate is
specified in IO per second. Rules are per deivce. Following is specified in IO per second. Rules are per device. Following is
the format. the format.
echo "<major>:<minor> <rate_io_per_second>" > /cgrp/blkio.throttle.read_iops_device echo "<major>:<minor> <rate_io_per_second>" > /cgrp/blkio.throttle.read_iops_device
- blkio.throttle.write_iops_device - blkio.throttle.write_iops_device
- Specifies upper limit on WRITE rate to the device. IO rate is - Specifies upper limit on WRITE rate to the device. IO rate is
specified in io per second. Rules are per deivce. Following is specified in io per second. Rules are per device. Following is
the format. the format.
echo "<major>:<minor> <rate_io_per_second>" > /cgrp/blkio.throttle.write_iops_device echo "<major>:<minor> <rate_io_per_second>" > /cgrp/blkio.throttle.write_iops_device
Note: If both BW and IOPS rules are specified for a device, then IO is Note: If both BW and IOPS rules are specified for a device, then IO is
subjectd to both the constraints. subjected to both the constraints.
- blkio.throttle.io_serviced - blkio.throttle.io_serviced
- Number of IOs (bio) completed to/from the disk by the group (as - Number of IOs (bio) completed to/from the disk by the group (as
+1 -1
View File
@@ -28,7 +28,7 @@ The target is named "raid" and it accepts the following parameters:
raid6_nc RAID6 N continue raid6_nc RAID6 N continue
- rotating parity N (right-to-left) with data continuation - rotating parity N (right-to-left) with data continuation
Refererence: Chapter 4 of Reference: Chapter 4 of
http://www.snia.org/sites/default/files/SNIA_DDF_Technical_Position_v2.0.pdf http://www.snia.org/sites/default/files/SNIA_DDF_Technical_Position_v2.0.pdf
<#raid_params>: The number of parameters that follow. <#raid_params>: The number of parameters that follow.
@@ -3,7 +3,7 @@ Introduction
The more-sophisticated device-mapper targets require complex metadata The more-sophisticated device-mapper targets require complex metadata
that is managed in kernel. In late 2010 we were seeing that various that is managed in kernel. In late 2010 we were seeing that various
different targets were rolling their own data strutures, for example: different targets were rolling their own data structures, for example:
- Mikulas Patocka's multisnap implementation - Mikulas Patocka's multisnap implementation
- Heinz Mauelshagen's thin provisioning target - Heinz Mauelshagen's thin provisioning target
@@ -1,7 +1,7 @@
Introduction Introduction
============ ============
This document descibes a collection of device-mapper targets that This document describes a collection of device-mapper targets that
between them implement thin-provisioning and snapshots. between them implement thin-provisioning and snapshots.
The main highlight of this implementation, compared to the previous The main highlight of this implementation, compared to the previous
@@ -5,7 +5,7 @@ IPs present in the SoC.
On top of that an omap_device is created to extend the platform_device On top of that an omap_device is created to extend the platform_device
capabilities and to allow binding with one or several hwmods. capabilities and to allow binding with one or several hwmods.
The hwmods will contain all the information to build the device: The hwmods will contain all the information to build the device:
adresse range, irq lines, dma lines, interconnect, PRCM register, address range, irq lines, dma lines, interconnect, PRCM register,
clock domain, input clocks. clock domain, input clocks.
For the moment just point to the existing hwmod, the next step will be For the moment just point to the existing hwmod, the next step will be
to move data from hwmod to device-tree representation. to move data from hwmod to device-tree representation.
@@ -1,3 +1,3 @@
prima2 "cb" evalutation board prima2 "cb" evaluation board
Required root node properties: Required root node properties:
- compatible = "sirf,prima2-cb", "sirf,prima2"; - compatible = "sirf,prima2-cb", "sirf,prima2";
@@ -169,7 +169,7 @@ it with special cases.
b) Entry with a flattened device-tree block. Firmware loads the b) Entry with a flattened device-tree block. Firmware loads the
physical address of the flattened device tree block (dtb) into r2, physical address of the flattened device tree block (dtb) into r2,
r1 is not used, but it is considered good practise to use a valid r1 is not used, but it is considered good practice to use a valid
machine number as described in Documentation/arm/Booting. machine number as described in Documentation/arm/Booting.
r0 : 0 r0 : 0
+1 -1
View File
@@ -63,7 +63,7 @@ The slave DMA usage consists of following steps:
struct dma_slave_config *config) struct dma_slave_config *config)
Please see the dma_slave_config structure definition in dmaengine.h Please see the dma_slave_config structure definition in dmaengine.h
for a detailed explaination of the struct members. Please note for a detailed explanation of the struct members. Please note
that the 'direction' member will be going away as it duplicates the that the 'direction' member will be going away as it duplicates the
direction given in the prepare call. direction given in the prepare call.
+4 -4
View File
@@ -177,8 +177,8 @@ sgram - tells to driver that you have Gxx0 with SGRAM memory. It has no
effect without `init'. effect without `init'.
sdram - tells to driver that you have Gxx0 with SDRAM memory. sdram - tells to driver that you have Gxx0 with SDRAM memory.
It is a default. It is a default.
inv24 - change timings parameters for 24bpp modes on Millenium and inv24 - change timings parameters for 24bpp modes on Millennium and
Millenium II. Specify this if you see strange color shadows around Millennium II. Specify this if you see strange color shadows around
characters. characters.
noinv24 - use standard timings. It is the default. noinv24 - use standard timings. It is the default.
inverse - invert colors on screen (for LCD displays) inverse - invert colors on screen (for LCD displays)
@@ -204,9 +204,9 @@ grayscale - enable grayscale summing. It works in PSEUDOCOLOR modes (text,
can paint colors. can paint colors.
nograyscale - disable grayscale summing. It is default. nograyscale - disable grayscale summing. It is default.
cross4MB - enables that pixel line can cross 4MB boundary. It is default for cross4MB - enables that pixel line can cross 4MB boundary. It is default for
non-Millenium. non-Millennium.
nocross4MB - pixel line must not cross 4MB boundary. It is default for nocross4MB - pixel line must not cross 4MB boundary. It is default for
Millenium I or II, because of these devices have hardware Millennium I or II, because of these devices have hardware
limitations which do not allow this. But this option is limitations which do not allow this. But this option is
incompatible with some (if not all yet released) versions of incompatible with some (if not all yet released) versions of
XF86_FBDev. XF86_FBDev.
+2 -2
View File
@@ -308,7 +308,7 @@ min_batch_time=usec This parameter sets the commit time (as
fast disks, at the cost of increasing latency. fast disks, at the cost of increasing latency.
journal_ioprio=prio The I/O priority (from 0 to 7, where 0 is the journal_ioprio=prio The I/O priority (from 0 to 7, where 0 is the
highest priorty) which should be used for I/O highest priority) which should be used for I/O
operations submitted by kjournald2 during a operations submitted by kjournald2 during a
commit operation. This defaults to 3, which is commit operation. This defaults to 3, which is
a slightly higher priority than the default I/O a slightly higher priority than the default I/O
@@ -343,7 +343,7 @@ noinit_itable Do not initialize any uninitialized inode table
init_itable=n The lazy itable init code will wait n times the init_itable=n The lazy itable init code will wait n times the
number of milliseconds it took to zero out the number of milliseconds it took to zero out the
previous block group's inode table. This previous block group's inode table. This
minimizes the impact on the systme performance minimizes the impact on the system performance
while file system's inode table is being initialized. while file system's inode table is being initialized.
discard Controls whether ext4 should issue discard/TRIM discard Controls whether ext4 should issue discard/TRIM
+1 -1
View File
@@ -62,7 +62,7 @@ be fixed.
The REMOVE uevent is generated at the end of an unsuccessful mount The REMOVE uevent is generated at the end of an unsuccessful mount
or at the end of a umount of the filesystem. All REMOVE uevents will or at the end of a umount of the filesystem. All REMOVE uevents will
have been preceded by at least an ADD uevent for the same fileystem, have been preceded by at least an ADD uevent for the same filesystem,
and unlike the other uevents is generated automatically by the kernel's and unlike the other uevents is generated automatically by the kernel's
kobject subsystem. kobject subsystem.
@@ -20,7 +20,7 @@ Commands can be embedded into transaction command (which in turn has own command
so one can extend protocol as needed without breaking backward compatibility as long so one can extend protocol as needed without breaking backward compatibility as long
as old commands are supported. All string lengths include tail 0 byte. as old commands are supported. All string lengths include tail 0 byte.
All commands are transferred over the network in big-endian. CPU endianess is used at the end peers. All commands are transferred over the network in big-endian. CPU endianness is used at the end peers.
@cmd - command number, which specifies command to be processed. Following @cmd - command number, which specifies command to be processed. Following
commands are used currently: commands are used currently:
@@ -297,7 +297,7 @@ the above threads) is:
either way about the archive format, and there are alternative tools, either way about the archive format, and there are alternative tools,
such as: such as:
http://freshmeat.net/projects/afio/ http://freecode.com/projects/afio
2) The cpio archive format chosen by the kernel is simpler and cleaner (and 2) The cpio archive format chosen by the kernel is simpler and cleaner (and
thus easier to create and parse) than any of the (literally dozens of) thus easier to create and parse) than any of the (literally dozens of)

Some files were not shown because too many files have changed in this diff Show More