Skip to content

Commit 42b16d3

Browse files
committed
Merge tag 'v6.11' into for-6.12/block
Merge in 6.11 final to get the fix for preventing deadlocks on an elevator switch, as there's a fixup for that patch. * tag 'v6.11': (1788 commits) Linux 6.11 Revert "KVM: VMX: Always honor guest PAT on CPUs that support self-snoop" pinctrl: pinctrl-cy8c95x0: Fix regcache cifs: Fix signature miscalculation mm: avoid leaving partial pfn mappings around in error case drm/xe/client: add missing bo locking in show_meminfo() drm/xe/client: fix deadlock in show_meminfo() drm/xe/oa: Enable Xe2+ PES disaggregation drm/xe/display: fix compat IS_DISPLAY_STEP() range end drm/xe: Fix access_ok check in user_fence_create drm/xe: Fix possible UAF in guc_exec_queue_process_msg drm/xe: Remove fence check from send_tlb_invalidation drm/xe/gt: Remove double include net: netfilter: move nf flowtable bpf initialization in nf_flow_table_module_init() PCI: Fix potential deadlock in pcim_intx() workqueue: Clear worker->pool in the worker thread context net: tighten bad gso csum offset check in virtio_net_hdr netlink: specs: mptcp: fix port endianness net: dpaa: Pad packets to ETH_ZLEN mptcp: pm: Fix uaf in __timer_delete_sync ...
2 parents 4208c56 + 98f7e32 commit 42b16d3

File tree

1,710 files changed

+21251
-10879
lines changed

Some content is hidden

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

1,710 files changed

+21251
-10879
lines changed

.mailmap

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -60,6 +60,7 @@ Amit Nischal <quic_anischal@quicinc.com> <anischal@codeaurora.org>
6060
Andi Kleen <ak@linux.intel.com> <ak@suse.de>
6161
Andi Shyti <andi@etezian.org> <andi.shyti@samsung.com>
6262
Andreas Herrmann <aherrman@de.ibm.com>
63+
Andreas Hindborg <a.hindborg@kernel.org> <a.hindborg@samsung.com>
6364
Andrej Shadura <andrew.shadura@collabora.co.uk>
6465
Andrej Shadura <andrew@shadura.me> <andrew@beldisplaytech.com>
6566
Andrew Morton <akpm@linux-foundation.org>
@@ -166,6 +167,7 @@ Daniel Borkmann <daniel@iogearbox.net> <dborkman@redhat.com>
166167
Daniel Borkmann <daniel@iogearbox.net> <dxchgb@gmail.com>
167168
David Brownell <david-b@pacbell.net>
168169
David Collins <quic_collinsd@quicinc.com> <collinsd@codeaurora.org>
170+
David Heidelberg <david@ixit.cz> <d.okias@gmail.com>
169171
David Rheinsberg <david@readahead.eu> <dh.herrmann@gmail.com>
170172
David Rheinsberg <david@readahead.eu> <dh.herrmann@googlemail.com>
171173
David Rheinsberg <david@readahead.eu> <david.rheinsberg@gmail.com>
@@ -268,6 +270,7 @@ James Ketrenos <jketreno@io.(none)>
268270
Jan Glauber <jan.glauber@gmail.com> <jang@de.ibm.com>
269271
Jan Glauber <jan.glauber@gmail.com> <jang@linux.vnet.ibm.com>
270272
Jan Glauber <jan.glauber@gmail.com> <jglauber@cavium.com>
273+
Jan Kuliga <jtkuliga.kdev@gmail.com> <jankul@alatek.krakow.pl>
271274
Jarkko Sakkinen <jarkko@kernel.org> <jarkko.sakkinen@linux.intel.com>
272275
Jarkko Sakkinen <jarkko@kernel.org> <jarkko@profian.com>
273276
Jarkko Sakkinen <jarkko@kernel.org> <jarkko.sakkinen@tuni.fi>
@@ -353,6 +356,8 @@ Kenneth Westfield <quic_kwestfie@quicinc.com> <kwestfie@codeaurora.org>
353356
Kiran Gunda <quic_kgunda@quicinc.com> <kgunda@codeaurora.org>
354357
Kirill Tkhai <tkhai@ya.ru> <ktkhai@virtuozzo.com>
355358
Kishon Vijay Abraham I <kishon@kernel.org> <kishon@ti.com>
359+
Konrad Dybcio <konradybcio@kernel.org> <konrad.dybcio@linaro.org>
360+
Konrad Dybcio <konradybcio@kernel.org> <konrad.dybcio@somainline.org>
356361
Konstantin Khlebnikov <koct9i@gmail.com> <khlebnikov@yandex-team.ru>
357362
Konstantin Khlebnikov <koct9i@gmail.com> <k.khlebnikov@samsung.com>
358363
Koushik <raghavendra.koushik@neterion.com>
@@ -524,6 +529,7 @@ Pavankumar Kondeti <quic_pkondeti@quicinc.com> <pkondeti@codeaurora.org>
524529
Peter A Jonsson <pj@ludd.ltu.se>
525530
Peter Oruba <peter.oruba@amd.com>
526531
Peter Oruba <peter@oruba.de>
532+
Pierre-Louis Bossart <pierre-louis.bossart@linux.dev> <pierre-louis.bossart@linux.intel.com>
527533
Pratyush Anand <pratyush.anand@gmail.com> <pratyush.anand@st.com>
528534
Praveen BP <praveenbp@ti.com>
529535
Pradeep Kumar Chitrapu <quic_pradeepc@quicinc.com> <pradeepc@codeaurora.org>
@@ -613,6 +619,7 @@ Simon Kelley <simon@thekelleys.org.uk>
613619
Sricharan Ramabadhran <quic_srichara@quicinc.com> <sricharan@codeaurora.org>
614620
Srinivas Ramana <quic_sramana@quicinc.com> <sramana@codeaurora.org>
615621
Sriram R <quic_srirrama@quicinc.com> <srirrama@codeaurora.org>
622+
Sriram Yagnaraman <sriram.yagnaraman@ericsson.com> <sriram.yagnaraman@est.tech>
616623
Stanislav Fomichev <sdf@fomichev.me> <sdf@google.com>
617624
Stefan Wahren <wahrenst@gmx.net> <stefan.wahren@i2se.com>
618625
Stéphane Witzmann <stephane.witzmann@ubpmes.univ-bpclermont.fr>

