Skip to content

Commit 917a913

Browse files
brooniebroonie
committed
Merge remote-tracking branch 'lsk/linux-linaro-lsk-v4.4' into linux-linaro-lsk-v4.4
2 parents ddbcfcb + 6d0b88c commit 917a913

65 files changed

Lines changed: 466 additions & 164 deletions

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

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

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -23,6 +23,7 @@ Optional properties:
2323
during suspend.
2424
- ti,no-reset-on-init: When present, the module should not be reset at init
2525
- ti,no-idle-on-init: When present, the module should not be idled at init
26+
- ti,no-idle: When present, the module is never allowed to idle.
2627

2728
Example:
2829

‎Documentation/virtual/kvm/mmu.txt‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -358,7 +358,8 @@ In the first case there are two additional complications:
358358
- if CR4.SMEP is enabled: since we've turned the page into a kernel page,
359359
the kernel may now execute it. We handle this by also setting spte.nx.
360360
If we get a user fetch or read fault, we'll change spte.u=1 and
361-
spte.nx=gpte.nx back.
361+
spte.nx=gpte.nx back. For this to work, KVM forces EFER.NX to 1 when
362+
shadow paging is in use.
362363
- if CR4.SMAP is disabled: since the page has been changed to a kernel
363364
page, it can not be reused when CR4.SMAP is enabled. We set
364365
CR4.SMAP && !CR0.WP into shadow page's role to avoid this case. Note,

‎Makefile‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
VERSION = 4
22
PATCHLEVEL = 4
3-
SUBLEVEL = 5
3+
SUBLEVEL = 6
44
EXTRAVERSION =
55
NAME = Blurry Fish Butt
66

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -70,8 +70,8 @@
7070
soc {
7171
ranges = <MBUS_ID(0xf0, 0x01) 0 0 0xf1000000 0x100000
7272
MBUS_ID(0x01, 0x1d) 0 0 0xfff00000 0x100000
73-
MBUS_ID(0x09, 0x09) 0 0 0xf8100000 0x10000
74-
MBUS_ID(0x09, 0x05) 0 0 0xf8110000 0x10000>;
73+
MBUS_ID(0x09, 0x09) 0 0 0xf1100000 0x10000
74+
MBUS_ID(0x09, 0x05) 0 0 0xf1110000 0x10000>;
7575

7676
pcie-controller {
7777
status = "okay";

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -76,8 +76,8 @@
7676
ranges = <MBUS_ID(0xf0, 0x01) 0 0 0xf1000000 0x100000
7777
MBUS_ID(0x01, 0x1d) 0 0 0xfff00000 0x100000
7878
MBUS_ID(0x01, 0x2f) 0 0 0xf0000000 0x1000000
79-
MBUS_ID(0x09, 0x09) 0 0 0xf8100000 0x10000
80-
MBUS_ID(0x09, 0x05) 0 0 0xf8110000 0x10000>;
79+
MBUS_ID(0x09, 0x09) 0 0 0xf1100000 0x10000
80+
MBUS_ID(0x09, 0x05) 0 0 0xf1110000 0x10000>;
8181

8282
devbus-bootcs {
8383
status = "okay";

‎arch/arm/boot/dts/armada-xp-gp.dts‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -95,8 +95,8 @@
9595
ranges = <MBUS_ID(0xf0, 0x01) 0 0 0xf1000000 0x100000
9696
MBUS_ID(0x01, 0x1d) 0 0 0xfff00000 0x100000
9797
MBUS_ID(0x01, 0x2f) 0 0 0xf0000000 0x1000000
98-
MBUS_ID(0x09, 0x09) 0 0 0xf8100000 0x10000
99-
MBUS_ID(0x09, 0x05) 0 0 0xf8110000 0x10000>;
98+
MBUS_ID(0x09, 0x09) 0 0 0xf1100000 0x10000
99+
MBUS_ID(0x09, 0x05) 0 0 0xf1110000 0x10000>;
100100

101101
devbus-bootcs {
102102
status = "okay";

‎arch/arm/boot/dts/armada-xp-lenovo-ix4-300d.dts‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -65,8 +65,8 @@
6565
soc {
6666
ranges = <MBUS_ID(0xf0, 0x01) 0 0 0xd0000000 0x100000
6767
MBUS_ID(0x01, 0x1d) 0 0 0xfff00000 0x100000
68-
MBUS_ID(0x09, 0x09) 0 0 0xf8100000 0x10000
69-
MBUS_ID(0x09, 0x05) 0 0 0xf8110000 0x10000>;
68+
MBUS_ID(0x09, 0x09) 0 0 0xf1100000 0x10000
69+
MBUS_ID(0x09, 0x05) 0 0 0xf1110000 0x10000>;
7070

7171
pcie-controller {
7272
status = "okay";

‎arch/arm/boot/dts/armada-xp-linksys-mamba.dts‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -70,8 +70,8 @@
7070
soc {
7171
ranges = <MBUS_ID(0xf0, 0x01) 0 0 0xf1000000 0x100000
7272
MBUS_ID(0x01, 0x1d) 0 0 0xfff00000 0x100000
73-
MBUS_ID(0x09, 0x09) 0 0 0xf8100000 0x10000
74-
MBUS_ID(0x09, 0x05) 0 0 0xf8110000 0x10000>;
73+
MBUS_ID(0x09, 0x09) 0 0 0xf1100000 0x10000
74+
MBUS_ID(0x09, 0x05) 0 0 0xf1110000 0x10000>;
7575

7676
pcie-controller {
7777
status = "okay";

‎arch/arm/boot/dts/armada-xp-matrix.dts‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -68,8 +68,8 @@
6868
soc {
6969
ranges = <MBUS_ID(0xf0, 0x01) 0 0 0xf1000000 0x100000
7070
MBUS_ID(0x01, 0x1d) 0 0 0xfff00000 0x100000
71-
MBUS_ID(0x09, 0x09) 0 0 0xf8100000 0x10000
72-
MBUS_ID(0x09, 0x05) 0 0 0xf8110000 0x10000>;
71+
MBUS_ID(0x09, 0x09) 0 0 0xf1100000 0x10000
72+
MBUS_ID(0x09, 0x05) 0 0 0xf1110000 0x10000>;
7373

7474
internal-regs {
7575
serial@12000 {

‎arch/arm/boot/dts/armada-xp-netgear-rn2120.dts‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -64,8 +64,8 @@
6464
soc {
6565
ranges = <MBUS_ID(0xf0, 0x01) 0 0 0xd0000000 0x100000
6666
MBUS_ID(0x01, 0x1d) 0 0 0xfff00000 0x100000
67-
MBUS_ID(0x09, 0x09) 0 0 0xf8100000 0x10000
68-
MBUS_ID(0x09, 0x05) 0 0 0xf8110000 0x10000>;
67+
MBUS_ID(0x09, 0x09) 0 0 0xf1100000 0x10000
68+
MBUS_ID(0x09, 0x05) 0 0 0xf1110000 0x10000>;
6969

7070
pcie-controller {
7171
status = "okay";

0 commit comments

Comments
 (0)