Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 5d434fcb 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 

Pull trivial tree updates from Jiri Kosina:
 "Usual stuff, mostly comment fixes, typo fixes, printk fixes and small
  code cleanups"

* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/trivial: (45 commits)
  mm: Convert print_symbol to %pSR
  gfs2: Convert print_symbol to %pSR
  m32r: Convert print_symbol to %pSR
  iostats.txt: add easy-to-find description for field 6
  x86 cmpxchg.h: fix wrong comment
  treewide: Fix typo in printk and comments
  doc: devicetree: Fix various typos
  docbook: fix 8250 naming in device-drivers
  pata_pdc2027x: Fix compiler warning
  treewide: Fix typo in printks
  mei: Fix comments in drivers/misc/mei
  treewide: Fix typos in kernel messages
  pm44xx: Fix comment for "CONFIG_CPU_IDLE"
  doc: Fix typo "CONFIG_CGROUP_CGROUP_MEMCG_SWAP"
  mmzone: correct "pags" to "pages" in comment.
  kernel-parameters: remove outdated 'noresidual' parameter
  Remove spurious _H suffixes from ifdef comments
  sound: Remove stray pluses from Kconfig file
  radio-shark: Fix printk "CONFIG_LED_CLASS"
  doc: put proper reference to CONFIG_MODULE_SIG_ENFORCE
  ...
parents 5a5a1bf0 071361d3

Documentation/DocBook/media/dvb/dvbproperty.xml

+3 −3
Original line number Original line Diff line number Diff line 
<section id="FE_GET_SET_PROPERTY">

<section id="FE_GET_SET_PROPERTY">

<title><constant>FE_GET_PROPERTY/FE_SET_PROPERTY</constant></title>

<title><constant>FE_GET_PROPERTY/FE_SET_PROPERTY</constant></title>

<para>This section describes the DVB version 5 extention of the DVB-API, also

<para>This section describes the DVB version 5 extension of the DVB-API, also

called "S2API", as this API were added to provide support for DVB-S2. It was

called "S2API", as this API were added to provide support for DVB-S2. It was

designed to be able to replace the old frontend API. Yet, the DISEQC and

designed to be able to replace the old frontend API. Yet, the DISEQC and

the capability ioctls weren't implemented yet via the new way.</para>