Documentation/ABI/testing/sysfs-bus-i2c-devices-turris-omnia-mcu

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -32,9 +32,9 @@ Description: (RW) The front button on the Turris Omnia router can be
3232
interrupt.
3333

3434
This file switches between these two modes:
35-
- "mcu" makes the button press event be handled by the MCU to
36-
change the LEDs panel intensity.
37-
- "cpu" makes the button press event be handled by the CPU.
35+
- ``mcu`` makes the button press event be handled by the MCU to
36+
change the LEDs panel intensity.
37+
- ``cpu`` makes the button press event be handled by the CPU.
3838

3939
Format: %s.
4040

Documentation/ABI/testing/sysfs-devices-system-cpu

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -562,7 +562,8 @@ Description: Control Symmetric Multi Threading (SMT)
562562
================ =========================================
563563

564564
If control status is "forceoff" or "notsupported" writes
565-
are rejected.
565+
are rejected. Note that enabling SMT on PowerPC skips
566+
offline cores.
566567

567568
What: /sys/devices/system/cpu/cpuX/power/energy_perf_bias
568569
Date: March 2019

Documentation/ABI/testing/sysfs-timecard

Lines changed: 18 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -258,24 +258,29 @@ Description: (RW) When retrieving the PHC with the PTP SYS_OFFSET_EXTENDED
258258
the estimated point where the FPGA latches the PHC time. This
259259
value may be changed by writing an unsigned integer.
260260

