Skip to content

Commit 5b0a7d6

Browse files
sgaud-quicsgaud-quic
authored
Merge tag 'v6.18.30' into qcom-6.18.y (#586)
Merge tag 'v6.18.30' into qcom-6.18.y
2 parents bc1a85f + a64e226 commit 5b0a7d6

526 files changed

Lines changed: 5727 additions & 3008 deletions

File tree

Some content is hidden

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

Documentation/ABI/obsolete/sysfs-selinux-user renamed to Documentation/ABI/removed/sysfs-selinux-user

File renamed without changes.

‎Documentation/devicetree/bindings/display/ti/ti,am65x-dss.yaml‎

Lines changed: 52 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -36,34 +36,50 @@ properties:
3636
reg:
3737
description:
3838
Addresses to each DSS memory region described in the SoC's TRM.
39-
items:
40-
- description: common DSS register area
41-
- description: VIDL1 light video plane
42-
- description: VID video plane
43-
- description: OVR1 overlay manager for vp1
44-
- description: OVR2 overlay manager for vp2
45-
- description: VP1 video port 1
46-
- description: VP2 video port 2
47-
- description: common1 DSS register area
39+
oneOf:
40+
- items:
41+
- description: common DSS register area
42+
- description: VIDL1 light video plane
43+
- description: VID video plane
44+
- description: OVR1 overlay manager for vp1
45+
- description: OVR2 overlay manager for vp2
46+
- description: VP1 video port 1
47+
- description: VP2 video port 2
48+
- description: common1 DSS register area
49+
- items:
50+
- description: common DSS register area
51+
- description: VIDL1 light video plane
52+
- description: OVR1 overlay manager for vp1
53+
- description: VP1 video port 1
54+
- description: common1 DSS register area
4855

4956
reg-names:
50-
items:
51-
- const: common
52-
- const: vidl1
53-
- const: vid
54-
- const: ovr1
55-
- const: ovr2
56-
- const: vp1
57-
- const: vp2
58-
- const: common1
57+
oneOf:
58+
- items:
59+
- const: common
60+
- const: vidl1
61+
- const: vid
62+
- const: ovr1
63+
- const: ovr2
64+
- const: vp1
65+
- const: vp2
66+
- const: common1
67+
- items:
68+
- const: common
69+
- const: vidl1
70+
- const: ovr1
71+
- const: vp1
72+
- const: common1
5973

6074
clocks:
75+
minItems: 2
6176
items:
6277
- description: fck DSS functional clock
6378
- description: vp1 Video Port 1 pixel clock
6479
- description: vp2 Video Port 2 pixel clock
6580

6681
clock-names:
82+
minItems: 2
6783
items:
6884
- const: fck
6985
- const: vp1
@@ -180,6 +196,24 @@ allOf:
180196
ports:
181197
properties:
182198
port@1: false
199+
reg:
200+
maxItems: 5
201+
reg-names:
202+
maxItems: 5
203+
clocks:
204+
maxItems: 2
205+
clock-names:
206+
maxItems: 2
207+
else:
208+
properties:
209+
reg:
210+
minItems: 8
211+
reg-names:
212+
minItems: 8
213+
clocks:
214+
minItems: 3
215+
clock-names:
216+
minItems: 3
183217

184218
- if:
185219
properties:

‎Documentation/scheduler/sched-ext.rst‎

Lines changed: 7 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -321,13 +321,15 @@ by a sched_ext scheduler:
321321
ops.dispatch(); /* Task is moved to a local DSQ */
322322
}
323323
ops.running(); /* Task starts running on its assigned CPU */
324-
while (task->scx.slice > 0 && task is runnable)
325-
ops.tick(); /* Called every 1/HZ seconds */
326-
ops.stopping(); /* Task stops running (time slice expires or wait) */
327324
328-
/* Task's CPU becomes available */
325+
while task_is_runnable(p) {
326+
while (task->scx.slice > 0 && task_is_runnable(p))
327+
ops.tick(); /* Called every 1/HZ seconds */
328+
329+
ops.dispatch(); /* task->scx.slice can be refilled */
330+
}
329331
330-
ops.dispatch(); /* task->scx.slice can be refilled */
332+
ops.stopping(); /* Task stops running (time slice expires or wait) */
331333
}
332334
333335
ops.quiescent(); /* Task releases its assigned CPU (wait) */

‎Makefile‎

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
# SPDX-License-Identifier: GPL-2.0
22
VERSION = 6
33
PATCHLEVEL = 18
4-
SUBLEVEL = 25
4+
SUBLEVEL = 30
55
EXTRAVERSION =
66
NAME = Baby Opossum Posse
77

@@ -483,6 +483,8 @@ export rust_common_flags := --edition=2021 \
483483
-Wclippy::as_ptr_cast_mut \
484484
-Wclippy::as_underscore \
485485
-Wclippy::cast_lossless \
486+
-Aclippy::collapsible_if \
487+
-Aclippy::collapsible_match \
486488
-Wclippy::ignored_unit_patterns \
487489
-Wclippy::mut_mut \
488490
-Wclippy::needless_bitwise_bool \
@@ -492,6 +494,7 @@ export rust_common_flags := --edition=2021 \
492494
-Wclippy::ptr_cast_constness \
493495
-Wclippy::ref_as_ptr \
494496
-Wclippy::undocumented_unsafe_blocks \
497+
-Aclippy::uninlined_format_args \
495498
-Wclippy::unnecessary_safety_comment \
496499
-Wclippy::unnecessary_safety_doc \
497500
-Wrustdoc::missing_crate_level_docs \

‎arch/arm/mm/flush.c‎

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -304,8 +304,10 @@ void __sync_icache_dcache(pte_t pteval)
304304
else
305305
mapping = NULL;
306306

