Skip to content

Commit 0e4ce96

Browse files
committed
Merge tag 'v5.19' into sync
Linux 5.19 Signed-off-by: Miguel Ojeda <ojeda@kernel.org>
2 parents f42f82c + 3d7cb6b commit 0e4ce96

File tree

152 files changed

+1296
-1108
lines changed

Some content is hidden

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

152 files changed

+1296
-1108
lines changed

.mailmap

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -60,6 +60,10 @@ Arnd Bergmann <arnd@arndb.de>
6060
Atish Patra <atishp@atishpatra.org> <atish.patra@wdc.com>
6161
Axel Dyks <xl@xlsigned.net>
6262
Axel Lin <axel.lin@gmail.com>
63+
Baolin Wang <baolin.wang@linux.alibaba.com> <baolin.wang@linaro.org>
64+
Baolin Wang <baolin.wang@linux.alibaba.com> <baolin.wang@spreadtrum.com>
65+
Baolin Wang <baolin.wang@linux.alibaba.com> <baolin.wang@unisoc.com>
66+
Baolin Wang <baolin.wang@linux.alibaba.com> <baolin.wang7@gmail.com>
6367
Bart Van Assche <bvanassche@acm.org> <bart.vanassche@sandisk.com>
6468
Bart Van Assche <bvanassche@acm.org> <bart.vanassche@wdc.com>
6569
Ben Gardner <bgardner@wabtec.com>
@@ -135,6 +139,8 @@ Frank Rowand <frowand.list@gmail.com> <frowand@mvista.com>
135139
Frank Zago <fzago@systemfabricworks.com>
136140
Gao Xiang <xiang@kernel.org> <gaoxiang25@huawei.com>
137141
Gao Xiang <xiang@kernel.org> <hsiangkao@aol.com>
142+
Gao Xiang <xiang@kernel.org> <hsiangkao@linux.alibaba.com>
143+
Gao Xiang <xiang@kernel.org> <hsiangkao@redhat.com>
138144
Gerald Schaefer <gerald.schaefer@linux.ibm.com> <geraldsc@de.ibm.com>
139145
Gerald Schaefer <gerald.schaefer@linux.ibm.com> <gerald.schaefer@de.ibm.com>
140146
Gerald Schaefer <gerald.schaefer@linux.ibm.com> <geraldsc@linux.vnet.ibm.com>
@@ -371,6 +377,7 @@ Sean Nyekjaer <sean@geanix.com> <sean.nyekjaer@prevas.dk>
371377
Sebastian Reichel <sre@kernel.org> <sebastian.reichel@collabora.co.uk>
372378
Sebastian Reichel <sre@kernel.org> <sre@debian.org>
373379
Sedat Dilek <sedat.dilek@gmail.com> <sedat.dilek@credativ.de>
380+
Seth Forshee <sforshee@kernel.org> <seth.forshee@canonical.com>
374381
Shiraz Hashim <shiraz.linux.kernel@gmail.com> <shiraz.hashim@st.com>
375382
Shuah Khan <shuah@kernel.org> <shuahkhan@gmail.com>
376383
Shuah Khan <shuah@kernel.org> <shuah.khan@hp.com>

Documentation/admin-guide/kernel-parameters.txt

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3176,6 +3176,7 @@
31763176
no_entry_flush [PPC]
31773177
no_uaccess_flush [PPC]
31783178
mmio_stale_data=off [X86]
3179+
retbleed=off [X86]
31793180

31803181
Exceptions:
31813182
This does not have any effect on
@@ -3198,6 +3199,7 @@
31983199
mds=full,nosmt [X86]
31993200
tsx_async_abort=full,nosmt [X86]
32003201
mmio_stale_data=full,nosmt [X86]
3202+
retbleed=auto,nosmt [X86]
32013203

32023204
mminit_loglevel=
32033205
[KNL] When CONFIG_DEBUG_MEMORY_INIT is set, this

Documentation/devicetree/bindings/net/ethernet-controller.yaml

Lines changed: 59 additions & 64 deletions
Original file line numberDiff line numberDiff line change
@@ -167,70 +167,65 @@ properties:
167167
- in-band-status
168168

