Skip to content

Commit

Permalink
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel…
Browse files Browse the repository at this point in the history
…/git/jikos/trivial into next

Pull trivial tree changes from Jiri Kosina:
 "Usual pile of patches from trivial tree that make the world go round"

* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/trivial: (23 commits)
  staging: go7007: remove reference to CONFIG_KMOD
  aic7xxx: Remove obsolete preprocessor define
  of: dma: doc fixes
  doc: fix incorrect formula to calculate CommitLimit value
  doc: Note need of bc in the kernel build from 3.10 onwards
  mm: Fix printk typo in dmapool.c
  modpost: Fix comment typo "Modules.symvers"
  Kconfig.debug: Grammar s/addition/additional/
  wimax: Spelling s/than/that/, wording s/destinatary/recipient/
  aic7xxx: Spelling s/termnation/termination/
  arm64: mm: Remove superfluous "the" in comment
  of: Spelling s/anonymouns/anonymous/
  dma: imx-sdma: Spelling s/determnine/determine/
  ath10k: Improve grammar in comments
  ath6kl: Spelling s/determnine/determine/
  of: Improve grammar for of_alias_get_id() documentation
  drm/exynos: Spelling s/contro/control/
  radio-bcm2048.c: fix wrong overflow check
  doc: printk-formats: do not mention casts for u64/s64
  doc: spelling error changes
  ...
  • Loading branch information
torvalds committed Jun 4, 2014
2 parents b05d59d + 3178953 commit 1aacb90
Show file tree
Hide file tree
Showing 61 changed files with 84 additions and 89 deletions.
5 changes: 5 additions & 0 deletions Documentation/Changes
Original file line number Diff line number Diff line change
Expand Up @@ -73,6 +73,11 @@ Perl
You will need perl 5 and the following modules: Getopt::Long, Getopt::Std,
File::Basename, and File::Find to build the kernel.

BC
--

You will need bc to build kernels 3.10 and higher


System utilities
================
Expand Down
2 changes: 1 addition & 1 deletion Documentation/DMA-attributes.txt
Original file line number Diff line number Diff line change
Expand Up @@ -98,5 +98,5 @@ DMA_ATTR_FORCE_CONTIGUOUS
By default DMA-mapping subsystem is allowed to assemble the buffer
allocated by dma_alloc_attrs() function from individual pages if it can
be mapped as contiguous chunk into device dma address space. By
specifing this attribute the allocated buffer is forced to be contiguous
specifying this attribute the allocated buffer is forced to be contiguous
also in physical memory.
2 changes: 1 addition & 1 deletion Documentation/devicetree/bindings/arm/omap/omap.txt
Original file line number Diff line number Diff line change
Expand Up @@ -129,7 +129,7 @@ Boards:
- AM437x GP EVM
compatible = "ti,am437x-gp-evm", "ti,am4372", "ti,am43"

- DRA742 EVM: Software Developement Board for DRA742
- DRA742 EVM: Software Development Board for DRA742
compatible = "ti,dra7-evm", "ti,dra742", "ti,dra74", "ti,dra7"

- DRA722 EVM: Software Development Board for DRA722
Expand Down
2 changes: 1 addition & 1 deletion Documentation/devicetree/bindings/bus/mvebu-mbus.txt
Original file line number Diff line number Diff line change
Expand Up @@ -197,7 +197,7 @@ to be set by the operating system and that are guaranteed to be free of overlaps
with one another or with the system memory ranges.

Each entry in the property refers to exactly one window. If the operating system
choses to use a different set of mbus windows, it must ensure that any address
chooses to use a different set of mbus windows, it must ensure that any address
translations performed from downstream devices are adapted accordingly.

The operating system may insert additional mbus windows that do not conflict
Expand Down
4 changes: 2 additions & 2 deletions Documentation/devicetree/bindings/dma/dma.txt
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ Required property:

