Skip to content

Commit dbf9455

Browse files
committed
Merge tag 'v6.6.113' into 6.6-main
This is the 6.6.113 stable release # -----BEGIN PGP SIGNATURE----- # # iQIzBAABCgAdFiEEZH8oZUiU471FcZm+ONu9yGCSaT4FAmj09i4ACgkQONu9yGCS # aT4waxAA0IMBZYrEND5G1N++2Ghy6A9Kpc1bKRj42aYj8FXlaaGXeXmaorZRqgTY # Ak1BfVxEMekGZ23bfPXGy3DiK5J80rmOHPhSoCR3Uo4dYTISZNohm6qs0a1WGRk4 # EMAjz3kHa8rFYQF2SpqmS+rz9X7ppPtEJTdoIFkVrHwlYeQQrB4PYQQeOdxSUglA # IuyH8pbXQ1IyejWxGPnqbAbjngC48MjYJzG9ptiSRnfDvOZiBceqKs5XAnmMhZxl # lQqPjvT86sfzebc1AiPV9DRvPZzFFA4XzbcrIYSw3esOz1YGQzXOI3ZHfPd9FPEm # x0zRKkM+eLITc3eQzyN9M/zlf5jmb0mLZvCS5Gm4ke8AowpAu7glTColviBXTaV4 # NHqy/7/y2qoe9bXQ0JgWxNNq/cO0lpasS3A3M08yZS4SkNw6FVYRneP1AlwP0wPO # wpE7Ldr4L/Q6d313BWSChSYUD1ciMENBMkPqrk8egXXMNIvQKQdYT34sXDHWxUwo # EqcxUsV1SMHApxia1krJ0DhWFn1DNJk6hg2ver6Fpdpczau+KYp0COJ4E7iTdZ89 # 1bgF9ZvKukpybzTPH5uM4rF8yyzxyt0EIt3czCS2R6VQo+UNawOiquvfTqkdvYZh # RKBzMgznQMdG37sl2vqLN2AwEjH6RDqjyxpEPIp95G2ropu8dZA= # =T5gw # -----END PGP SIGNATURE----- # gpg: Signature made Sun Oct 19 16:31:10 2025 CEST # gpg: using RSA key 647F28654894E3BD457199BE38DBBDC86092693E # gpg: Can't check signature: No public key
2 parents ac7de15 + f231f24 commit dbf9455

216 files changed

Lines changed: 1920 additions & 1078 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/admin-guide/kernel-parameters.txt

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -5638,6 +5638,9 @@
56385638

56395639
rootflags= [KNL] Set root filesystem mount option string
56405640

5641+
initramfs_options= [KNL]
5642+
Specify mount options for for the initramfs mount.
5643+
56415644
rootfstype= [KNL] Set root filesystem type
56425645

56435646
rootwait [KNL] Wait (indefinitely) for root device to show up.

Documentation/devicetree/bindings/phy/rockchip-inno-csi-dphy.yaml

Lines changed: 14 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -57,11 +57,24 @@ required:
5757
- clocks
5858
- clock-names
5959
- '#phy-cells'
60-
- power-domains
6160
- resets
6261
- reset-names
6362
- rockchip,grf
6463

64+
allOf:
65+
- if:
66+
properties:
67+
compatible:
68+
contains:
69+
enum:
70+
- rockchip,px30-csi-dphy
71+
- rockchip,rk1808-csi-dphy
72+
- rockchip,rk3326-csi-dphy
73+
- rockchip,rk3368-csi-dphy
74+
then:
75+
required:
76+
- power-domains
77+
6578
additionalProperties: false
6679

6780
examples:

Makefile

Lines changed: 1 addition & 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 = 6
4-
SUBLEVEL = 112
4+
SUBLEVEL = 113
55
EXTRAVERSION =
66
NAME = Pinguïn Aangedreven
77

arch/arm/mach-omap2/pm33xx-core.c

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -388,12 +388,15 @@ static int __init amx3_idle_init(struct device_node *cpu_node, int cpu)
388388
if (!state_node)
389389
break;
390390

391-
if (!of_device_is_available(state_node))
391+
if (!of_device_is_available(state_node)) {
392+
of_node_put(state_node);
392393
continue;
394+
}
393395

394396
if (i == CPUIDLE_STATE_MAX) {
395397
pr_warn("%s: cpuidle states reached max possible\n",
396398
__func__);
399+
of_node_put(state_node);
397400
break;
398401
}
399402

@@ -403,6 +406,7 @@ static int __init amx3_idle_init(struct device_node *cpu_node, int cpu)
403406
states[state_count].wfi_flags |= WFI_FLAG_WAKE_M3 |
404407
WFI_FLAG_FLUSH_CACHE;
405408

409+
of_node_put(state_node);
406410
state_count++;
407411
}
408412

arch/arm64/boot/dts/qcom/msm8916.dtsi

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1529,6 +1529,8 @@
15291529

15301530
interrupts = <GIC_SPI 72 IRQ_TYPE_LEVEL_HIGH>;
15311531

1532+
resets = <&gcc GCC_MDSS_BCR>;
1533+
15321534
interrupt-controller;
15331535
#interrupt-cells = <1>;
15341536

arch/arm64/boot/dts/qcom/msm8939.dtsi

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1210,6 +1210,8 @@
12101210

12111211
power-domains = <&gcc MDSS_GDSC>;
12121212

1213+
resets = <&gcc GCC_MDSS_BCR>;
1214+
12131215
#address-cells = <1>;
12141216
#size-cells = <1>;
12151217
#interrupt-cells = <1>;

arch/arm64/boot/dts/qcom/sdm845.dtsi

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5208,11 +5208,11 @@
52085208
compatible = "qcom,bam-v1.7.4", "qcom,bam-v1.7.0";
52095209
qcom,controlled-remotely;
52105210
reg = <0 0x17184000 0 0x2a000>;
5211-
num-channels = <31>;
5211+
num-channels = <23>;
52125212
interrupts = <GIC_SPI 164 IRQ_TYPE_LEVEL_HIGH>;
52135213
#dma-cells = <1>;
52145214
qcom,ee = <1>;
5215-
qcom,num-ees = <2>;
5215+
qcom,num-ees = <4>;
52165216
iommus = <&apps_smmu 0x1806 0x0>;
52175217
};
52185218

arch/arm64/boot/dts/ti/k3-am62a-main.dtsi

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

186186
main_pmx0: pinctrl@f4000 {
187187
compatible = "pinctrl-single";
188-
reg = <0x00 0xf4000 0x00 0x2ac>;
188+
reg = <0x00 0xf4000 0x00 0x25c>;
189189
#pinctrl-cells = <1>;
190190
pinctrl-single,register-width = <32>;
191191
pinctrl-single,function-mask = <0xffffffff>;

arch/arm64/kernel/cpufeature.c

Lines changed: 7 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -2174,17 +2174,21 @@ static void bti_enable(const struct arm64_cpu_capabilities *__unused)
21742174
#ifdef CONFIG_ARM64_MTE
21752175
static void cpu_enable_mte(struct arm64_cpu_capabilities const *cap)
21762176
{
2177+
static bool cleared_zero_page = false;
2178+
21772179
sysreg_clear_set(sctlr_el1, 0, SCTLR_ELx_ATA | SCTLR_EL1_ATA0);
21782180

21792181
mte_cpu_setup();
21802182

21812183
/*
21822184
* Clear the tags in the zero page. This needs to be done via the
2183-
* linear map which has the Tagged attribute.
2185+
* linear map which has the Tagged attribute. Since this page is
2186+
* always mapped as pte_special(), set_pte_at() will not attempt to
2187+
* clear the tags or set PG_mte_tagged.
21842188
*/
2185-
if (try_page_mte_tagging(ZERO_PAGE(0))) {
2189+
if (!cleared_zero_page) {
2190+
cleared_zero_page = true;
21862191
mte_clear_page_tags(lm_alias(empty_zero_page));
2187-
set_page_mte_tagged(ZERO_PAGE(0));
21882192
}
21892193

21902194
kasan_init_hw_tags_cpu();

arch/arm64/kernel/mte.c

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -428,7 +428,8 @@ static int __access_remote_tags(struct mm_struct *mm, unsigned long addr,
428428
put_page(page);
429429
break;
430430
}
431-
WARN_ON_ONCE(!page_mte_tagged(page));
431+
432+
WARN_ON_ONCE(!page_mte_tagged(page) && !is_zero_page(page));
432433

433434
/* limit access to the end of the page */
434435
offset = offset_in_page(addr);

0 commit comments

Comments
 (0)