169169
fixed-link:
170-
allOf:
171-
- if:
172-
type: array
173-
then:
174-
deprecated: true
175-
items:
176-
- minimum: 0
177-
maximum: 31
178-
description:
179-
Emulated PHY ID, choose any but unique to the all
180-
specified fixed-links
181-
182-
- enum: [0, 1]
183-
description:
184-
Duplex configuration. 0 for half duplex or 1 for
185-
full duplex
186-
187-
- enum: [10, 100, 1000, 2500, 10000]
188-
description:
189-
Link speed in Mbits/sec.
190-
191-
- enum: [0, 1]
192-
description:
193-
Pause configuration. 0 for no pause, 1 for pause
194-
195-
- enum: [0, 1]
196-
description:
197-
Asymmetric pause configuration. 0 for no asymmetric
198-
pause, 1 for asymmetric pause
199-
200-
201-
- if:
202-
type: object
203-
then:
204-
properties:
205-
speed:
206-
description:
207-
Link speed.
208-
$ref: /schemas/types.yaml#/definitions/uint32
209-
enum: [10, 100, 1000, 2500, 10000]
210-
211-
full-duplex:
212-
$ref: /schemas/types.yaml#/definitions/flag
213-
description:
214-
Indicates that full-duplex is used. When absent, half
215-
duplex is assumed.
216-
217-
pause:
218-
$ref: /schemas/types.yaml#definitions/flag
219-
description:
220-
Indicates that pause should be enabled.
221-
222-
asym-pause:
223-
$ref: /schemas/types.yaml#/definitions/flag
224-
description:
225-
Indicates that asym_pause should be enabled.
226-
227-
link-gpios:
228-
maxItems: 1
229-
description:
230-
GPIO to determine if the link is up
231-
232-
required:
233-
- speed
170+
oneOf:
171+
- $ref: /schemas/types.yaml#/definitions/uint32-array
172+
deprecated: true
173+
items:
174+
- minimum: 0
175+
maximum: 31
176+
description:
177+
Emulated PHY ID, choose any but unique to the all
178+
specified fixed-links
179+
180+
- enum: [0, 1]
181+
description:
182+
Duplex configuration. 0 for half duplex or 1 for
183+
full duplex
184+
185+
- enum: [10, 100, 1000, 2500, 10000]
186+
description:
187+
Link speed in Mbits/sec.
188+
189+
- enum: [0, 1]
190+
description:
191+
Pause configuration. 0 for no pause, 1 for pause
192+
193+
- enum: [0, 1]
194+
description:
195+
Asymmetric pause configuration. 0 for no asymmetric
196+
pause, 1 for asymmetric pause
197+
- type: object
198+
additionalProperties: false
199+
properties:
200+
speed:
201+
description:
202+
Link speed.
203+
$ref: /schemas/types.yaml#/definitions/uint32
204+
enum: [10, 100, 1000, 2500, 10000]
205+
206+
full-duplex:
207+
$ref: /schemas/types.yaml#/definitions/flag
208+
description:
209+
Indicates that full-duplex is used. When absent, half
210+
duplex is assumed.
211+
212+
pause:
213+
$ref: /schemas/types.yaml#definitions/flag
214+
description:
215+
Indicates that pause should be enabled.
216+
217+
asym-pause:
218+
$ref: /schemas/types.yaml#/definitions/flag
219+
description:
220+
Indicates that asym_pause should be enabled.
221+
222+
link-gpios:
223+
maxItems: 1
224+
description:
225+
GPIO to determine if the link is up
226+
227+
required:
228+
- speed
234229

235230
additionalProperties: true
236231

Documentation/devicetree/bindings/net/fsl,fec.yaml

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -183,6 +183,7 @@ properties:
183183
Should specify the gpio for phy reset.
184184

185185
phy-reset-duration:
186+
$ref: /schemas/types.yaml#/definitions/uint32
186187
deprecated: true
187188
description:
188189
Reset duration in milliseconds. Should present only if property
@@ -191,12 +192,14 @@ properties:
191192
and 1 millisecond will be used instead.
192193

193194
phy-reset-active-high:
195+
type: boolean
194196
deprecated: true
195197
description:
196198
If present then the reset sequence using the GPIO specified in the
197199
"phy-reset-gpios" property is reversed (H=reset state, L=operation state).
198200

199201
phy-reset-post-delay:
202+
$ref: /schemas/types.yaml#/definitions/uint32
200203
deprecated: true
201204
description:
202205
Post reset delay in milliseconds. If present then a delay of phy-reset-post-delay

Documentation/networking/ip-sysctl.rst

Lines changed: 8 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2866,7 +2866,14 @@ sctp_rmem - vector of 3 INTEGERs: min, default, max
28662866
Default: 4K
28672867

