Skip to content

Commit ad112b3

Browse files
author
Ingo Molnar
committed
Merge tag 'v6.9-rc6' into perf/core, to pick up fixes
Signed-off-by: Ingo Molnar <mingo@kernel.org>
2 parents 854dd99 + e67572c commit ad112b3

File tree

637 files changed

+6709
-4064
lines changed

Some content is hidden

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

637 files changed

+6709
-4064
lines changed

.mailmap

Lines changed: 15 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -38,6 +38,16 @@ Alexei Starovoitov <ast@kernel.org> <alexei.starovoitov@gmail.com>
3838
Alexei Starovoitov <ast@kernel.org> <ast@fb.com>
3939
Alexei Starovoitov <ast@kernel.org> <ast@plumgrid.com>
4040
Alexey Makhalov <alexey.amakhalov@broadcom.com> <amakhalov@vmware.com>
41+
Alex Elder <elder@kernel.org>
42+
Alex Elder <elder@kernel.org> <aelder@sgi.com>
43+
Alex Elder <elder@kernel.org> <alex.elder@linaro.org>
44+
Alex Elder <elder@kernel.org> <alex.elder@linary.org>
45+
Alex Elder <elder@kernel.org> <elder@dreamhost.com>
46+
Alex Elder <elder@kernel.org> <elder@dreawmhost.com>
47+
Alex Elder <elder@kernel.org> <elder@ieee.org>
48+
Alex Elder <elder@kernel.org> <elder@inktank.com>
49+
Alex Elder <elder@kernel.org> <elder@linaro.org>
50+
Alex Elder <elder@kernel.org> <elder@newdream.net>
4151
Alex Hung <alexhung@gmail.com> <alex.hung@canonical.com>
4252
Alex Shi <alexs@kernel.org> <alex.shi@intel.com>
4353
Alex Shi <alexs@kernel.org> <alex.shi@linaro.org>
@@ -98,6 +108,8 @@ Ben Widawsky <bwidawsk@kernel.org> <ben@bwidawsk.net>
98108
Ben Widawsky <bwidawsk@kernel.org> <ben.widawsky@intel.com>
99109
Ben Widawsky <bwidawsk@kernel.org> <benjamin.widawsky@intel.com>
100110
Benjamin Poirier <benjamin.poirier@gmail.com> <bpoirier@suse.de>
111+
Benjamin Tissoires <bentiss@kernel.org> <benjamin.tissoires@gmail.com>
112+
Benjamin Tissoires <bentiss@kernel.org> <benjamin.tissoires@redhat.com>
101113
Bjorn Andersson <andersson@kernel.org> <bjorn@kryo.se>
102114
Bjorn Andersson <andersson@kernel.org> <bjorn.andersson@linaro.org>
103115
Bjorn Andersson <andersson@kernel.org> <bjorn.andersson@sonymobile.com>
@@ -446,7 +458,8 @@ Mythri P K <mythripk@ti.com>
446458
Nadav Amit <nadav.amit@gmail.com> <namit@vmware.com>
447459
Nadav Amit <nadav.amit@gmail.com> <namit@cs.technion.ac.il>
448460
Nadia Yvette Chambers <nyc@holomorphy.com> William Lee Irwin III <wli@holomorphy.com>
449-
Naoya Horiguchi <naoya.horiguchi@nec.com> <n-horiguchi@ah.jp.nec.com>
461+
Naoya Horiguchi <nao.horiguchi@gmail.com> <n-horiguchi@ah.jp.nec.com>
462+
Naoya Horiguchi <nao.horiguchi@gmail.com> <naoya.horiguchi@nec.com>
450463
Nathan Chancellor <nathan@kernel.org> <natechancellor@gmail.com>
451464
Neeraj Upadhyay <quic_neeraju@quicinc.com> <neeraju@codeaurora.org>
452465
Neil Armstrong <neil.armstrong@linaro.org> <narmstrong@baylibre.com>
@@ -524,6 +537,7 @@ Rémi Denis-Courmont <rdenis@simphalempin.com>
524537
Ricardo Ribalda <ribalda@kernel.org> <ricardo@ribalda.com>
525538
Ricardo Ribalda <ribalda@kernel.org> Ricardo Ribalda Delgado <ribalda@kernel.org>
526539
Ricardo Ribalda <ribalda@kernel.org> <ricardo.ribalda@gmail.com>
540+
Richard Genoud <richard.genoud@bootlin.com> <richard.genoud@gmail.com>
527541
Richard Leitner <richard.leitner@linux.dev> <dev@g0hl1n.net>
528542
Richard Leitner <richard.leitner@linux.dev> <me@g0hl1n.net>
529543
Richard Leitner <richard.leitner@linux.dev> <richard.leitner@skidata.com>