Optional properties:
- dma-channels: Number of DMA channels supported by the controller.
- dma-requests: Number of DMA requests signals supported by the
- dma-requests: Number of DMA request signals supported by the
controller.

Example:
Expand Down Expand Up @@ -44,7 +44,7 @@ Required property:
#dma-cells property in the node referenced by phandle
containing DMA controller specific information. This
typically contains a DMA request line number or a
channel number, but can contain any data that is used
channel number, but can contain any data that is
required for configuring a channel.
- dma-names: Contains one identifier string for each DMA specifier in
the dmas property. The specific strings that can be used
Expand Down
2 changes: 1 addition & 1 deletion Documentation/devicetree/bindings/dma/fsl-imx-sdma.txt
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ Required properties:
"fsl,imx51-sdma"
"fsl,imx53-sdma"
"fsl,imx6q-sdma"
The -to variants should be preferred since they allow to determnine the
The -to variants should be preferred since they allow to determine the
correct ROM script addresses needed for the driver to work without additional
firmware.
- reg : Should contain SDMA registers location and length
Expand Down
2 changes: 1 addition & 1 deletion Documentation/devicetree/bindings/gpio/gpio-mcp23s08.txt
Original file line number Diff line number Diff line change
Expand Up @@ -54,7 +54,7 @@ Optional device specific properties:
IO 8-15 are bank 2. These chips have two different interrupt outputs:
One for bank 1 and another for bank 2. If irq-mirror is set, both
interrupts are generated regardless of the bank that an input change
occured on. If it is not set, the interrupt are only generated for the
occurred on. If it is not set, the interrupt are only generated for the
bank they belong to.
On devices with only one interrupt output this property is useless.

Expand Down
2 changes: 1 addition & 1 deletion Documentation/devicetree/bindings/mmc/k3-dw-mshc.txt
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ extensions to the Synopsys Designware Mobile Storage Host Controller.
Required Properties:

* compatible: should be one of the following.
- "hisilicon,hi4511-dw-mshc": for controllers with hi4511 specific extentions.
- "hisilicon,hi4511-dw-mshc": for controllers with hi4511 specific extensions.

Example:

Expand Down
2 changes: 1 addition & 1 deletion Documentation/devicetree/bindings/mmc/samsung-sdhci.txt
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
Samsung's SDHCI controller is used as a connectivity interface with external
MMC, SD and eMMC storage mediums. This file documents differences between the
core mmc properties described by mmc.txt and the properties used by the
Samsung implmentation of the SDHCI controller.
Samsung implementation of the SDHCI controller.

Required SoC Specific Properties:
- compatible: should be one of the following
Expand Down
2 changes: 1 addition & 1 deletion Documentation/devicetree/bindings/mtd/gpmc-nand.txt
Original file line number Diff line number Diff line change
Expand Up @@ -43,7 +43,7 @@ Optional properties:
ELM hardware engines should specify this device node in .dtsi
Using ELM for ECC error correction frees some CPU cycles.

For inline partiton table parsing (optional):
For inline partition table parsing (optional):

- #address-cells: should be set to 1
- #size-cells: should be set to 1
Expand Down
2 changes: 1 addition & 1 deletion Documentation/devicetree/bindings/mtd/gpmc-nor.txt
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@ Optional properties:
- gpmc,XXX Additional GPMC timings and settings parameters. See
Documentation/devicetree/bindings/bus/ti-gpmc.txt

Optional properties for partiton table parsing:
Optional properties for partition table parsing:
- #address-cells: should be set to 1
- #size-cells: should be set to 1

Expand Down
2 changes: 1 addition & 1 deletion Documentation/devicetree/bindings/mtd/gpmc-onenand.txt
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ Optional properties:

- dma-channel: DMA Channel index

For inline partiton table parsing (optional):
For inline partition table parsing (optional):