28682868
sctp_wmem - vector of 3 INTEGERs: min, default, max
2869-
Currently this tunable has no effect.
2869+
Only the first value ("min") is used, "default" and "max" are
2870+
ignored.
2871+
2872+
min: Minimum size of send buffer that can be used by SCTP sockets.
2873+
It is guaranteed to each SCTP socket (but not association) even
2874+
under moderate memory pressure.
2875+
2876+
Default: 4K
28702877

28712878
addr_scope_policy - INTEGER
28722879
Control IPv4 address scoping - draft-stewart-tsvwg-sctp-ipv4-00

Makefile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
VERSION = 5
33
PATCHLEVEL = 19
44
SUBLEVEL = 0
5-
EXTRAVERSION = -rc8
5+
EXTRAVERSION =
66
NAME = Superb Owl
77

88
# *DOCUMENTATION*

arch/arm/boot/dts/lan966x.dtsi

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,7 @@
3838
sys_clk: sys_clk {
3939
compatible = "fixed-clock";
4040
#clock-cells = <0>;
41-
clock-frequency = <162500000>;
41+
clock-frequency = <165625000>;
4242
};
4343

4444
cpu_clk: cpu_clk {

arch/arm/include/asm/dma.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@
1010
#else
1111
#define MAX_DMA_ADDRESS ({ \
1212
extern phys_addr_t arm_dma_zone_size; \
13-
arm_dma_zone_size && arm_dma_zone_size < (0x10000000 - PAGE_OFFSET) ? \
13+
arm_dma_zone_size && arm_dma_zone_size < (0x100000000ULL - PAGE_OFFSET) ? \
1414
(PAGE_OFFSET + arm_dma_zone_size) : 0xffffffffUL; })
1515
#endif
1616

arch/arm/lib/findbit.S

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -40,8 +40,8 @@ ENDPROC(_find_first_zero_bit_le)
4040
* Prototype: int find_next_zero_bit(void *addr, unsigned int maxbit, int offset)
4141
*/
4242
ENTRY(_find_next_zero_bit_le)
43-
teq r1, #0
44-
beq 3b
43+
cmp r2, r1
44+
bhs 3b
4545
ands ip, r2, #7
4646
beq 1b @ If new byte, goto old routine
4747
ARM( ldrb r3, [r0, r2, lsr #3] )
@@ -81,8 +81,8 @@ ENDPROC(_find_first_bit_le)
8181
* Prototype: int find_next_zero_bit(void *addr, unsigned int maxbit, int offset)
8282
*/
8383
ENTRY(_find_next_bit_le)
84-
teq r1, #0
85-
beq 3b
84+
cmp r2, r1
85+
bhs 3b
8686
ands ip, r2, #7
8787
beq 1b @ If new byte, goto old routine
8888
ARM( ldrb r3, [r0, r2, lsr #3] )
@@ -115,8 +115,8 @@ ENTRY(_find_first_zero_bit_be)
115115
ENDPROC(_find_first_zero_bit_be)
116116

117117
ENTRY(_find_next_zero_bit_be)
118-
teq r1, #0
119-
beq 3b
118+
cmp r2, r1
119+
bhs 3b
120120
ands ip, r2, #7
121121
beq 1b @ If new byte, goto old routine
122122
eor r3, r2, #0x18 @ big endian byte ordering
@@ -149,8 +149,8 @@ ENTRY(_find_first_bit_be)
149149
ENDPROC(_find_first_bit_be)
150150

151151
ENTRY(_find_next_bit_be)
152-
teq r1, #0
153-
beq 3b
152+
cmp r2, r1
153+
bhs 3b
154154
ands ip, r2, #7
155155
beq 1b @ If new byte, goto old routine
156156
eor r3, r2, #0x18 @ big endian byte ordering

arch/arm/mach-pxa/corgi.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -549,7 +549,7 @@ static struct pxa2xx_spi_controller corgi_spi_info = {
549549
};
550550

551551
static struct gpiod_lookup_table corgi_spi_gpio_table = {
552-
.dev_id = "pxa2xx-spi.1",
552+
.dev_id = "spi1",
553553
.table = {
554554
GPIO_LOOKUP_IDX("gpio-pxa", CORGI_GPIO_ADS7846_CS, "cs", 0, GPIO_ACTIVE_LOW),
555555
GPIO_LOOKUP_IDX("gpio-pxa", CORGI_GPIO_LCDCON_CS, "cs", 1, GPIO_ACTIVE_LOW),

0 commit comments

Comments
 (0)