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

Commit c0cc5316 authored by David S. Miller's avatar David S. Miller
Browse files

Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net 



Minor overlapping changes in the conflicts.

In the macsec case, the change of the default ID macro
name overlapped with the 64-bit netlink attribute alignment
fixes in net-next.

Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parents 8c14586f f28f20da

Documentation/devicetree/bindings/arm/cpus.txt

+0 −1
Original line number Diff line number Diff line
@@ -192,7 +192,6 @@ nodes to be present and contain the properties described below. 
			  can be one of:

			    "allwinner,sun6i-a31"

			    "allwinner,sun8i-a23"

			    "arm,psci"

			    "arm,realview-smp"

			    "brcm,bcm-nsp-smp"

			    "brcm,brahma-b15"

Documentation/devicetree/bindings/phy/rockchip-dp-phy.txt

+11 −7
Original line number Diff line number Diff line
@@ -8,15 +8,19 @@ Required properties: 
	of memory mapped region.

- clock-names: from common clock binding:

	Required elements: "24m"

- rockchip,grf: phandle to the syscon managing the "general register files"

- #phy-cells : from the generic PHY bindings, must be 0;



Example:



grf: syscon@ff770000 {

	compatible = "rockchip,rk3288-grf", "syscon", "simple-mfd";



...



	edp_phy: edp-phy {

		compatible = "rockchip,rk3288-dp-phy";

	rockchip,grf = <&grf>;

		clocks = <&cru SCLK_EDP_24M>;

		clock-names = "24m";

		#phy-cells = <0>;

	};

};

Documentation/devicetree/bindings/phy/rockchip-emmc-phy.txt

+14 −8
Original line number Diff line number Diff line
@@ -3,17 +3,23 @@ Rockchip EMMC PHY 


Required properties:

 - compatible: rockchip,rk3399-emmc-phy

 - rockchip,grf : phandle to the syscon managing the "general

   register files"

 - #phy-cells: must be 0

 - reg: PHY configure reg address offset in "general

 - reg: PHY register address offset and length in "general

   register files"



Example:



emmcphy: phy {



grf: syscon@ff770000 {

	compatible = "rockchip,rk3399-grf", "syscon", "simple-mfd";

	#address-cells = <1>;

	#size-cells = <1>;



...



	emmcphy: phy@f780 {

		compatible = "rockchip,rk3399-emmc-phy";

	rockchip,grf = <&grf>;

	reg = <0xf780>;

		reg = <0xf780 0x20>;

		#phy-cells = <0>;

	};

};

Documentation/input/event-codes.txt

+4 −0
Original line number Diff line number Diff line
@@ -173,6 +173,10 @@ A few EV_ABS codes have special meanings: 
    proximity of the device and while the value of the BTN_TOUCH code is 0. If

    the input device may be used freely in three dimensions, consider ABS_Z

    instead.

  - BTN_TOOL_<name> should be set to 1 when the tool comes into detectable

    proximity and set to 0 when the tool leaves detectable proximity.

    BTN_TOOL_<name> signals the type of tool that is currently detected by the

    hardware and is otherwise independent of ABS_DISTANCE and/or BTN_TOUCH.



* ABS_MT_<name>:

  - Used to describe multitouch input events. Please see

Documentation/x86/x86_64/mm.txt

+3 −3
Original line number Diff line number Diff line
@@ -19,7 +19,7 @@ ffffff0000000000 - ffffff7fffffffff (=39 bits) %esp fixup stacks 
ffffffef00000000 - ffffffff00000000 (=64 GB) EFI region mapping space

... unused hole ...

ffffffff80000000 - ffffffffa0000000 (=512 MB)  kernel text mapping, from phys 0

ffffffffa0000000 - ffffffffff5fffff (=1525 MB) module mapping space

ffffffffa0000000 - ffffffffff5fffff (=1526 MB) module mapping space

ffffffffff600000 - ffffffffffdfffff (=8 MB) vsyscalls

ffffffffffe00000 - ffffffffffffffff (=2 MB) unused hole
@@ -31,8 +31,8 @@ vmalloc space is lazily synchronized into the different PML4 pages of 
the processes using the page fault handler, with init_level4_pgt as

reference.



Current X86-64 implementations only support 40 bits of address space,

but we support up to 46 bits. This expands into MBZ space in the page tables.

Current X86-64 implementations support up to 46 bits of address space (64 TB),

which is our current limit. This expands into MBZ space in the page tables.



We map EFI runtime services in the 'efi_pgd' PGD in a 64Gb large virtual

memory window (this size is arbitrary, it can be raised later if needed).