261-
What: /sys/class/timecard/ocpN/ttyGNSS
262-
What: /sys/class/timecard/ocpN/ttyGNSS2
263-
Date: September 2021
261+
What: /sys/class/timecard/ocpN/tty
262+
Date: August 2024
263+
Contact: Vadim Fedorenko <vadim.fedorenko@linux.dev>
264+
Description: (RO) Directory containing the sysfs nodes for TTY attributes
265+
266+
What: /sys/class/timecard/ocpN/tty/ttyGNSS
267+
What: /sys/class/timecard/ocpN/tty/ttyGNSS2
268+
Date: August 2024
264269
Contact: Jonathan Lemon <jonathan.lemon@gmail.com>
265-
Description: These optional attributes link to the TTY serial ports
266-
associated with the GNSS devices.
270+
Description: (RO) These optional attributes contain names of the TTY serial
271+
ports associated with the GNSS devices.
267272

268-
What: /sys/class/timecard/ocpN/ttyMAC
269-
Date: September 2021
273+
What: /sys/class/timecard/ocpN/tty/ttyMAC
274+
Date: August 2024
270275
Contact: Jonathan Lemon <jonathan.lemon@gmail.com>
271-
Description: This optional attribute links to the TTY serial port
272-
associated with the Miniature Atomic Clock.
276+
Description: (RO) This optional attribute contains name of the TTY serial
277+
port associated with the Miniature Atomic Clock.
273278

274-
What: /sys/class/timecard/ocpN/ttyNMEA
275-
Date: September 2021
279+
What: /sys/class/timecard/ocpN/tty/ttyNMEA
280+
Date: August 2024
276281
Contact: Jonathan Lemon <jonathan.lemon@gmail.com>
277-
Description: This optional attribute links to the TTY serial port
278-
which outputs the PHC time in NMEA ZDA format.
282+
Description: (RO) This optional attribute contains name of the TTY serial
283+
port which outputs the PHC time in NMEA ZDA format.
279284

280285
What: /sys/class/timecard/ocpN/utc_tai_offset
281286
Date: September 2021

Documentation/admin-guide/cgroup-v2.rst

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1717,9 +1717,10 @@ The following nested keys are defined.
17171717
entries fault back in or are written out to disk.
17181718

17191719
memory.zswap.writeback
1720-
A read-write single value file. The default value is "1". The
1721-
initial value of the root cgroup is 1, and when a new cgroup is
1722-
created, it inherits the current value of its parent.
1720+
A read-write single value file. The default value is "1".
1721+
Note that this setting is hierarchical, i.e. the writeback would be
1722+
implicitly disabled for child cgroups if the upper hierarchy
1723+
does so.
17231724

17241725
When this is set to 0, all swapping attempts to swapping devices
17251726
are disabled. This included both zswap writebacks, and swapping due

Documentation/admin-guide/cifs/usage.rst

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -742,7 +742,7 @@ SecurityFlags Flags which control security negotiation and
742742
may use NTLMSSP 0x00080
743743
must use NTLMSSP 0x80080
744744
seal (packet encryption) 0x00040
745-
must seal (not implemented yet) 0x40040
745+
must seal 0x40040
746746

747747
cifsFYI If set to non-zero value, additional debug information
748748
will be logged to the system error log. This field

Documentation/admin-guide/device-mapper/dm-crypt.rst

Lines changed: 8 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -162,13 +162,14 @@ iv_large_sectors
162162

163163

164164
Module parameters::
165-
max_read_size
166-
max_write_size
167-
Maximum size of read or write requests. When a request larger than this size
168-
is received, dm-crypt will split the request. The splitting improves
169-
concurrency (the split requests could be encrypted in parallel by multiple
170-
cores), but it also causes overhead. The user should tune these parameters to
171-
fit the actual workload.
165+
166+
max_read_size
167+
max_write_size
168+
Maximum size of read or write requests. When a request larger than this size
169+
is received, dm-crypt will split the request. The splitting improves
170+
concurrency (the split requests could be encrypted in parallel by multiple
171+
cores), but it also causes overhead. The user should tune these parameters to
172+
fit the actual workload.
172173

173174

174175
Example scripts

Documentation/admin-guide/kernel-parameters.txt

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -4798,11 +4798,9 @@
47984798