the capability ioctls weren't implemented yet via the new way.</para>
@@ -952,7 +952,7 @@ enum fe_interleaving { 
		<para>Measures the amount of bits received before the inner code block, during the same period as

		<para>Measures the amount of bits received before the inner code block, during the same period as

		<link linkend="DTV-STAT-PRE-ERROR-BIT-COUNT"><constant>DTV_STAT_PRE_ERROR_BIT_COUNT</constant></link> measurement was taken.</para>

		<link linkend="DTV-STAT-PRE-ERROR-BIT-COUNT"><constant>DTV_STAT_PRE_ERROR_BIT_COUNT</constant></link> measurement was taken.</para>

		<para>It should be noticed that this measurement can be smaller than the total amount of bits on the transport stream,

		<para>It should be noticed that this measurement can be smaller than the total amount of bits on the transport stream,

		      as the frontend may need to manually restart the measurement, loosing some data between each measurement interval.</para>

		      as the frontend may need to manually restart the measurement, losing some data between each measurement interval.</para>

		<para>This measurement is monotonically increased, as the frontend gets more bit count measurements.

		<para>This measurement is monotonically increased, as the frontend gets more bit count measurements.

		      The frontend may reset it when a channel/transponder is tuned.</para>

		      The frontend may reset it when a channel/transponder is tuned.</para>

		<para>Possible scales for this metric are:</para>

		<para>Possible scales for this metric are:</para>
@@ -981,7 +981,7 @@ enum fe_interleaving { 
		<para>Measures the amount of bits received after the inner coding, during the same period as

		<para>Measures the amount of bits received after the inner coding, during the same period as

		<link linkend="DTV-STAT-POST-ERROR-BIT-COUNT"><constant>DTV_STAT_POST_ERROR_BIT_COUNT</constant></link> measurement was taken.</para>

		<link linkend="DTV-STAT-POST-ERROR-BIT-COUNT"><constant>DTV_STAT_POST_ERROR_BIT_COUNT</constant></link> measurement was taken.</para>

		<para>It should be noticed that this measurement can be smaller than the total amount of bits on the transport stream,

		<para>It should be noticed that this measurement can be smaller than the total amount of bits on the transport stream,

		      as the frontend may need to manually restart the measurement, loosing some data between each measurement interval.</para>

		      as the frontend may need to manually restart the measurement, losing some data between each measurement interval.</para>

		<para>This measurement is monotonically increased, as the frontend gets more bit count measurements.

		<para>This measurement is monotonically increased, as the frontend gets more bit count measurements.

		      The frontend may reset it when a channel/transponder is tuned.</para>

		      The frontend may reset it when a channel/transponder is tuned.</para>

		<para>Possible scales for this metric are:</para>

		<para>Possible scales for this metric are:</para>

Documentation/cgroups/memory.txt

+1 −1
Original line number Original line Diff line number Diff line
@@ -196,7 +196,7 @@ the cgroup that brought it in -- this will happen on memory pressure). 
But see section 8.2: when moving a task to another cgroup, its pages may

But see section 8.2: when moving a task to another cgroup, its pages may

be recharged to the new cgroup, if move_charge_at_immigrate has been chosen.

be recharged to the new cgroup, if move_charge_at_immigrate has been chosen.





Exception: If CONFIG_CGROUP_CGROUP_MEMCG_SWAP is not used.

Exception: If CONFIG_MEMCG_SWAP is not used.

When you do swapoff and make swapped-out pages of shmem(tmpfs) to

When you do swapoff and make swapped-out pages of shmem(tmpfs) to

be backed into memory in force, charges for pages are accounted against the

be backed into memory in force, charges for pages are accounted against the

caller of swapoff rather than the users of shmem.

caller of swapoff rather than the users of shmem.

Documentation/devicetree/bindings/i2c/i2c-s3c2410.txt

+1 −1
Original line number Original line Diff line number Diff line
@@ -26,7 +26,7 @@ Required for all cases except "samsung,s3c2440-hdmiphy-i2c": 
    - pinctrl-names: Should contain only one value - "default".

    - pinctrl-names: Should contain only one value - "default".





Optional properties:

Optional properties:

  - samsung,i2c-slave-addr: Slave address in multi-master enviroment. If not

  - samsung,i2c-slave-addr: Slave address in multi-master environment. If not

    specified, default value is 0.

    specified, default value is 0.

  - samsung,i2c-max-bus-freq: Desired frequency in Hz of the bus. If not

  - samsung,i2c-max-bus-freq: Desired frequency in Hz of the bus. If not

    specified, the default value in Hz is 100000.

    specified, the default value in Hz is 100000.

Documentation/devicetree/bindings/leds/tca6507.txt

+1 −1
Original line number Original line Diff line number Diff line 
LEDs conected to tca6507

LEDs connected to tca6507





Required properties:

Required properties:

- compatible : should be : "ti,tca6507".

- compatible : should be : "ti,tca6507".

Documentation/devicetree/bindings/metag/meta-intc.txt

+1 −1
Original line number Original line Diff line number Diff line
@@ -12,7 +12,7 @@ Required properties: 
      handle 32 interrupt sources).

      handle 32 interrupt sources).





    - interrupt-controller: The presence of this property identifies the node

    - interrupt-controller: The presence of this property identifies the node

      as an interupt controller. No property value shall be defined.

      as an interrupt controller. No property value shall be defined.





    - #interrupt-cells: Specifies the number of cells needed to encode an

    - #interrupt-cells: Specifies the number of cells needed to encode an

      interrupt source. The type shall be a <u32> and the value shall be 2.

      interrupt source. The type shall be a <u32> and the value shall be 2.