- #address-cells: should be set to 1
- #size-cells: should be set to 1
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -73,9 +73,9 @@ Optional Properties (for standard pins):
Otherwise:
0: fast slew rate
1: normal slew rate
- input-enable: No arguements. Enable input (does not affect
- input-enable: No arguments. Enable input (does not affect
output.)
- input-disable: No arguements. Disable input (does not affect
- input-disable: No arguments. Disable input (does not affect
output.)
- drive-strength: Integer. Drive strength in mA. Valid values are
2, 4, 6, 8, 10, 12, 14, 16 mA.
Expand All @@ -99,9 +99,9 @@ Optional Properties (for I2C pins):
Otherwise:
0: fast slew rate
1: normal slew rate
- input-enable: No arguements. Enable input (does not affect
- input-enable: No arguments. Enable input (does not affect
output.)
- input-disable: No arguements. Disable input (does not affect
- input-disable: No arguments. Disable input (does not affect
output.)

Optional Properties (for HDMI pins):
Expand All @@ -111,9 +111,9 @@ Optional Properties (for HDMI pins):
- slew-rate: Integer. Controls slew rate.
0: Standard(100kbps)& Fast(400kbps) mode
1: Highspeed (3.4Mbps) mode
- input-enable: No arguements. Enable input (does not affect
- input-enable: No arguments. Enable input (does not affect
output.)
- input-disable: No arguements. Disable input (does not affect
- input-disable: No arguments. Disable input (does not affect
output.)

Example:
Expand Down
2 changes: 1 addition & 1 deletion Documentation/devicetree/bindings/powerpc/4xx/reboot.txt
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
Reboot property to control system reboot on PPC4xx systems:

By setting "reset_type" to one of the following values, the default
software reset mechanism may be overidden. Here the possible values of
software reset mechanism may be overridden. Here the possible values of
"reset_type":

1 - PPC4xx core reset
Expand Down
2 changes: 1 addition & 1 deletion Documentation/devicetree/bindings/powerpc/fsl/dcsr.txt
Original file line number Diff line number Diff line change
Expand Up @@ -82,7 +82,7 @@ PROPERTIES
Which event source asserted the interrupt is captured in an EPU
Interrupt Status Register (EPISR0,EPISR1).

Interrupt numbers are lised in order (perfmon, event0, event1).
Interrupt numbers are listed in order (perfmon, event0, event1).

- interrupt-parent
Usage: required
Expand Down
2 changes: 1 addition & 1 deletion Documentation/devicetree/bindings/regulator/regulator.txt
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ Optional properties:
- regulator-allow-bypass: allow the regulator to go into bypass mode
- <name>-supply: phandle to the parent supply/regulator node
- regulator-ramp-delay: ramp delay for regulator(in uV/uS)
For hardwares which support disabling ramp rate, it should be explicitly
For hardware which supports disabling ramp rate, it should be explicitly
intialised to zero (regulator-ramp-delay = <0>) for disabling ramp delay.
- regulator-enable-ramp-delay: The time taken, in microseconds, for the supply
rail to reach the target voltage, plus/minus whatever tolerance the board
Expand Down
2 changes: 1 addition & 1 deletion Documentation/devicetree/bindings/spi/spi-bus.txt
Original file line number Diff line number Diff line change
Expand Up @@ -63,7 +63,7 @@ contain the following properties.
used for MISO. Defaults to 1 if not present.

Some SPI controllers and devices support Dual and Quad SPI transfer mode.
It allows data in SPI system transfered in 2 wires(DUAL) or 4 wires(QUAD).
It allows data in the SPI system to be transferred in 2 wires(DUAL) or 4 wires(QUAD).
Now the value that spi-tx-bus-width and spi-rx-bus-width can receive is
only 1(SINGLE), 2(DUAL) and 4(QUAD).
Dual/Quad mode is not allowed when 3-wire mode is used.
Expand Down
6 changes: 3 additions & 3 deletions Documentation/dma-buf-sharing.txt
Original file line number Diff line number Diff line change
Expand Up @@ -66,7 +66,7 @@ The dma_buf buffer sharing API usage contains the following steps:

Exporting modules which do not wish to provide any specific name may use the
helper define 'dma_buf_export()', with the same arguments as above, but
without the last argument; a __FILE__ pre-processor directive will be
without the last argument; a KBUILD_MODNAME pre-processor directive will be
inserted in place of 'exp_name' instead.

2. Userspace gets a handle to pass around to potential buffer-users
Expand Down Expand Up @@ -217,7 +217,7 @@ NOTES:
and then allow further {map,unmap}_dma_buf operations from any buffer-user
from the migrated backing-storage.

If the exporter cannot fulfil the backing-storage constraints of the new
If the exporter cannot fulfill the backing-storage constraints of the new
buffer-user device as requested, dma_buf_attach() would return an error to
denote non-compatibility of the new buffer-sharing request with the current
buffer.
Expand Down Expand Up @@ -352,7 +352,7 @@ Being able to mmap an export dma-buf buffer object has 2 main use-cases:

No special interfaces, userspace simply calls mmap on the dma-buf fd.

2. Supporting existing mmap interfaces in exporters
2. Supporting existing mmap interfaces in importers

Similar to the motivation for kernel cpu access it is again important that
the userspace code of a given importing subsystem can use the same interfaces
Expand Down
2 changes: 1 addition & 1 deletion Documentation/dynamic-debug-howto.txt
Original file line number Diff line number Diff line change
Expand Up @@ -321,7 +321,7 @@ nullarbor:~ # echo -n 'func svc_process -p' >
nullarbor:~ # echo -n 'format "nfsd: READ" +p' >
<debugfs>/dynamic_debug/control

// enable messages in files of which the pathes include string "usb"
// enable messages in files of which the paths include string "usb"
nullarbor:~ # echo -n '*usb* +p' > <debugfs>/dynamic_debug/control

// enable all messages
Expand Down
2 changes: 1 addition & 1 deletion Documentation/edac.txt
Original file line number Diff line number Diff line change
Expand Up @@ -550,7 +550,7 @@ installs itself as:
/sys/devices/systm/edac/test-instance

in this directory are various controls, a symlink and one or more 'instance'
directorys.
directories.

The standard default controls are:

Expand Down
2 changes: 1 addition & 1 deletion Documentation/fb/sm501.txt
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ Configuration:
You can pass the following kernel command line options to sm501 videoframebuffer:

sm501fb.bpp= SM501 Display driver:
Specifiy bits-per-pixel if not specified by 'mode'
Specify bits-per-pixel if not specified by 'mode'

sm501fb.mode= SM501 Display driver:
Specify resolution as
Expand Down
2 changes: 1 addition & 1 deletion Documentation/fb/sstfb.txt
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ Introduction
The main page is located at <http://sstfb.sourceforge.net>, and if
you want the latest version, check out the CVS, as the driver is a work
in progress, I feel uncomfortable with releasing tarballs of something
not completely working...Don't worry, it's still more than useable
not completely working...Don't worry, it's still more than usable
(I eat my own dog food)

Please read the Bug section, and report any success or failure to me
Expand Down
7 changes: 4 additions & 3 deletions Documentation/filesystems/proc.txt
Original file line number Diff line number Diff line change
Expand Up @@ -234,7 +234,7 @@ Table 1-2: Contents of the status files (as of 2.6.30-rc7)
ShdPnd bitmap of shared pending signals for the process
SigBlk bitmap of blocked signals
SigIgn bitmap of ignored signals
SigCgt bitmap of catched signals
SigCgt bitmap of caught signals
CapInh bitmap of inheritable capabilities
CapPrm bitmap of permitted capabilities
CapEff bitmap of effective capabilities
Expand Down Expand Up @@ -300,7 +300,7 @@ Table 1-4: Contents of the stat files (as of 2.6.30-rc7)
pending bitmap of pending signals
blocked bitmap of blocked signals
sigign bitmap of ignored signals
sigcatch bitmap of catched signals
sigcatch bitmap of caught signals
wchan address where process went to sleep
0 (place holder)
0 (place holder)
Expand Down Expand Up @@ -854,7 +854,8 @@ WritebackTmp: Memory used by FUSE for temporary writeback buffers
if strict overcommit accounting is enabled (mode 2 in
'vm.overcommit_memory').
The CommitLimit is calculated with the following formula:
CommitLimit = ('vm.overcommit_ratio' * Physical RAM) + Swap
CommitLimit = ([total RAM pages] - [total huge TLB pages]) *
overcommit_ratio / 100 + [total swap pages]
For example, on a system with 1G of physical RAM and 7G
of swap with a `vm.overcommit_ratio` of 30 it would
yield a CommitLimit of 7.3G.
Expand Down
2 changes: 1 addition & 1 deletion Documentation/filesystems/sharedsubtree.txt
Original file line number Diff line number Diff line change
Expand Up @@ -727,7 +727,7 @@ replicas continue to be exactly same.
mkdir -p /tmp/m3
mount --rbind /root /tmp/m3

I wont' draw the tree..but it has 24 vfsmounts
I won't draw the tree..but it has 24 vfsmounts


at step i the number of vfsmounts is V[i] = i*V[i-1].
Expand Down
2 changes: 1 addition & 1 deletion Documentation/gpio/consumer.txt
Original file line number Diff line number Diff line change
Expand Up @@ -41,7 +41,7 @@ Both functions return either a valid GPIO descriptor, or an error code checkable
with IS_ERR() (they will never return a NULL pointer). -ENOENT will be returned
if and only if no GPIO has been assigned to the device/function/index triplet,
other error codes are used for cases where a GPIO has been assigned but an error
occured while trying to acquire it. This is useful to discriminate between mere
occurred while trying to acquire it. This is useful to discriminate between mere
errors and an absence of GPIO for optional GPIO parameters.

Device-managed variants of these functions are also defined:
Expand Down
2 changes: 1 addition & 1 deletion Documentation/hid/uhid.txt
Original file line number Diff line number Diff line change
Expand Up @@ -125,7 +125,7 @@ the request was handled successfully.

read()
------
read() will return a queued ouput report. These output reports can be of type
read() will return a queued output report. These output reports can be of type
UHID_START, UHID_STOP, UHID_OPEN, UHID_CLOSE, UHID_OUTPUT or UHID_OUTPUT_EV. No
reaction is required to any of them but you should handle them according to your
needs. Only UHID_OUTPUT and UHID_OUTPUT_EV have payloads.
Expand Down
2 changes: 1 addition & 1 deletion Documentation/input/alps.txt
Original file line number Diff line number Diff line change
Expand Up @@ -94,7 +94,7 @@ PS/2 packet format

Note that the device never signals overflow condition.

ALPS Absolute Mode - Protocol Verion 1
ALPS Absolute Mode - Protocol Version 1
--------------------------------------

byte 0: 1 0 0 0 1 x9 x8 x7
Expand Down
2 changes: 1 addition & 1 deletion Documentation/input/input.txt
Original file line number Diff line number Diff line change
Expand Up @@ -226,7 +226,7 @@ And so on up to js31.
~~~~~~~~~~~
evdev is the generic input event interface. It passes the events
generated in the kernel straight to the program, with timestamps. The
API is still evolving, but should be useable now. It's described in
API is still evolving, but should be usable now. It's described in
section 5.

This should be the way for GPM and X to get keyboard and mouse
Expand Down
2 changes: 1 addition & 1 deletion Documentation/mtd/nand/pxa3xx-nand.txt
Original file line number Diff line number Diff line change
Expand Up @@ -48,7 +48,7 @@ configurable between two modes: 1) Hamming, 2) BCH.
Note that the actual BCH mode: BCH-4 or BCH-8 will depend on the way
the controller is configured to transfer the data.

In the BCH mode the ECC code will be calculated for each transfered chunk
In the BCH mode the ECC code will be calculated for each transferred chunk
and expected to be located (when reading/programming) right after the spare
bytes as the figure above shows.

Expand Down
2 changes: 1 addition & 1 deletion Documentation/networking/can.txt
Original file line number Diff line number Diff line change
Expand Up @@ -706,7 +706,7 @@ solution for a couple of reasons:

RX_NO_AUTOTIMER: Prevent automatically starting the timeout monitor.

RX_ANNOUNCE_RESUME: If passed at RX_SETUP and a receive timeout occured, a
RX_ANNOUNCE_RESUME: If passed at RX_SETUP and a receive timeout occurred, a
RX_CHANGED message will be generated when the (cyclic) receive restarts.

TX_RESET_MULTI_IDX: Reset the index for the multiple frame transmission.
Expand Down
2 changes: 1 addition & 1 deletion Documentation/networking/dccp.txt
Original file line number Diff line number Diff line change
Expand Up @@ -86,7 +86,7 @@ built-in CCIDs.

DCCP_SOCKOPT_CCID is write-only and sets both the TX and RX CCIDs at the same
time, combining the operation of the next two socket options. This option is
preferrable over the latter two, since often applications will use the same
preferable over the latter two, since often applications will use the same
type of CCID for both directions; and mixed use of CCIDs is not currently well
understood. This socket option takes as argument at least one uint8_t value, or
an array of uint8_t values, which must match available CCIDS (see above). CCIDs
Expand Down
2 changes: 1 addition & 1 deletion Documentation/powerpc/transactional_memory.txt
Original file line number Diff line number Diff line change
Expand Up @@ -160,7 +160,7 @@ To avoid this, when taking a signal in an active transaction, we need to use
the stack pointer from the checkpointed state, rather than the speculated
state. This ensures that the signal context (written tm suspended) will be
written below the stack required for the rollback. The transaction is aborted
becuase of the treclaim, so any memory written between the tbegin and the
because of the treclaim, so any memory written between the tbegin and the
signal will be rolled back anyway.

For signals taken in non-TM or suspended mode, we use the
Expand Down
4 changes: 2 additions & 2 deletions Documentation/printk-formats.txt
Original file line number Diff line number Diff line change
Expand Up @@ -199,11 +199,11 @@ struct va_format:
Do not use this feature without some mechanism to verify the
correctness of the format string and va_list arguments.

u64 SHOULD be printed with %llu/%llx, (unsigned long long):
u64 SHOULD be printed with %llu/%llx:

printk("%llu", u64_var);

s64 SHOULD be printed with %lld/%llx, (long long):
s64 SHOULD be printed with %lld/%llx:

printk("%lld", s64_var);

Expand Down
2 changes: 1 addition & 1 deletion Documentation/rbtree.txt
Original file line number Diff line number Diff line change
Expand Up @@ -255,7 +255,7 @@ However, rbtree can be augmented to store such interval ranges in a structured
way making it possible to do efficient lookup and exact match.

This "extra information" stored in each node is the maximum hi
(max_hi) value among all the nodes that are its descendents. This
(max_hi) value among all the nodes that are its descendants. This
information can be maintained at each node just be looking at the node
and its immediate children. And this will be used in O(log n) lookup
for lowest match (lowest start address among all possible matches)
Expand Down
2 changes: 1 addition & 1 deletion Documentation/rfkill.txt
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ aircraft.
The rfkill subsystem has a concept of "hard" and "soft" block, which
differ little in their meaning (block == transmitters off) but rather in
whether they can be changed or not:
- hard block: read-only radio block that cannot be overriden by software
- hard block: read-only radio block that cannot be overridden by software
- soft block: writable radio block (need not be readable) that is set by
the system software.

Expand Down
Loading

0 comments on commit 1aacb90

Please sign in to comment.