Skip to content
This repository was archived by the owner on Apr 18, 2024. It is now read-only.

Commit 20e3d8e

Browse files
matttbematttbe
committed
Merge tag 'v4.14.304' into mptcp_v0.94
This is the 4.14.304 stable release Signed-off-by: Matthieu Baerts <[email protected]> # gpg: Signature made Tue Jan 24 06:05:35 2023 UTC # gpg: using RSA key 647F28654894E3BD457199BE38DBBDC86092693E # gpg: Note: trustdb not writable # gpg: Good signature from "Greg Kroah-Hartman <[email protected]>" [unknown] # gpg: aka "Greg Kroah-Hartman <[email protected]>" [unknown] # gpg: aka "Greg Kroah-Hartman (Linux kernel stable release signing key) <[email protected]>" [unknown] # gpg: WARNING: This key is not certified with a trusted signature! # gpg: There is no indication that the signature belongs to the owner. # Primary key fingerprint: 647F 2865 4894 E3BD 4571 99BE 38DB BDC8 6092 693E
2 parents 73ff6b6 + 3949d16 commit 20e3d8e

File tree

364 files changed

+2009
-830
lines changed

Some content is hidden

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

364 files changed

+2009
-830
lines changed

‎Documentation/driver-api/spi.rst

+2-2
Original file line numberDiff line numberDiff line change
@@ -25,8 +25,8 @@ hardware, which may be as simple as a set of GPIO pins or as complex as
2525
a pair of FIFOs connected to dual DMA engines on the other side of the
2626
SPI shift register (maximizing throughput). Such drivers bridge between
2727
whatever bus they sit on (often the platform bus) and SPI, and expose
28-
the SPI side of their device as a :c:type:`struct spi_master
29-
<spi_master>`. SPI devices are children of that master,
28+
the SPI side of their device as a :c:type:`struct spi_controller
29+
<spi_controller>`. SPI devices are children of that master,
3030
represented as a :c:type:`struct spi_device <spi_device>` and
3131
manufactured from :c:type:`struct spi_board_info
3232
<spi_board_info>` descriptors which are usually provided by

‎Documentation/sphinx/load_config.py

+4-2
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33

44
import os
55
import sys
6-
from sphinx.util.pycompat import execfile_
6+
from sphinx.util.osutil import fs_encoding
77

88
# ------------------------------------------------------------------------------
99
def loadConfig(namespace):
@@ -25,7 +25,9 @@ def loadConfig(namespace):
2525
sys.stdout.write("load additional sphinx-config: %s\n" % config_file)
2626
config = namespace.copy()
2727
config['__file__'] = config_file
28-
execfile_(config_file, config)
28+
with open(config_file, 'rb') as f:
29+
code = compile(f.read(), fs_encoding, 'exec')
30+
exec(code, config)
2931
del config['__file__']
3032
namespace.update(config)
3133
else:

‎Makefile

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
# SPDX-License-Identifier: GPL-2.0
22
VERSION = 4
33
PATCHLEVEL = 14
4-
SUBLEVEL = 302
4+
SUBLEVEL = 304
55
EXTRAVERSION =
66
NAME = Petit Gorille
77

‎arch/alpha/kernel/entry.S

+3-1
Original file line numberDiff line numberDiff line change
@@ -469,8 +469,10 @@ entSys:
469469
#ifdef CONFIG_AUDITSYSCALL
470470
lda $6, _TIF_SYSCALL_TRACE | _TIF_SYSCALL_AUDIT
471471
and $3, $6, $3
472-
#endif
473472
bne $3, strace
473+
#else
474+
blbs $3, strace /* check for SYSCALL_TRACE in disguise */
475+
#endif
474476
beq $4, 1f
475477
ldq $27, 0($5)
476478
1: jsr $26, ($27), alpha_ni_syscall

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

+1-1
Original file line numberDiff line numberDiff line change
@@ -111,7 +111,7 @@
111111

