Skip to content

Commit f45d495

Browse files
mdrjrmdrjr
committed
Merge tag 'v4.9.337' of git://git.kernel.org/pub/scm/linux/kernel/git/stable/linux-stable into odroidg12-4.9.y
This is the 4.9.337 stable release
2 parents f8e6d3e + 87a72e8 commit f45d495

File tree

261 files changed

+1298
-559
lines changed

Some content is hidden

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

261 files changed

+1298
-559
lines changed

‎Makefile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
VERSION = 4
22
PATCHLEVEL = 9
3-
SUBLEVEL = 336
3+
SUBLEVEL = 337
44
EXTRAVERSION =
55
NAME = Roaring Lionus
66

‎arch/alpha/kernel/entry.S

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -468,8 +468,10 @@ entSys:
468468
#ifdef CONFIG_AUDITSYSCALL
469469
lda $6, _TIF_SYSCALL_TRACE | _TIF_SYSCALL_AUDIT
470470
and $3, $6, $3
471-
#endif
472471
bne $3, strace
472+
#else
473+
blbs $3, strace /* check for SYSCALL_TRACE in disguise */
474+
#endif
473475
beq $4, 1f
474476
ldq $27, 0($5)
475477
1: jsr $26, ($27), alpha_ni_syscall

‎arch/arm/boot/dts/armada-370.dtsi

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -108,7 +108,7 @@
108108