Documentation/admin-guide/kernel-parameters.txt

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3423,6 +3423,9 @@
34233423
arch-independent options, each of which is an
34243424
aggregation of existing arch-specific options.
34253425

3426+
Note, "mitigations" is supported if and only if the
3427+
kernel was built with CPU_MITIGATIONS=y.
3428+
34263429
off
34273430
Disable all optional CPU mitigations. This
34283431
improves system performance, but it may also

Documentation/admin-guide/verify-bugs-and-bisect-regressions.rst

Lines changed: 417 additions & 180 deletions
Large diffs are not rendered by default.

Documentation/devicetree/bindings/eeprom/at24.yaml

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -68,14 +68,10 @@ properties:
6868
pattern: cs16$
6969
- items:
7070
pattern: c32$
71-
- items:
72-
pattern: c32d-wl$
7371
- items:
7472
pattern: cs32$
7573
- items:
7674
pattern: c64$
77-
- items:
78-
pattern: c64d-wl$
7975
- items:
8076
pattern: cs64$
8177
- items:
@@ -136,6 +132,7 @@ properties:
136132
- renesas,r1ex24128
137133
- samsung,s524ad0xd1
138134
- const: atmel,24c128
135+
- pattern: '^atmel,24c(32|64)d-wl$' # Actual vendor is st
139136

140137
label:
141138
description: Descriptive name of the EEPROM.

Documentation/devicetree/bindings/pwm/mediatek,pwm-disp.yaml

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -52,6 +52,9 @@ properties:
5252
- const: main
5353
- const: mm
5454

55+
power-domains:
56+
maxItems: 1
57+
5558
required:
5659
- compatible
5760
- reg

Documentation/devicetree/bindings/serial/atmel,at91-usart.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ $schema: http://devicetree.org/meta-schemas/core.yaml#
88
title: Atmel Universal Synchronous Asynchronous Receiver/Transmitter (USART)
99

1010
maintainers:
11-
- Richard Genoud <richard.genoud@gmail.com>
11+
- Richard Genoud <richard.genoud@bootlin.com>
1212

1313
properties:
1414
compatible:

Documentation/devicetree/bindings/soc/rockchip/grf.yaml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -171,6 +171,7 @@ allOf:
171171
unevaluatedProperties: false
172172

173173
pcie-phy:
174+
type: object
174175
description:
175176
Documentation/devicetree/bindings/phy/rockchip-pcie-phy.txt
176177

Documentation/mm/page_owner.rst

Lines changed: 38 additions & 35 deletions
Original file line numberDiff line numberDiff line change
@@ -24,10 +24,10 @@ fragmentation statistics can be obtained through gfp flag information of
2424
each page. It is already implemented and activated if page owner is
2525
enabled. Other usages are more than welcome.
2626

27-
It can also be used to show all the stacks and their outstanding
28-
allocations, which gives us a quick overview of where the memory is going
29-
without the need to screen through all the pages and match the allocation
30-
and free operation.
27+
It can also be used to show all the stacks and their current number of
28+
allocated base pages, which gives us a quick overview of where the memory
29+
is going without the need to screen through all the pages and match the
30+
allocation and free operation.
3131

3232
page owner is disabled by default. So, if you'd like to use it, you need
3333
to add "page_owner=on" to your boot cmdline. If the kernel is built
@@ -75,42 +75,45 @@ Usage
7575