112112
pcie2: pcie@2,0 {
113113
device_type = "pci";
114-
assigned-addresses = <0x82002800 0 0x80000 0 0x2000>;
114+
assigned-addresses = <0x82001000 0 0x80000 0 0x2000>;
115115
reg = <0x1000 0 0 0 0>;
116116
#address-cells = <3>;
117117
#size-cells = <2>;

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

+1-1
Original file line numberDiff line numberDiff line change
@@ -621,7 +621,7 @@
621621

622622
pcie1: pcie@2,0 {
623623
device_type = "pci";
624-
assigned-addresses = <0x82000800 0 0x44000 0 0x2000>;
624+
assigned-addresses = <0x82001000 0 0x44000 0 0x2000>;
625625
reg = <0x1000 0 0 0 0>;
626626
#address-cells = <3>;
627627
#size-cells = <2>;

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

+2-2
Original file line numberDiff line numberDiff line change
@@ -116,7 +116,7 @@
116116
/* x1 port */
117117
pcie@2,0 {
118118
device_type = "pci";
119-
assigned-addresses = <0x82000800 0 0x40000 0 0x2000>;
119+
assigned-addresses = <0x82001000 0 0x40000 0 0x2000>;
120120
reg = <0x1000 0 0 0 0>;
121121
#address-cells = <3>;
122122
#size-cells = <2>;
@@ -135,7 +135,7 @@
135135
/* x1 port */
136136
pcie@3,0 {
137137
device_type = "pci";
138-
assigned-addresses = <0x82000800 0 0x44000 0 0x2000>;
138+
assigned-addresses = <0x82001800 0 0x44000 0 0x2000>;
139139
reg = <0x1800 0 0 0 0>;
140140
#address-cells = <3>;
141141
#size-cells = <2>;

‎arch/arm/boot/dts/armada-385-turris-omnia.dts

+17-1
Original file line numberDiff line numberDiff line change
@@ -55,6 +55,12 @@
5555
stdout-path = &uart0;
5656
};
5757

58+
aliases {
59+
ethernet0 = &eth0;
60+
ethernet1 = &eth1;
61+
ethernet2 = &eth2;
62+
};
63+
5864
memory {
5965
device_type = "memory";
6066
reg = <0x00000000 0x40000000>; /* 1024 MB */
@@ -324,7 +330,17 @@
324330
};
325331
};
326332

327-
/* port 6 is connected to eth0 */
333+
ports@6 {
334+
reg = <6>;
335+
label = "cpu";
336+
ethernet = <&eth0>;
337+
phy-mode = "rgmii-id";
338+
339+
fixed-link {
340+
speed = <1000>;
341+
full-duplex;
342+
};
343+
};
328344
};
329345
};
330346
};

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