307-
if (!test_and_set_bit(PG_dcache_clean, &folio->flags.f))
307+
if (!test_bit(PG_dcache_clean, &folio->flags.f)) {
308308
__flush_dcache_folio(mapping, folio);
309+
set_bit(PG_dcache_clean, &folio->flags.f);
310+
}
309311

310312
if (pte_exec(pteval))
311313
__flush_icache_all();

‎arch/arm64/boot/dts/marvell/armada-3720-uDPU.dtsi‎

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -15,6 +15,11 @@
1515
#include "armada-372x.dtsi"
1616

1717
/ {
18+
aliases {
19+
ethernet0 = &eth0;
20+
ethernet1 = &eth1;
21+
};
22+
1823
chosen {
1924
stdout-path = "serial0:115200n8";
2025
};

‎arch/arm64/boot/dts/ti/k3-am62-verdin.dtsi‎

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -572,16 +572,16 @@
572572
/* On-module eMMC */
573573
pinctrl_sdhci0: main-mmc0-default-pins {
574574
pinctrl-single,pins = <
575-
AM62X_IOPAD(0x220, PIN_INPUT, 0) /* (Y3) MMC0_CMD */
576-
AM62X_IOPAD(0x218, PIN_INPUT, 0) /* (AB1) MMC0_CLK */
577-
AM62X_IOPAD(0x214, PIN_INPUT, 0) /* (AA2) MMC0_DAT0 */
578-
AM62X_IOPAD(0x210, PIN_INPUT, 0) /* (AA1) MMC0_DAT1 */
579-
AM62X_IOPAD(0x20c, PIN_INPUT, 0) /* (AA3) MMC0_DAT2 */
580-
AM62X_IOPAD(0x208, PIN_INPUT, 0) /* (Y4) MMC0_DAT3 */
581-
AM62X_IOPAD(0x204, PIN_INPUT, 0) /* (AB2) MMC0_DAT4 */
582-
AM62X_IOPAD(0x200, PIN_INPUT, 0) /* (AC1) MMC0_DAT5 */
583-
AM62X_IOPAD(0x1fc, PIN_INPUT, 0) /* (AD2) MMC0_DAT6 */
584-
AM62X_IOPAD(0x1f8, PIN_INPUT, 0) /* (AC2) MMC0_DAT7 */
575+
AM62X_IOPAD(0x220, PIN_INPUT, 0) /* (Y3) MMC0_CMD */
576+
AM62X_IOPAD(0x218, PIN_INPUT, 0) /* (AB1) MMC0_CLK */
577+
AM62X_IOPAD(0x214, PIN_INPUT, 0) /* (AA2) MMC0_DAT0 */
578+
AM62X_IOPAD(0x210, PIN_INPUT_PULLUP, 0) /* (AA1) MMC0_DAT1 */
579+
AM62X_IOPAD(0x20c, PIN_INPUT_PULLUP, 0) /* (AA3) MMC0_DAT2 */
580+
AM62X_IOPAD(0x208, PIN_INPUT_PULLUP, 0) /* (Y4) MMC0_DAT3 */
581+
AM62X_IOPAD(0x204, PIN_INPUT_PULLUP, 0) /* (AB2) MMC0_DAT4 */
582+
AM62X_IOPAD(0x200, PIN_INPUT_PULLUP, 0) /* (AC1) MMC0_DAT5 */
583+
AM62X_IOPAD(0x1fc, PIN_INPUT_PULLUP, 0) /* (AD2) MMC0_DAT6 */
584+
AM62X_IOPAD(0x1f8, PIN_INPUT_PULLUP, 0) /* (AC2) MMC0_DAT7 */
585585
>;
586586
};
587587

‎arch/arm64/crypto/aes-modes.S‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -838,7 +838,7 @@ AES_FUNC_START(aes_mac_update)
838838
encrypt_block v0, w2, x1, x7, w8
839839
eor v0.16b, v0.16b, v4.16b
840840
cmp w3, wzr
841-
csinv x5, x6, xzr, eq
841+
csinv w5, w6, wzr, eq
842842
cbz w5, .Lmacout
843843
encrypt_block v0, w2, x1, x7, w8
844844
st1 {v0.16b}, [x4] /* return dg */
@@ -852,7 +852,7 @@ AES_FUNC_START(aes_mac_update)
852852
eor v0.16b, v0.16b, v1.16b /* ..and xor with dg */
853853

854854
subs w3, w3, #1
855-
csinv x5, x6, xzr, eq
855+
csinv w5, w6, wzr, eq
856856
cbz w5, .Lmacout
857857

858858
.Lmacenc:

‎arch/arm64/include/asm/kvm_host.h‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1476,7 +1476,7 @@ static inline bool __vcpu_has_feature(const struct kvm_arch *ka, int feature)
14761476
#define kvm_vcpu_has_feature(k, f) __vcpu_has_feature(&(k)->arch, (f))
14771477
#define vcpu_has_feature(v, f) __vcpu_has_feature(&(v)->kvm->arch, (f))
14781478

1479-
#define kvm_vcpu_initialized(v) vcpu_get_flag(vcpu, VCPU_INITIALIZED)
1479+
#define kvm_vcpu_initialized(v) vcpu_get_flag(v, VCPU_INITIALIZED)
14801480

14811481
int kvm_trng_call(struct kvm_vcpu *vcpu);
14821482
#ifdef CONFIG_KVM

‎arch/arm64/include/asm/mmu.h‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -112,5 +112,7 @@ void kpti_install_ng_mappings(void);
112112
static inline void kpti_install_ng_mappings(void) {}
113113
#endif
114114

115+
extern bool page_alloc_available;
116+
115117
#endif /* !__ASSEMBLY__ */
116118
#endif

0 commit comments

Comments
 (0)