7676
cat /sys/kernel/debug/page_owner_stacks/show_stacks > stacks.txt
7777
cat stacks.txt
78-
prep_new_page+0xa9/0x120
79-
get_page_from_freelist+0x7e6/0x2140
80-
__alloc_pages+0x18a/0x370
81-
new_slab+0xc8/0x580
82-
___slab_alloc+0x1f2/0xaf0
83-
__slab_alloc.isra.86+0x22/0x40
84-
kmem_cache_alloc+0x31b/0x350
85-
__khugepaged_enter+0x39/0x100
86-
dup_mmap+0x1c7/0x5ce
87-
copy_process+0x1afe/0x1c90
88-
kernel_clone+0x9a/0x3c0
89-
__do_sys_clone+0x66/0x90
90-
do_syscall_64+0x7f/0x160
91-
entry_SYSCALL_64_after_hwframe+0x6c/0x74
92-
stack_count: 234
78+
post_alloc_hook+0x177/0x1a0
79+
get_page_from_freelist+0xd01/0xd80
80+
__alloc_pages+0x39e/0x7e0
81+
allocate_slab+0xbc/0x3f0
82+
___slab_alloc+0x528/0x8a0
83+
kmem_cache_alloc+0x224/0x3b0
84+
sk_prot_alloc+0x58/0x1a0
85+
sk_alloc+0x32/0x4f0
86+
inet_create+0x427/0xb50
87+
__sock_create+0x2e4/0x650
88+
inet_ctl_sock_create+0x30/0x180
89+
igmp_net_init+0xc1/0x130
90+
ops_init+0x167/0x410
91+
setup_net+0x304/0xa60
92+
copy_net_ns+0x29b/0x4a0
93+
create_new_namespaces+0x4a1/0x820
94+
nr_base_pages: 16
9395
...
9496
...
9597
echo 7000 > /sys/kernel/debug/page_owner_stacks/count_threshold
9698
cat /sys/kernel/debug/page_owner_stacks/show_stacks> stacks_7000.txt
9799
cat stacks_7000.txt
98-
prep_new_page+0xa9/0x120
99-
get_page_from_freelist+0x7e6/0x2140
100-
__alloc_pages+0x18a/0x370
101-
alloc_pages_mpol+0xdf/0x1e0
102-
folio_alloc+0x14/0x50
103-
filemap_alloc_folio+0xb0/0x100
104-
page_cache_ra_unbounded+0x97/0x180
105-
filemap_fault+0x4b4/0x1200
106-
__do_fault+0x2d/0x110
107-
do_pte_missing+0x4b0/0xa30
108-
__handle_mm_fault+0x7fa/0xb70
109-
handle_mm_fault+0x125/0x300
110-
do_user_addr_fault+0x3c9/0x840
111-
exc_page_fault+0x68/0x150
112-
asm_exc_page_fault+0x22/0x30
113-
stack_count: 8248
100+
post_alloc_hook+0x177/0x1a0
101+
get_page_from_freelist+0xd01/0xd80
102+
__alloc_pages+0x39e/0x7e0
103+
alloc_pages_mpol+0x22e/0x490
104+
folio_alloc+0xd5/0x110
105+
filemap_alloc_folio+0x78/0x230
106+
page_cache_ra_order+0x287/0x6f0
107+
filemap_get_pages+0x517/0x1160
108+
filemap_read+0x304/0x9f0
109+
xfs_file_buffered_read+0xe6/0x1d0 [xfs]
110+
xfs_file_read_iter+0x1f0/0x380 [xfs]
111+
__kernel_read+0x3b9/0x730
112+
kernel_read_file+0x309/0x4d0
113+
__do_sys_finit_module+0x381/0x730
114+
do_syscall_64+0x8d/0x150
115+
entry_SYSCALL_64_after_hwframe+0x62/0x6a
116+
nr_base_pages: 20824
114117
...
115118

116119
cat /sys/kernel/debug/page_owner > page_owner_full.txt

Documentation/process/embargoed-hardware-issues.rst

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -252,7 +252,7 @@ an involved disclosed party. The current ambassadors list:
252252
AMD Tom Lendacky <thomas.lendacky@amd.com>
253253
Ampere Darren Hart <darren@os.amperecomputing.com>
254254
ARM Catalin Marinas <catalin.marinas@arm.com>
255-
IBM Power Anton Blanchard <anton@linux.ibm.com>
255+
IBM Power Michael Ellerman <ellerman@au.ibm.com>
256256
IBM Z Christian Borntraeger <borntraeger@de.ibm.com>
257257
Intel Tony Luck <tony.luck@intel.com>
258258
Qualcomm Trilok Soni <quic_tsoni@quicinc.com>

Documentation/rust/arch-support.rst

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ support corresponds to ``S`` values in the ``MAINTAINERS`` file.
1616
Architecture Level of support Constraints
1717
============= ================ ==============================================
1818
``arm64`` Maintained Little Endian only.
19-
``loongarch`` Maintained -
19+
``loongarch`` Maintained \-
2020
``um`` Maintained ``x86_64`` only.
2121
``x86`` Maintained ``x86_64`` only.
2222
============= ================ ==============================================

0 commit comments

Comments
 (0)