+3-3
Original file line numberDiff line numberDiff line change
@@ -121,7 +121,7 @@
121121
/* x1 port */
122122
pcie2: pcie@2,0 {
123123
device_type = "pci";
124-
assigned-addresses = <0x82000800 0 0x40000 0 0x2000>;
124+
assigned-addresses = <0x82001000 0 0x40000 0 0x2000>;
125125
reg = <0x1000 0 0 0 0>;
126126
#address-cells = <3>;
127127
#size-cells = <2>;
@@ -140,7 +140,7 @@
140140
/* x1 port */
141141
pcie3: pcie@3,0 {
142142
device_type = "pci";
143-
assigned-addresses = <0x82000800 0 0x44000 0 0x2000>;
143+
assigned-addresses = <0x82001800 0 0x44000 0 0x2000>;
144144
reg = <0x1800 0 0 0 0>;
145145
#address-cells = <3>;
146146
#size-cells = <2>;
@@ -162,7 +162,7 @@
162162
*/
163163
pcie4: pcie@4,0 {
164164
device_type = "pci";
165-
assigned-addresses = <0x82000800 0 0x48000 0 0x2000>;
165+
assigned-addresses = <0x82002000 0 0x48000 0 0x2000>;
166166
reg = <0x2000 0 0 0 0>;
167167
#address-cells = <3>;
168168
#size-cells = <2>;

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

+3-3
Original file line numberDiff line numberDiff line change
@@ -493,7 +493,7 @@
493493
/* x1 port */
494494
pcie@2,0 {
495495
device_type = "pci";
496-
assigned-addresses = <0x82000800 0 0x40000 0 0x2000>;
496+
assigned-addresses = <0x82001000 0 0x40000 0 0x2000>;
497497
reg = <0x1000 0 0 0 0>;
498498
#address-cells = <3>;
499499
#size-cells = <2>;
@@ -512,7 +512,7 @@
512512
/* x1 port */
513513
pcie@3,0 {
514514
device_type = "pci";
515-
assigned-addresses = <0x82000800 0 0x44000 0 0x2000>;
515+
assigned-addresses = <0x82001800 0 0x44000 0 0x2000>;
516516
reg = <0x1800 0 0 0 0>;
517517
#address-cells = <3>;
518518
#size-cells = <2>;
@@ -534,7 +534,7 @@
534534
*/
535535
pcie@4,0 {
536536
device_type = "pci";
537-
assigned-addresses = <0x82000800 0 0x48000 0 0x2000>;
537+
assigned-addresses = <0x82002000 0 0x48000 0 0x2000>;
538538
reg = <0x2000 0 0 0 0>;
539539
#address-cells = <3>;
540540
#size-cells = <2>;

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

+4-4
Original file line numberDiff line numberDiff line change
@@ -134,7 +134,7 @@
134134

135135
pcie2: pcie@2,0 {
136136
device_type = "pci";
137-
assigned-addresses = <0x82000800 0 0x44000 0 0x2000>;
137+
assigned-addresses = <0x82001000 0 0x44000 0 0x2000>;
138138
reg = <0x1000 0 0 0 0>;
139139
#address-cells = <3>;
140140
#size-cells = <2>;
@@ -152,7 +152,7 @@
152152

153153
pcie3: pcie@3,0 {
154154
device_type = "pci";
155-
assigned-addresses = <0x82000800 0 0x48000 0 0x2000>;
155+
assigned-addresses = <0x82001800 0 0x48000 0 0x2000>;
156156
reg = <0x1800 0 0 0 0>;
157157
#address-cells = <3>;
158158
#size-cells = <2>;
@@ -170,7 +170,7 @@
170170

171171
pcie4: pcie@4,0 {
172172
device_type = "pci";
173-
assigned-addresses = <0x82000800 0 0x4c000 0 0x2000>;
173+
assigned-addresses = <0x82002000 0 0x4c000 0 0x2000>;
174174
reg = <0x2000 0 0 0 0>;
175175
#address-cells = <3>;
176176
#size-cells = <2>;
@@ -188,7 +188,7 @@
188188

189189
pcie5: pcie@5,0 {
190190
device_type = "pci";
191-
assigned-addresses = <0x82000800 0 0x80000 0 0x2000>;
191+
assigned-addresses = <0x82002800 0 0x80000 0 0x2000>;
192192
reg = <0x2800 0 0 0 0>;
193193
#address-cells = <3>;
194194
#size-cells = <2>;

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

+8-8
Original file line numberDiff line numberDiff line change
@@ -149,7 +149,7 @@
149149

150150
pcie2: pcie@2,0 {
151151
device_type = "pci";
152-
assigned-addresses = <0x82000800 0 0x44000 0 0x2000>;
152+
assigned-addresses = <0x82001000 0 0x44000 0 0x2000>;
153153
reg = <0x1000 0 0 0 0>;
154154
#address-cells = <3>;
155155
#size-cells = <2>;
@@ -167,7 +167,7 @@
167167

168168
pcie3: pcie@3,0 {
169169
device_type = "pci";
170-
assigned-addresses = <0x82000800 0 0x48000 0 0x2000>;
170+
assigned-addresses = <0x82001800 0 0x48000 0 0x2000>;
171171
reg = <0x1800 0 0 0 0>;
172172
#address-cells = <3>;
173173
#size-cells = <2>;
@@ -185,7 +185,7 @@
185185

186186
pcie4: pcie@4,0 {
187187
device_type = "pci";
188-
assigned-addresses = <0x82000800 0 0x4c000 0 0x2000>;
188+
assigned-addresses = <0x82002000 0 0x4c000 0 0x2000>;
189189
reg = <0x2000 0 0 0 0>;
190190
#address-cells = <3>;
191191
#size-cells = <2>;
@@ -203,7 +203,7 @@
203203

204204
pcie5: pcie@5,0 {
205205
device_type = "pci";
206-
assigned-addresses = <0x82000800 0 0x80000 0 0x2000>;
206+
assigned-addresses = <0x82002800 0 0x80000 0 0x2000>;
207207
reg = <0x2800 0 0 0 0>;
208208
#address-cells = <3>;
209209
#size-cells = <2>;
@@ -221,7 +221,7 @@
221221

222222
pcie6: pcie@6,0 {
223223
device_type = "pci";
224-
assigned-addresses = <0x82000800 0 0x84000 0 0x2000>;
224+
assigned-addresses = <0x82003000 0 0x84000 0 0x2000>;
225225
reg = <0x3000 0 0 0 0>;
226226
#address-cells = <3>;
227227
#size-cells = <2>;
@@ -239,7 +239,7 @@
239239

240240
pcie7: pcie@7,0 {
241241
device_type = "pci";
242-
assigned-addresses = <0x82000800 0 0x88000 0 0x2000>;
242+
assigned-addresses = <0x82003800 0 0x88000 0 0x2000>;
243243
reg = <0x3800 0 0 0 0>;
244244
#address-cells = <3>;
245245
#size-cells = <2>;
@@ -257,7 +257,7 @@
257257

258258
pcie8: pcie@8,0 {
259259
device_type = "pci";
260-
assigned-addresses = <0x82000800 0 0x8c000 0 0x2000>;
260+
assigned-addresses = <0x82004000 0 0x8c000 0 0x2000>;
261261
reg = <0x4000 0 0 0 0>;
262262
#address-cells = <3>;
263263
#size-cells = <2>;
@@ -275,7 +275,7 @@
275275

276276
pcie9: pcie@9,0 {
277277
device_type = "pci";
278-
assigned-addresses = <0x82000800 0 0x42000 0 0x2000>;
278+
assigned-addresses = <0x82004800 0 0x42000 0 0x2000>;
279279
reg = <0x4800 0 0 0 0>;
280280
#address-cells = <3>;
281281
#size-cells = <2>;

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

+1-1
Original file line numberDiff line numberDiff line change
@@ -129,7 +129,7 @@
129129
pcie1: pcie@2 {
130130
device_type = "pci";
131131
status = "disabled";
132-
assigned-addresses = <0x82002800 0 0x80000 0 0x2000>;
132+
assigned-addresses = <0x82001000 0 0x80000 0 0x2000>;
133133
reg = <0x1000 0 0 0 0>;
134134
clocks = <&gate_clk 5>;
135135
marvell,pcie-port = <1>;

‎arch/arm/boot/dts/qcom-apq8064.dtsi

+1-1
Original file line numberDiff line numberDiff line change
@@ -1534,7 +1534,7 @@
15341534
};
15351535

15361536
etb@1a01000 {
1537-
compatible = "coresight-etb10", "arm,primecell";
1537+
compatible = "arm,coresight-etb10", "arm,primecell";
15381538
reg = <0x1a01000 0x1000>;
15391539

15401540
clocks = <&rpmcc RPM_QDSS_CLK>;

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

+1-1
Original file line numberDiff line numberDiff line change
@@ -53,7 +53,7 @@
5353
compatible = "arm,pl110", "arm,primecell";
5454
reg = <0xfc200000 0x1000>;
5555
interrupt-parent = <&vic1>;
56-
interrupts = <12>;
56+
interrupts = <13>;
5757
status = "disabled";
5858
};
5959

‎arch/arm/mach-mmp/time.c

+7-4
Original file line numberDiff line numberDiff line change
@@ -52,18 +52,21 @@
5252
static void __iomem *mmp_timer_base = TIMERS_VIRT_BASE;
5353

5454
/*
55-
* FIXME: the timer needs some delay to stablize the counter capture
55+
* Read the timer through the CVWR register. Delay is required after requesting
56+
* a read. The CR register cannot be directly read due to metastability issues
57+
* documented in the PXA168 software manual.
5658
*/
5759
static inline uint32_t timer_read(void)
5860
{
59-
int delay = 100;
61+
uint32_t val;
62+
int delay = 3;
6063

6164
__raw_writel(1, mmp_timer_base + TMR_CVWR(1));
6265

6366
while (delay--)
64-
cpu_relax();
67+
val = __raw_readl(mmp_timer_base + TMR_CVWR(1));
6568

66-
return __raw_readl(mmp_timer_base + TMR_CVWR(1));
69+
return val;
6770
}
6871

6972
static u64 notrace mmp_read_sched_clock(void)

‎arch/arm/nwfpe/Makefile

+6
Original file line numberDiff line numberDiff line change
@@ -11,3 +11,9 @@ nwfpe-y += fpa11.o fpa11_cpdo.o fpa11_cpdt.o \
1111
entry.o
1212

1313
nwfpe-$(CONFIG_FPE_NWFPE_XP) += extended_cpdo.o
14+
15+
# Try really hard to avoid generating calls to __aeabi_uldivmod() from
16+
# float64_rem() due to loop elision.
17+
ifdef CONFIG_CC_IS_CLANG
18+
CFLAGS_softfloat.o += -mllvm -replexitval=never
19+
endif

‎arch/arm64/boot/dts/mediatek/mt6797.dtsi

+1-1
Original file line numberDiff line numberDiff line change
@@ -101,7 +101,7 @@
101101
};
102102
};
103103

104-
clk26m: oscillator@0 {
104+
clk26m: oscillator-26m {
105105
compatible = "fixed-clock";
106106
#clock-cells = <0>;
107107
clock-frequency = <26000000>;

‎arch/mips/bcm63xx/clk.c

+2
Original file line numberDiff line numberDiff line change
@@ -317,6 +317,8 @@ static struct clk clk_periph = {
317317
*/
318318
int clk_enable(struct clk *clk)
319319
{
320+
if (!clk)
321+
return 0;
320322
mutex_lock(&clocks_mutex);
321323
clk_enable_unlocked(clk);
322324
mutex_unlock(&clocks_mutex);

‎arch/mips/kernel/vpe-cmp.c

+2-2
Original file line numberDiff line numberDiff line change
@@ -75,7 +75,6 @@ ATTRIBUTE_GROUPS(vpe);
7575

7676
static void vpe_device_release(struct device *cd)
7777
{
78-
kfree(cd);
7978
}
8079

8180
static struct class vpe_class = {
@@ -157,6 +156,7 @@ int __init vpe_module_init(void)
157156
device_del(&vpe_device);
158157

159158
out_class:
159+
put_device(&vpe_device);
160160
class_unregister(&vpe_class);
161161

162162
out_chrdev:
@@ -169,7 +169,7 @@ void __exit vpe_module_exit(void)
169169
{
170170
struct vpe *v, *n;
171171

172-
device_del(&vpe_device);
172+
device_unregister(&vpe_device);
173173
class_unregister(&vpe_class);
174174
unregister_chrdev(major, VPE_MODULE_NAME);
175175

0 commit comments

Comments
 (0)