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

Commit 917a9133 authored by Mark Brown's avatar Mark Brown
Browse files

Merge remote-tracking branch 'lsk/linux-linaro-lsk-v4.4' into linux-linaro-lsk-v4.4

parents ddbcfcba 6d0b88c8

Documentation/devicetree/bindings/arm/omap/omap.txt

+1 −0
Original line number Diff line number Diff line
@@ -23,6 +23,7 @@ Optional properties: 
  during suspend.

- ti,no-reset-on-init: When present, the module should not be reset at init

- ti,no-idle-on-init: When present, the module should not be idled at init

- ti,no-idle: When present, the module is never allowed to idle.



Example:

Documentation/virtual/kvm/mmu.txt

+2 −1
Original line number Diff line number Diff line
@@ -358,7 +358,8 @@ In the first case there are two additional complications: 
- if CR4.SMEP is enabled: since we've turned the page into a kernel page,

  the kernel may now execute it.  We handle this by also setting spte.nx.

  If we get a user fetch or read fault, we'll change spte.u=1 and

  spte.nx=gpte.nx back.

  spte.nx=gpte.nx back.  For this to work, KVM forces EFER.NX to 1 when

  shadow paging is in use.

- if CR4.SMAP is disabled: since the page has been changed to a kernel

  page, it can not be reused when CR4.SMAP is enabled. We set

  CR4.SMAP && !CR0.WP into shadow page's role to avoid this case. Note,

Makefile

+1 −1
Original line number Diff line number Diff line 
VERSION = 4

PATCHLEVEL = 4

SUBLEVEL = 5

SUBLEVEL = 6

EXTRAVERSION =

NAME = Blurry Fish Butt

arch/arm/boot/dts/armada-xp-axpwifiap.dts

+2 −2
Original line number Diff line number Diff line
@@ -70,8 +70,8 @@ 
	soc {

		ranges = <MBUS_ID(0xf0, 0x01) 0 0 0xf1000000 0x100000

			  MBUS_ID(0x01, 0x1d) 0 0 0xfff00000 0x100000

			  MBUS_ID(0x09, 0x09) 0 0 0xf8100000 0x10000

			  MBUS_ID(0x09, 0x05) 0 0 0xf8110000 0x10000>;

			  MBUS_ID(0x09, 0x09) 0 0 0xf1100000 0x10000

			  MBUS_ID(0x09, 0x05) 0 0 0xf1110000 0x10000>;



		pcie-controller {

			status = "okay";

arch/arm/boot/dts/armada-xp-db.dts

+2 −2
Original line number Diff line number Diff line
@@ -76,8 +76,8 @@ 
		ranges = <MBUS_ID(0xf0, 0x01) 0 0 0xf1000000 0x100000

			  MBUS_ID(0x01, 0x1d) 0 0 0xfff00000 0x100000

			  MBUS_ID(0x01, 0x2f) 0 0 0xf0000000 0x1000000

			  MBUS_ID(0x09, 0x09) 0 0 0xf8100000 0x10000

			  MBUS_ID(0x09, 0x05) 0 0 0xf8110000 0x10000>;

			  MBUS_ID(0x09, 0x09) 0 0 0xf1100000 0x10000

			  MBUS_ID(0x09, 0x05) 0 0 0xf1110000 0x10000>;



		devbus-bootcs {

			status = "okay";