47994799
profile= [KNL] Enable kernel profiling via /proc/profile
48004800
Format: [<profiletype>,]<number>
4801-
Param: <profiletype>: "schedule", "sleep", or "kvm"
4801+
Param: <profiletype>: "schedule" or "kvm"
48024802
[defaults to kernel profiling]
48034803
Param: "schedule" - profile schedule points.
4804-
Param: "sleep" - profile D-state sleeping (millisecs).
4805-
Requires CONFIG_SCHEDSTATS
48064804
Param: "kvm" - profile VM exits.
48074805
Param: <number> - step/bucket size as a power of 2 for
48084806
statistical time based profiling.

Documentation/arch/arm64/silicon-errata.rst

Lines changed: 18 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -122,10 +122,18 @@ stable kernels.
122122
+----------------+-----------------+-----------------+-----------------------------+
123123
| ARM | Cortex-A76 | #1490853 | N/A |
124124
+----------------+-----------------+-----------------+-----------------------------+
125+
| ARM | Cortex-A76 | #3324349 | ARM64_ERRATUM_3194386 |
126+
+----------------+-----------------+-----------------+-----------------------------+
125127
| ARM | Cortex-A77 | #1491015 | N/A |
126128
+----------------+-----------------+-----------------+-----------------------------+
127129
| ARM | Cortex-A77 | #1508412 | ARM64_ERRATUM_1508412 |
128130
+----------------+-----------------+-----------------+-----------------------------+
131+
| ARM | Cortex-A77 | #3324348 | ARM64_ERRATUM_3194386 |
132+
+----------------+-----------------+-----------------+-----------------------------+
133+
| ARM | Cortex-A78 | #3324344 | ARM64_ERRATUM_3194386 |
134+
+----------------+-----------------+-----------------+-----------------------------+
135+
| ARM | Cortex-A78C | #3324346,3324347| ARM64_ERRATUM_3194386 |
136+
+----------------+-----------------+-----------------+-----------------------------+
129137
| ARM | Cortex-A710 | #2119858 | ARM64_ERRATUM_2119858 |
130138
+----------------+-----------------+-----------------+-----------------------------+
131139
| ARM | Cortex-A710 | #2054223 | ARM64_ERRATUM_2054223 |
@@ -138,8 +146,14 @@ stable kernels.
138146
+----------------+-----------------+-----------------+-----------------------------+
139147
| ARM | Cortex-A720 | #3456091 | ARM64_ERRATUM_3194386 |
140148
+----------------+-----------------+-----------------+-----------------------------+
149+
| ARM | Cortex-A725 | #3456106 | ARM64_ERRATUM_3194386 |
150+
+----------------+-----------------+-----------------+-----------------------------+
141151
| ARM | Cortex-X1 | #1502854 | N/A |
142152
+----------------+-----------------+-----------------+-----------------------------+
153+
| ARM | Cortex-X1 | #3324344 | ARM64_ERRATUM_3194386 |
154+
+----------------+-----------------+-----------------+-----------------------------+
155+
| ARM | Cortex-X1C | #3324346 | ARM64_ERRATUM_3194386 |
156+
+----------------+-----------------+-----------------+-----------------------------+
143157
| ARM | Cortex-X2 | #2119858 | ARM64_ERRATUM_2119858 |
144158
+----------------+-----------------+-----------------+-----------------------------+
145159
| ARM | Cortex-X2 | #2224489 | ARM64_ERRATUM_2224489 |
@@ -160,6 +174,8 @@ stable kernels.
160174
+----------------+-----------------+-----------------+-----------------------------+
161175
| ARM | Neoverse-N1 | #1542419 | ARM64_ERRATUM_1542419 |
162176
+----------------+-----------------+-----------------+-----------------------------+
177+
| ARM | Neoverse-N1 | #3324349 | ARM64_ERRATUM_3194386 |
178+
+----------------+-----------------+-----------------+-----------------------------+
163179
| ARM | Neoverse-N2 | #2139208 | ARM64_ERRATUM_2139208 |
164180
+----------------+-----------------+-----------------+-----------------------------+
165181
| ARM | Neoverse-N2 | #2067961 | ARM64_ERRATUM_2067961 |
@@ -170,6 +186,8 @@ stable kernels.
170186
+----------------+-----------------+-----------------+-----------------------------+
171187
| ARM | Neoverse-V1 | #1619801 | N/A |
172188
+----------------+-----------------+-----------------+-----------------------------+
189+
| ARM | Neoverse-V1 | #3324341 | ARM64_ERRATUM_3194386 |
190+
+----------------+-----------------+-----------------+-----------------------------+
173191
| ARM | Neoverse-V2 | #3324336 | ARM64_ERRATUM_3194386 |
174192
+----------------+-----------------+-----------------+-----------------------------+
175193
| ARM | Neoverse-V3 | #3312417 | ARM64_ERRATUM_3194386 |

