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

Commit 4ba63072 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge tag 'char-misc-3.20-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/char-misc 

Pull char / misc patches from Greg KH:
 "Here's the big char/misc driver update for 3.20-rc1.

  Lots of little things in here, all described in the changelog.
  Nothing major or unusual, except maybe the binder selinux stuff, which
  was all acked by the proper selinux people and they thought it best to
  come through this tree.

  All of this has been in linux-next with no reported issues for a while"

* tag 'char-misc-3.20-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/char-misc: (90 commits)
  coresight: fix function etm_writel_cp14() parameter order
  coresight-etm: remove check for unknown Kconfig macro
  coresight: fixing CPU hwid lookup in device tree
  coresight: remove the unnecessary function coresight_is_bit_set()
  coresight: fix the debug AMBA bus name
  coresight: remove the extra spaces
  coresight: fix the link between orphan connection and newly added device
  coresight: remove the unnecessary replicator property
  coresight: fix the replicator subtype value
  pdfdocs: Fix 'make pdfdocs' failure for 'uio-howto.tmpl'
  mcb: Fix error path of mcb_pci_probe
  virtio/console: verify device has config space
  ti-st: clean up data types (fix harmless memory corruption)
  mei: me: release hw from reset only during the reset flow
  mei: mask interrupt set bit on clean reset bit
  extcon: max77693: Constify struct regmap_config
  extcon: adc-jack: Release IIO channel on driver remove
  extcon: Remove duplicated include from extcon-class.c
  Drivers: hv: vmbus: hv_process_timer_expiration() can be static
  Drivers: hv: vmbus: serialize Offer and Rescind offer
  ...
parents e2987672 5fb31cd8

Documentation/DocBook/uio-howto.tmpl

+7 −7
Original line number Diff line number Diff line
@@ -719,7 +719,7 @@ framework to set up sysfs files for this region. Simply leave it alone. 
	</para>

</sect1>



<sect1 id="using uio_dmem_genirq">

<sect1 id="using-uio_dmem_genirq">

<title>Using uio_dmem_genirq for platform devices</title>

	<para>

	In addition to statically allocated memory ranges, they may also be
@@ -746,16 +746,16 @@ framework to set up sysfs files for this region. Simply leave it alone. 
	following elements:

	</para>

	<itemizedlist>

	<listitem><varname>struct uio_info uioinfo</varname>: The same

	<listitem><para><varname>struct uio_info uioinfo</varname>: The same

	structure used as the  <varname>uio_pdrv_genirq</varname> platform

	data</listitem>

	<listitem><varname>unsigned int *dynamic_region_sizes</varname>:

	data</para></listitem>

	<listitem><para><varname>unsigned int *dynamic_region_sizes</varname>:

	Pointer to list of sizes of dynamic memory regions to be mapped into

	user space.

	</listitem>

	<listitem><varname>unsigned int num_dynamic_regions</varname>:

	</para></listitem>

	<listitem><para><varname>unsigned int num_dynamic_regions</varname>:

	Number of elements in <varname>dynamic_region_sizes</varname> array.

	</listitem>

	</para></listitem>

	</itemizedlist>

	<para>

	The dynamic regions defined in the platform data will be appended to

Documentation/devicetree/bindings/arm/coresight.txt

+0 −4
Original line number Diff line number Diff line
@@ -38,8 +38,6 @@ its hardware characteristcs. 
	  AMBA markee):

		- "arm,coresight-replicator"



	* id: a unique number that will identify this replicator.



	* port or ports: same as above.



* Optional properties for ETM/PTMs:
@@ -94,8 +92,6 @@ Example: 
		 * AMBA bus.  As such no need to add "arm,primecell".

		 */

		compatible = "arm,coresight-replicator";

		/* this will show up in debugfs as "0.replicator" */

		id = <0>;



		ports {

			#address-cells = <1>;

Documentation/devicetree/bindings/powerpc/fsl/lbc.txt

+13 −5
Original line number Diff line number Diff line
@@ -16,20 +16,28 @@ Example: 
			   "fsl,pq2-localbus";

		#address-cells = <2>;

		#size-cells = <1>;

		reg = <f0010100 40>;

		reg = <0xf0010100 0x40>;



		ranges = <0 0 fe000000 02000000

			  1 0 f4500000 00008000>;

		ranges = <0x0 0x0 0xfe000000 0x02000000

			  0x1 0x0 0xf4500000 0x00008000

			  0x2 0x0 0xfd810000 0x00010000>;



		flash@0,0 {

			compatible = "jedec-flash";

			reg = <0 0 2000000>;

			reg = <0x0 0x0 0x2000000>;

			bank-width = <4>;

			device-width = <1>;

		};



		board-control@1,0 {

			reg = <1 0 20>;

			reg = <0x1 0x0 0x20>;

			compatible = "fsl,mpc8272ads-bcsr";

		};



		simple-periph@2,0 {

			compatible = "fsl,elbc-gpcm-uio";

			reg = <0x2 0x0 0x10000>;

			elbc-gpcm-br = <0xfd810800>;

			elbc-gpcm-or = <0xffff09f7>;

		};

	};

