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

Commit 061f817e authored by Ingo Molnar's avatar Ingo Molnar
Browse files

Merge tag 'v4.5-rc4' into ras/core, to pick up fixes 



Signed-off-by: default avatarIngo Molnar <mingo@kernel.org>
parents e6c8f187 18558cae

Documentation/cgroup-v2.txt

+5 −1
Original line number Original line Diff line number Diff line
@@ -7,7 +7,7 @@ This is the authoritative documentation on the design, interface and 
conventions of cgroup v2.  It describes all userland-visible aspects

conventions of cgroup v2.  It describes all userland-visible aspects

of cgroup including core and specific controller behaviors.  All

of cgroup including core and specific controller behaviors.  All

future changes must be reflected in this document.  Documentation for

future changes must be reflected in this document.  Documentation for

v1 is available under Documentation/cgroup-legacy/.

v1 is available under Documentation/cgroup-v1/.





CONTENTS

CONTENTS
@@ -843,6 +843,10 @@ PAGE_SIZE multiple when read back. 
		Amount of memory used to cache filesystem data,

		Amount of memory used to cache filesystem data,

		including tmpfs and shared memory.

		including tmpfs and shared memory.





	  sock



		Amount of memory used in network transmission buffers



	  file_mapped

	  file_mapped





		Amount of cached filesystem data mapped with mmap()

		Amount of cached filesystem data mapped with mmap()

Documentation/devicetree/bindings/net/brcm,bcmgenet.txt

+2 −2
Original line number Original line Diff line number Diff line
@@ -68,7 +68,7 @@ ethernet@f0b60000 { 
		phy1: ethernet-phy@1 {

		phy1: ethernet-phy@1 {

			max-speed = <1000>;

			max-speed = <1000>;

			reg = <0x1>;

			reg = <0x1>;

			compatible = "brcm,28nm-gphy", "ethernet-phy-ieee802.3-c22";

			compatible = "ethernet-phy-ieee802.3-c22";

		};

		};

	};

	};

};

};
@@ -115,7 +115,7 @@ ethernet@f0ba0000 { 
		phy0: ethernet-phy@0 {

		phy0: ethernet-phy@0 {

			max-speed = <1000>;

			max-speed = <1000>;

			reg = <0x0>;

			reg = <0x0>;

			compatible = "brcm,bcm53125", "ethernet-phy-ieee802.3-c22";

			compatible = "ethernet-phy-ieee802.3-c22";

		};

		};

	};

	};

};
 
};

Documentation/devicetree/bindings/net/hisilicon-hns-dsaf.txt

+1 −4
Original line number Original line Diff line number Diff line
@@ -4,8 +4,6 @@ Required properties: 
- compatible: should be "hisilicon,hns-dsaf-v1" or "hisilicon,hns-dsaf-v2".

- compatible: should be "hisilicon,hns-dsaf-v1" or "hisilicon,hns-dsaf-v2".

  "hisilicon,hns-dsaf-v1" is for hip05.

  "hisilicon,hns-dsaf-v1" is for hip05.

  "hisilicon,hns-dsaf-v2" is for Hi1610 and Hi1612.

  "hisilicon,hns-dsaf-v2" is for Hi1610 and Hi1612.

- dsa-name: dsa fabric name who provide this interface.

  should be "dsafX", X is the dsaf id.

- mode: dsa fabric mode string. only support one of dsaf modes like these:

- mode: dsa fabric mode string. only support one of dsaf modes like these:

		"2port-64vf",

		"2port-64vf",

		"6port-16rss",

		"6port-16rss",
@@ -26,9 +24,8 @@ Required properties: 




Example:

Example:





dsa: dsa@c7000000 {

dsaf0: dsa@c7000000 {

	compatible = "hisilicon,hns-dsaf-v1";

	compatible = "hisilicon,hns-dsaf-v1";

	dsa_name = "dsaf0";

	mode = "6port-16rss";

	mode = "6port-16rss";

	interrupt-parent = <&mbigen_dsa>;

	interrupt-parent = <&mbigen_dsa>;

	reg = <0x0 0xC0000000 0x0 0x420000

	reg = <0x0 0xC0000000 0x0 0x420000

Documentation/devicetree/bindings/net/hisilicon-hns-nic.txt

+4 −3
Original line number Original line Diff line number Diff line
@@ -4,8 +4,9 @@ Required properties: 
- compatible: "hisilicon,hns-nic-v1" or "hisilicon,hns-nic-v2".

- compatible: "hisilicon,hns-nic-v1" or "hisilicon,hns-nic-v2".

  "hisilicon,hns-nic-v1" is for hip05.

  "hisilicon,hns-nic-v1" is for hip05.

  "hisilicon,hns-nic-v2" is for Hi1610 and Hi1612.

  "hisilicon,hns-nic-v2" is for Hi1610 and Hi1612.

- ae-name: accelerator name who provides this interface,

- ae-handle: accelerator engine handle for hns,

  is simply a name referring to the name of name in the accelerator node.

  specifies a reference to the associating hardware driver node.

  see Documentation/devicetree/bindings/net/hisilicon-hns-dsaf.txt

- port-id: is the index of port provided by DSAF (the accelerator). DSAF can

- port-id: is the index of port provided by DSAF (the accelerator). DSAF can

  connect to 8 PHYs. Port 0 to 1 are both used for adminstration purpose. They

  connect to 8 PHYs. Port 0 to 1 are both used for adminstration purpose. They

  are called debug ports.

  are called debug ports.
@@ -41,7 +42,7 @@ Example: 




	ethernet@0{

	ethernet@0{

		compatible = "hisilicon,hns-nic-v1";

		compatible = "hisilicon,hns-nic-v1";

		ae-name = "dsaf0";

		ae-handle = <&dsaf0>;

		port-id = <0>;

		port-id = <0>;

		local-mac-address = [a2 14 e4 4b 56 76];

		local-mac-address = [a2 14 e4 4b 56 76];

	};
 
	};

Documentation/devicetree/bindings/net/marvell-armada-370-neta.txt

+6 −1
Original line number Original line Diff line number Diff line
@@ -6,12 +6,17 @@ Required properties: 
- interrupts: interrupt for the device

- interrupts: interrupt for the device

- phy: See ethernet.txt file in the same directory.

- phy: See ethernet.txt file in the same directory.

- phy-mode: See ethernet.txt file in the same directory

- phy-mode: See ethernet.txt file in the same directory

- clocks: a pointer to the reference clock for this device.

- clocks: List of clocks for this device. At least one clock is

  mandatory for the core clock. If several clocks are given, then the

  clock-names property must be used to identify them.





Optional properties:

Optional properties:

- tx-csum-limit: maximum mtu supported by port that allow TX checksum.

- tx-csum-limit: maximum mtu supported by port that allow TX checksum.

  Value is presented in bytes. If not used, by default 1600B is set for

  Value is presented in bytes. If not used, by default 1600B is set for

  "marvell,armada-370-neta" and 9800B for others.

  "marvell,armada-370-neta" and 9800B for others.

- clock-names: List of names corresponding to clocks property; shall be

  "core" for core clock and "bus" for the optional bus clock.







Example:

Example: