Skip to content

Commit 5e26b4b

Browse files
scpcomscpcom
committed
Merge tag 'v6.6.32' into sbc-6.6.y
This is the 6.6.32 stable release # -----BEGIN PGP SIGNATURE----- # # iQIzBAABCAAdFiEEZH8oZUiU471FcZm+ONu9yGCSaT4FAmZR9VUACgkQONu9yGCS # aT66pw//cHRq9f2cxZjKLCj316VPZcgxkbh3iI4V0krDqHIZFqWoBGeWpjnb2BBK # sfVntEjuxVuPygSx9zrEpkSS5OS4pK3KdCjCzRyC36qZqkLSHAyFDHhzFdw70UTQ # 9sACRVPYwgHfwAKW+7egAHxoEhTWwSWSt2W/nh4xnuNOo8+kG9rTwyup6ERlz4oe # 0UqvfBl3aS7npi7hNb5JbibCxDmFy9BqO50RwCctdzc35ElhXLiNaK9oWUAvEI4Q # 19tVIDxJp4T/wGBC6BaIiVWnyqbPhTRQujdc/1OA9towq6fWC1KNCw5fh1bDk9pi # ixn0qWRTcBYiAeslsLTHzYdgZxOb++O31EKb/4OB0hm7Li6pTnPk4BUvwyAifQUh # Kr5OS9DnGD0jBPdNCzZZq0/HmQIVcqtrAWHrFY8KUdqATPTgJrsmZsSAz1eCVmcV # I3x8+zl2jmz2wXu1GVfv/F0Ez4QlGhYifHLFpo6DWkM5Qdt7qfYmyna4cdRmsj/n # WlQoOFpxjiJ0r361SfR2k5QBopEzLphtej3iwAXRfmbfgjdvJT587PD23ldIdZKD # /zvbMgCTBzJwOpwGDDufpUFY6ciLVolMpfTF3qDlQPb9aTT0ClYqrt+Uq2Ph/xQH # ODnvywXDcawVlJ9j23AzhwF56X9F9atgEedkVLtspC59RTnPWy4= # =Hy6r # -----END PGP SIGNATURE----- # gpg: directory '/home/scsupport/.gnupg' created # gpg: keybox '/home/scsupport/.gnupg/pubring.kbx' created # gpg: Signature made Sa 25 Mai 2024 14:27:33 UTC # gpg: using RSA key 647F28654894E3BD457199BE38DBBDC86092693E # gpg: Can't check signature: No public key
2 parents 5bb2f2f + 91de249 commit 5e26b4b

File tree

591 files changed

+8800
-4655
lines changed

Some content is hidden

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

591 files changed

+8800
-4655
lines changed

‎Documentation/ABI/stable/sysfs-block‎

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -101,6 +101,16 @@ Description:
101101
devices that support receiving integrity metadata.
102102

103103

104+
What: /sys/block/<disk>/partscan
105+
Date: May 2024
106+
Contact: Christoph Hellwig <hch@lst.de>
107+
Description:
108+
The /sys/block/<disk>/partscan files reports if partition
109+
scanning is enabled for the disk. It returns "1" if partition
110+
scanning is enabled, or "0" if not. The value type is a 32-bit
111+
unsigned integer, but only "0" and "1" are valid values.
112+
113+
104114
What: /sys/block/<disk>/<partition>/alignment_offset
105115
Date: April 2009
106116
Contact: Martin K. Petersen <martin.petersen@oracle.com>

‎Documentation/admin-guide/hw-vuln/core-scheduling.rst‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -67,8 +67,8 @@ arg4:
6767
will be performed for all tasks in the task group of ``pid``.
6868

6969
arg5:
70-
userspace pointer to an unsigned long for storing the cookie returned by
71-
``PR_SCHED_CORE_GET`` command. Should be 0 for all other commands.
70+
userspace pointer to an unsigned long long for storing the cookie returned
71+
by ``PR_SCHED_CORE_GET`` command. Should be 0 for all other commands.
7272

7373
In order for a process to push a cookie to, or pull a cookie from a process, it
7474
is required to have the ptrace access mode: `PTRACE_MODE_READ_REALCREDS` to the

‎Documentation/admin-guide/kdump/vmcoreinfo.rst‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -172,7 +172,7 @@ variables.
172172
Offset of the free_list's member. This value is used to compute the number
173173
of free pages.
174174

175-
Each zone has a free_area structure array called free_area[MAX_ORDER + 1].
175+
Each zone has a free_area structure array called free_area[NR_PAGE_ORDERS].
176176
The free_list represents a linked list of free page blocks.
177177

178178
(list_head, next|prev)
@@ -189,8 +189,8 @@ Offsets of the vmap_area's members. They carry vmalloc-specific
189189
information. Makedumpfile gets the start address of the vmalloc region
190190
from this.
191191

192-
(zone.free_area, MAX_ORDER + 1)
193-
-------------------------------
192+
(zone.free_area, NR_PAGE_ORDERS)
193+
--------------------------------
194194

195195
Free areas descriptor. User-space tools use this value to iterate the
196196
free_area ranges. MAX_ORDER is used by the zone buddy allocator.

‎Documentation/admin-guide/mm/damon/usage.rst‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -389,7 +389,7 @@ pages of all memory cgroups except ``/having_care_already``.::
389389
# # further filter out all cgroups except one at '/having_care_already'
390390
echo memcg > 1/type
391391
echo /having_care_already > 1/memcg_path
392-
echo N > 1/matching
392+
echo Y > 1/matching
393393

394394
Note that ``anon`` and ``memcg`` filters are currently supported only when
395395
``paddr`` `implementation <sysfs_contexts>` is being used.

‎Documentation/admin-guide/sysctl/net.rst‎

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -205,6 +205,11 @@ Will increase power usage.
205205

206206
Default: 0 (off)
207207

208+
mem_pcpu_rsv
209+
------------
210+
211+
Per-cpu reserved forward alloc cache size in page units. Default 1MB per CPU.
212+
208213
rmem_default
209214
------------
210215

‎Documentation/devicetree/bindings/iio/health/maxim,max30102.yaml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -42,7 +42,7 @@ allOf:
4242
properties:
4343
compatible:
4444
contains:
45-
const: maxim,max30100
45+
const: maxim,max30102
4646
then:
4747
properties:
4848
maxim,green-led-current-microamp: false

‎Documentation/devicetree/bindings/net/mediatek,net.yaml‎

Lines changed: 2 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -337,8 +337,8 @@ allOf:
337337
minItems: 4
338338

339339
clocks:
340-
minItems: 34
341-
maxItems: 34
340+
minItems: 24
341+
maxItems: 24
342342

343343
clock-names:
344344
items:
@@ -351,18 +351,6 @@ allOf:
351351
- const: ethwarp_wocpu1
352352
- const: ethwarp_wocpu0
353353
- const: esw
354-
- const: netsys0
355-
- const: netsys1
356-
- const: sgmii_tx250m
357-
- const: sgmii_rx250m
358-
- const: sgmii2_tx250m
359-
- const: sgmii2_rx250m
360-
- const: top_usxgmii0_sel
361-
- const: top_usxgmii1_sel
362-
- const: top_sgm0_sel
363-
- const: top_sgm1_sel
364-
- const: top_xfi_phy0_xtal_sel
365-
- const: top_xfi_phy1_xtal_sel
366354
- const: top_eth_gmii_sel
367355
- const: top_eth_refck_50m_sel
368356
- const: top_eth_sys_200m_sel
@@ -375,16 +363,10 @@ allOf:
375363
- const: top_netsys_sync_250m_sel
376364
- const: top_netsys_ppefb_250m_sel
377365
- const: top_netsys_warp_sel
378-
- const: wocpu1
379-
- const: wocpu0
380366
- const: xgp1
381367
- const: xgp2
382368
- const: xgp3
383369

384-
mediatek,sgmiisys:
385-
minItems: 2
386-
maxItems: 2
387-
388370
patternProperties:
389371
"^mac@[0-1]$":
390372
type: object

‎Documentation/sphinx/kernel_include.py‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -97,7 +97,6 @@ def _run(self):
9797
# HINT: this is the only line I had to change / commented out:
9898
#path = utils.relative_path(None, path)
9999

100-
path = nodes.reprunicode(path)
101100
encoding = self.options.get(
102101
'encoding', self.state.document.settings.input_encoding)
103102
e_handler=self.state.document.settings.input_encoding_error_handler

‎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 = 29
4+
SUBLEVEL = 32
55
EXTRAVERSION =
66
NAME = Hurr durr I'ma ninja sloth
77

‎arch/Kconfig‎

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,14 @@
99
#
1010
source "arch/$(SRCARCH)/Kconfig"
1111

12+
config ARCH_CONFIGURES_CPU_MITIGATIONS
13+
bool
14+
15+
if !ARCH_CONFIGURES_CPU_MITIGATIONS
16+
config CPU_MITIGATIONS
17+
def_bool y
18+
endif
19+
1220
menu "General architecture-dependent options"
1321

1422
config ARCH_HAS_SUBPAGE_FAULTS

0 commit comments

Comments
 (0)