109109
pcie@2,0 {
110110
device_type = "pci";
111-
assigned-addresses = <0x82002800 0 0x80000 0 0x2000>;
111+
assigned-addresses = <0x82001000 0 0x80000 0 0x2000>;
112112
reg = <0x1000 0 0 0 0>;
113113
#address-cells = <3>;
114114
#size-cells = <2>;

‎arch/arm/boot/dts/armada-375.dtsi

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -618,7 +618,7 @@
618618

619619
pcie@2,0 {
620620
device_type = "pci";
621-
assigned-addresses = <0x82000800 0 0x44000 0 0x2000>;
621+
assigned-addresses = <0x82001000 0 0x44000 0 0x2000>;
622622
reg = <0x1000 0 0 0 0>;
623623
#address-cells = <3>;
624624
#size-cells = <2>;

‎arch/arm/boot/dts/armada-380.dtsi

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -115,7 +115,7 @@
115115
/* x1 port */
116116
pcie@2,0 {
117117
device_type = "pci";
118-
assigned-addresses = <0x82000800 0 0x40000 0 0x2000>;
118+
assigned-addresses = <0x82001000 0 0x40000 0 0x2000>;
119119
reg = <0x1000 0 0 0 0>;
120120
#address-cells = <3>;
121121
#size-cells = <2>;
@@ -133,7 +133,7 @@
133133
/* x1 port */
134134
pcie@3,0 {
135135
device_type = "pci";
136-
assigned-addresses = <0x82000800 0 0x44000 0 0x2000>;
136+
assigned-addresses = <0x82001800 0 0x44000 0 0x2000>;
137137
reg = <0x1800 0 0 0 0>;
138138
#address-cells = <3>;
139139
#size-cells = <2>;

‎arch/arm/boot/dts/armada-385.dtsi

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -126,7 +126,7 @@
126126
/* x1 port */
127127
pcie@2,0 {
128128
device_type = "pci";
129-
assigned-addresses = <0x82000800 0 0x40000 0 0x2000>;
129+
assigned-addresses = <0x82001000 0 0x40000 0 0x2000>;
130130
reg = <0x1000 0 0 0 0>;
131131
#address-cells = <3>;
132132
#size-cells = <2>;
@@ -144,7 +144,7 @@
144144
/* x1 port */
145145
pcie@3,0 {
146146
device_type = "pci";
147-
assigned-addresses = <0x82000800 0 0x44000 0 0x2000>;
147+
assigned-addresses = <0x82001800 0 0x44000 0 0x2000>;
148148
reg = <0x1800 0 0 0 0>;
149149
#address-cells = <3>;
150150
#size-cells = <2>;
@@ -165,7 +165,7 @@
165165
*/
166166
pcie@4,0 {
167167
device_type = "pci";
168-
assigned-addresses = <0x82000800 0 0x48000 0 0x2000>;
168+
assigned-addresses = <0x82002000 0 0x48000 0 0x2000>;
169169
reg = <0x2000 0 0 0 0>;
170170
#address-cells = <3>;
171171
#size-cells = <2>;

‎arch/arm/boot/dts/armada-39x.dtsi

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -492,7 +492,7 @@
492492
/* x1 port */
493493
pcie@2,0 {
494494
device_type = "pci";
495-
assigned-addresses = <0x82000800 0 0x40000 0 0x2000>;
495+
assigned-addresses = <0x82001000 0 0x40000 0 0x2000>;
496496
reg = <0x1000 0 0 0 0>;
497497
#address-cells = <3>;
498498
#size-cells = <2>;
@@ -510,7 +510,7 @@
510510
/* x1 port */
511511
pcie@3,0 {
512512
device_type = "pci";
513-
assigned-addresses = <0x82000800 0 0x44000 0 0x2000>;
513+
assigned-addresses = <0x82001800 0 0x44000 0 0x2000>;
514514
reg = <0x1800 0 0 0 0>;
515515
#address-cells = <3>;
516516
#size-cells = <2>;
@@ -531,7 +531,7 @@
531531
*/
532532
pcie@4,0 {
533533
device_type = "pci";
534-
assigned-addresses = <0x82000800 0 0x48000 0 0x2000>;
534+
assigned-addresses = <0x82002000 0 0x48000 0 0x2000>;
535535
reg = <0x2000 0 0 0 0>;
536536
#address-cells = <3>;
537537
#size-cells = <2>;

‎arch/arm/boot/dts/armada-xp-mv78230.dtsi

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -133,7 +133,7 @@
133133

134134
pcie@2,0 {
135135
device_type = "pci";
136-
assigned-addresses = <0x82000800 0 0x44000 0 0x2000>;
136+
assigned-addresses = <0x82001000 0 0x44000 0 0x2000>;
137137
reg = <0x1000 0 0 0 0>;
138138
#address-cells = <3>;
139139
#size-cells = <2>;
@@ -150,7 +150,7 @@
150150

151151
pcie@3,0 {
152152
device_type = "pci";
153-
assigned-addresses = <0x82000800 0 0x48000 0 0x2000>;
153+
assigned-addresses = <0x82001800 0 0x48000 0 0x2000>;
154154
reg = <0x1800 0 0 0 0>;
155155
#address-cells = <3>;
156156
#size-cells = <2>;
@@ -167,7 +167,7 @@
167167

168168
pcie@4,0 {
169169
device_type = "pci";
170-
assigned-addresses = <0x82000800 0 0x4c000 0 0x2000>;
170+
assigned-addresses = <0x82002000 0 0x4c000 0 0x2000>;
171171
reg = <0x2000 0 0 0 0>;
172172
#address-cells = <3>;
173173
#size-cells = <2>;
@@ -184,7 +184,7 @@
184184

185185
pcie@5,0 {
186186
device_type = "pci";
187-
assigned-addresses = <0x82000800 0 0x80000 0 0x2000>;
187+
assigned-addresses = <0x82002800 0 0x80000 0 0x2000>;
188188
reg = <0x2800 0 0 0 0>;
189189
#address-cells = <3>;
190190
#size-cells = <2>;

‎arch/arm/boot/dts/armada-xp-mv78260.dtsi

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -148,7 +148,7 @@
148148

149149
pcie@2,0 {
150150
device_type = "pci";
151-
assigned-addresses = <0x82000800 0 0x44000 0 0x2000>;
151+
assigned-addresses = <0x82001000 0 0x44000 0 0x2000>;
152152
reg = <0x1000 0 0 0 0>;
153153
#address-cells = <3>;
154154
#size-cells = <2>;
@@ -165,7 +165,7 @@
165165

166166
pcie@3,0 {
167167
device_type = "pci";
168-
assigned-addresses = <0x82000800 0 0x48000 0 0x2000>;
168+
assigned-addresses = <0x82001800 0 0x48000 0 0x2000>;
169169
reg = <0x1800 0 0 0 0>;
170170
#address-cells = <3>;
171171
#size-cells = <2>;
@@ -182,7 +182,7 @@
182182

183183
pcie@4,0 {
184184
device_type = "pci";
185-
assigned-addresses = <0x82000800 0 0x4c000 0 0x2000>;
185+
assigned-addresses = <0x82002000 0 0x4c000 0 0x2000>;
186186
reg = <0x2000 0 0 0 0>;
187187
#address-cells = <3>;
188188
#size-cells = <2>;
@@ -199,7 +199,7 @@
199199

200200
pcie@5,0 {
201201
device_type = "pci";
202-
assigned-addresses = <0x82000800 0 0x80000 0 0x2000>;
202+
assigned-addresses = <0x82002800 0 0x80000 0 0x2000>;
203203
reg = <0x2800 0 0 0 0>;
204204
#address-cells = <3>;
205205
#size-cells = <2>;
@@ -216,7 +216,7 @@
216216

217217
pcie@6,0 {
218218
device_type = "pci";
219-
assigned-addresses = <0x82000800 0 0x84000 0 0x2000>;
219+
assigned-addresses = <0x82003000 0 0x84000 0 0x2000>;
220220
reg = <0x3000 0 0 0 0>;
221221
#address-cells = <3>;
222222
#size-cells = <2>;
@@ -233,7 +233,7 @@
233233

234234
pcie@7,0 {
235235
device_type = "pci";
236-
assigned-addresses = <0x82000800 0 0x88000 0 0x2000>;
236+
assigned-addresses = <0x82003800 0 0x88000 0 0x2000>;
237237
reg = <0x3800 0 0 0 0>;
238238
#address-cells = <3>;
239239
#size-cells = <2>;
@@ -250,7 +250,7 @@
250250

251251
pcie@8,0 {
252252
device_type = "pci";
253-
assigned-addresses = <0x82000800 0 0x8c000 0 0x2000>;
253+
assigned-addresses = <0x82004000 0 0x8c000 0 0x2000>;
254254
reg = <0x4000 0 0 0 0>;
255255
#address-cells = <3>;
256256
#size-cells = <2>;
@@ -267,7 +267,7 @@
267267

268268
pcie@9,0 {
269269
device_type = "pci";
270-
assigned-addresses = <0x82000800 0 0x42000 0 0x2000>;
270+
assigned-addresses = <0x82004800 0 0x42000 0 0x2000>;
271271
reg = <0x4800 0 0 0 0>;
272272
#address-cells = <3>;
273273
#size-cells = <2>;

‎arch/arm/boot/dts/dove.dtsi

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -127,7 +127,7 @@
127127
pcie1: pcie-port@1 {
128128
device_type = "pci";
129129
status = "disabled";
130-
assigned-addresses = <0x82002800 0 0x80000 0 0x2000>;
130+
assigned-addresses = <0x82001000 0 0x80000 0 0x2000>;
131131
reg = <0x1000 0 0 0 0>;
132132
clocks = <&gate_clk 5>;
133133
marvell,pcie-port = <1>;

0 commit comments

Comments
 (0)