Documentation/stable_kernel_rules.txt

+34 −10
Original line number Diff line number Diff line
@@ -32,18 +32,42 @@ Procedure for submitting patches to the -stable tree: 
 - If the patch covers files in net/ or drivers/net please follow netdev stable

   submission guidelines as described in

   Documentation/networking/netdev-FAQ.txt

 - Send the patch, after verifying that it follows the above rules, to

   stable@vger.kernel.org.  You must note the upstream commit ID in the

   changelog of your submission, as well as the kernel version you wish

   it to be applied to.

 - To have the patch automatically included in the stable tree, add the tag

 - Security patches should not be handled (solely) by the -stable review

   process but should follow the procedures in Documentation/SecurityBugs.



For all other submissions, choose one of the following procedures:



   --- Option 1 ---



   To have the patch automatically included in the stable tree, add the tag

     Cc: stable@vger.kernel.org

   in the sign-off area. Once the patch is merged it will be applied to

   the stable tree without anything else needing to be done by the author

   or subsystem maintainer.

 - If the patch requires other patches as prerequisites which can be

   cherry-picked, then this can be specified in the following format in

   the sign-off area:



   --- Option 2 ---



   After the patch has been merged to Linus' tree, send an email to

   stable@vger.kernel.org containing the subject of the patch, the commit ID,

   why you think it should be applied, and what kernel version you wish it to

   be applied to.



   --- Option 3 ---



   Send the patch, after verifying that it follows the above rules, to

   stable@vger.kernel.org.  You must note the upstream commit ID in the

   changelog of your submission, as well as the kernel version you wish

   it to be applied to.



Option 1 is probably the easiest and most common. Options 2 and 3 are more

useful if the patch isn't deemed worthy at the time it is applied to a public

git tree (for instance, because it deserves more regression testing first).

Option 3 is especially useful if the patch needs some special handling to apply

to an older kernel (e.g., if API's have changed in the meantime).



Additionally, some patches submitted via Option 1 may have additional patch

prerequisites which can be cherry-picked. This can be specified in the following

format in the sign-off area:



     Cc: <stable@vger.kernel.org> # 3.3.x: a1f84a3: sched: Check for idle

     Cc: <stable@vger.kernel.org> # 3.3.x: 1b9508f: sched: Rate-limit newidle
@@ -57,13 +81,13 @@ Procedure for submitting patches to the -stable tree: 
     git cherry-pick fd21073

     git cherry-pick <this commit>



Following the submission:



 - The sender will receive an ACK when the patch has been accepted into the

   queue, or a NAK if the patch is rejected.  This response might take a few

   days, according to the developer's schedules.

 - If accepted, the patch will be added to the -stable queue, for review by

   other developers and by the relevant subsystem maintainer.

 - Security patches should not be sent to this alias, but instead to the

   documented security@kernel.org address.





Review cycle:

Documentation/trace/coresight.txt

+2 −2
Original line number Diff line number Diff line
@@ -46,7 +46,7 @@ At typical coresight system would look like this: 
  | |   .        | !   | |   .        | !      | !        .   |      | SWD/

  | |   .        | !   | |   .        | !      | !        .   |      | JTAG

  *****************************************************************<-|

 *************************** AMBA Debug ABP ************************

 *************************** AMBA Debug APB ************************

  *****************************************************************

   |    .          !         .          !        !        .    |

   |    .          *         .          *        *        .    |
@@ -79,7 +79,7 @@ At typical coresight system would look like this: 
          To trace port                       TPIU= Trace Port Interface Unit

                                              SWD = Serial Wire Debug



While on target configuration of the components is done via the ABP bus,

While on target configuration of the components is done via the APB bus,

all trace data are carried out-of-band on the ATB bus.  The CTM provides

a way to aggregate and distribute signals between CoreSight components.