Documentation/arch/riscv/hwprobe.rst

Lines changed: 22 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -239,25 +239,33 @@ The following keys are defined:
239239
ratified in commit 98918c844281 ("Merge pull request #1217 from
240240
riscv/zawrs") of riscv-isa-manual.
241241

242-
* :c:macro:`RISCV_HWPROBE_KEY_CPUPERF_0`: A bitmask that contains performance
243-
information about the selected set of processors.
242+
* :c:macro:`RISCV_HWPROBE_KEY_CPUPERF_0`: Deprecated. Returns similar values to
243+
:c:macro:`RISCV_HWPROBE_KEY_MISALIGNED_SCALAR_PERF`, but the key was
244+
mistakenly classified as a bitmask rather than a value.
244245

245-
* :c:macro:`RISCV_HWPROBE_MISALIGNED_UNKNOWN`: The performance of misaligned
246-
accesses is unknown.
246+
* :c:macro:`RISCV_HWPROBE_KEY_MISALIGNED_SCALAR_PERF`: An enum value describing
247+
the performance of misaligned scalar native word accesses on the selected set
248+
of processors.
247249

248-
* :c:macro:`RISCV_HWPROBE_MISALIGNED_EMULATED`: Misaligned accesses are
249-
emulated via software, either in or below the kernel. These accesses are
250-
always extremely slow.
250+
* :c:macro:`RISCV_HWPROBE_MISALIGNED_SCALAR_UNKNOWN`: The performance of
251+
misaligned scalar accesses is unknown.
251252

252-
* :c:macro:`RISCV_HWPROBE_MISALIGNED_SLOW`: Misaligned accesses are slower
253-
than equivalent byte accesses. Misaligned accesses may be supported
254-
directly in hardware, or trapped and emulated by software.
253+
* :c:macro:`RISCV_HWPROBE_MISALIGNED_SCALAR_EMULATED`: Misaligned scalar
254+
accesses are emulated via software, either in or below the kernel. These
255+
accesses are always extremely slow.
255256

256-
* :c:macro:`RISCV_HWPROBE_MISALIGNED_FAST`: Misaligned accesses are faster
257-
than equivalent byte accesses.
257+
* :c:macro:`RISCV_HWPROBE_MISALIGNED_SCALAR_SLOW`: Misaligned scalar native
258+
word sized accesses are slower than the equivalent quantity of byte
259+
accesses. Misaligned accesses may be supported directly in hardware, or
260+
trapped and emulated by software.
258261

259-
* :c:macro:`RISCV_HWPROBE_MISALIGNED_UNSUPPORTED`: Misaligned accesses are
260-
not supported at all and will generate a misaligned address fault.
262+
* :c:macro:`RISCV_HWPROBE_MISALIGNED_SCALAR_FAST`: Misaligned scalar native
263+
word sized accesses are faster than the equivalent quantity of byte
264+
accesses.
265+
266+
* :c:macro:`RISCV_HWPROBE_MISALIGNED_SCALAR_UNSUPPORTED`: Misaligned scalar
267+
accesses are not supported at all and will generate a misaligned address
268+
fault.
261269

262270
* :c:macro:`RISCV_HWPROBE_KEY_ZICBOZ_BLOCK_SIZE`: An unsigned int which
263271
represents the size of the Zicboz block in bytes.

0 commit comments

Comments
 (0)