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

Commit b9f27c0f authored by Ingo Molnar's avatar Ingo Molnar
Browse files

Merge tag 'v4.3-rc5' into timers/core, to pick up fixes before applying new changes 



Signed-off-by: default avatarIngo Molnar <mingo@kernel.org>
parents 9fc4468d 25cb62b7

Documentation/Changes

+1 −1
Original line number Diff line number Diff line
@@ -43,7 +43,7 @@ o udev 081 # udevd --version 
o  grub                   0.93                    # grub --version || grub-install --version

o  mcelog                 0.6                     # mcelog --version

o  iptables               1.4.2                   # iptables -V

o  openssl & libcrypto    1.0.1k                  # openssl version

o  openssl & libcrypto    1.0.0                   # openssl version





Kernel compilation

Documentation/device-mapper/snapshot.txt

+7 −3
Original line number Diff line number Diff line
@@ -41,9 +41,13 @@ useless and be disabled, returning errors. So it is important to monitor 
the amount of free space and expand the <COW device> before it fills up.



<persistent?> is P (Persistent) or N (Not persistent - will not survive

after reboot).

The difference is that for transient snapshots less metadata must be

saved on disk - they can be kept in memory by the kernel.

after reboot).  O (Overflow) can be added as a persistent store option

to allow userspace to advertise its support for seeing "Overflow" in the

snapshot status.  So supported store types are "P", "PO" and "N".



The difference between persistent and transient is with transient

snapshots less metadata must be saved on disk - they can be kept in

memory by the kernel.





* snapshot-merge <origin> <COW device> <persistent> <chunksize>

Documentation/devicetree/bindings/arm/gic-v3.txt

+5 −0
Original line number Diff line number Diff line
@@ -57,6 +57,8 @@ used to route Message Signalled Interrupts (MSI) to the CPUs. 
These nodes must have the following properties:

- compatible : Should at least contain  "arm,gic-v3-its".

- msi-controller : Boolean property. Identifies the node as an MSI controller

- #msi-cells: Must be <1>. The single msi-cell is the DeviceID of the device

  which will generate the MSI.

- reg: Specifies the base physical address and size of the ITS

  registers.
@@ -83,6 +85,7 @@ Examples: 
		gic-its@2c200000 {

			compatible = "arm,gic-v3-its";

			msi-controller;

			#msi-cells = <1>;

			reg = <0x0 0x2c200000 0 0x200000>;

		};

	};
@@ -107,12 +110,14 @@ Examples: 
		gic-its@2c200000 {

			compatible = "arm,gic-v3-its";

			msi-controller;

			#msi-cells = <1>;

			reg = <0x0 0x2c200000 0 0x200000>;

		};



		gic-its@2c400000 {

			compatible = "arm,gic-v3-its";

			msi-controller;

			#msi-cells = <1>;

			reg = <0x0 0x2c400000 0 0x200000>;

		};

	};

Documentation/devicetree/bindings/arm/idle-states.txt

+1 −1
Original line number Diff line number Diff line
@@ -497,7 +497,7 @@ cpus { 
	};



	idle-states {

		entry-method = "arm,psci";

		entry-method = "psci";



		CPU_RETENTION_0_0: cpu-retention-0-0 {

			compatible = "arm,idle-state";

Documentation/devicetree/bindings/gpio/gpio.txt

+3 −1
Original line number Diff line number Diff line
@@ -16,7 +16,9 @@ properties, each containing a 'gpio-list': 
GPIO properties should be named "[<name>-]gpios", with <name> being the purpose

of this GPIO for the device. While a non-existent <name> is considered valid

for compatibility reasons (resolving to the "gpios" property), it is not allowed

for new bindings.

for new bindings. Also, GPIO properties named "[<name>-]gpio" are valid and old

bindings use it, but are only supported for compatibility reasons and should not

be used for newer bindings since it has been deprecated.



GPIO properties can contain one or more GPIO phandles, but only in exceptional

cases should they contain more than one. If your device uses several GPIOs with