Commit 1aacb90e authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/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
  ...
parents b05d59df 31789538

Documentation/Changes

+5 −0
Original line number Diff line number Diff line
@@ -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

================

Documentation/DMA-attributes.txt

+1 −1
Original line number Diff line number Diff line
@@ -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.

Documentation/devicetree/bindings/arm/omap/omap.txt

+1 −1
Original line number Diff line number Diff line
@@ -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

Documentation/devicetree/bindings/bus/mvebu-mbus.txt

+1 −1
Original line number Diff line number Diff line
@@ -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

Documentation/devicetree/bindings/dma/dma.txt

+2 −2
Original line number Diff line number Diff line
@@ -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:
@@ -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

CRA Git | Maintained and supported by SUSTech CRA and CCSE