Skip to content

Commit 7e42dad

Browse files
author
Russ Weight
committed
Merge stable kernel version 5.10.23
2 parents a4eef39 + dfbf345 commit 7e42dad

846 files changed

Lines changed: 8444 additions & 3971 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/perf/arm-cmn.rst

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ PMU events
1717
----------
1818

1919
The PMU driver registers a single PMU device for the whole interconnect,
20-
see /sys/bus/event_source/devices/arm_cmn. Multi-chip systems may link
20+
see /sys/bus/event_source/devices/arm_cmn_0. Multi-chip systems may link
2121
more than one CMN together via external CCIX links - in this situation,
2222
each mesh counts its own events entirely independently, and additional
2323
PMU devices will be named arm_cmn_{1..n}.

Documentation/admin-guide/sysctl/vm.rst

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -978,11 +978,11 @@ that benefit from having their data cached, zone_reclaim_mode should be
978978
left disabled as the caching effect is likely to be more important than
979979
data locality.
980980

981-
zone_reclaim may be enabled if it's known that the workload is partitioned
982-
such that each partition fits within a NUMA node and that accessing remote
983-
memory would cause a measurable performance reduction. The page allocator
984-
will then reclaim easily reusable pages (those page cache pages that are
985-
currently not used) before allocating off node pages.
981+
Consider enabling one or more zone_reclaim mode bits if it's known that the
982+
workload is partitioned such that each partition fits within a NUMA node
983+
and that accessing remote memory would cause a measurable performance
984+
reduction. The page allocator will take additional actions before
985+
allocating off node pages.
986986

987987
Allowing zone reclaim to write out pages stops processes that are
988988
writing large amounts of data from dirtying pages on other nodes. Zone

Documentation/devicetree/bindings/net/btusb.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,7 @@ Following example uses irq pin number 3 of gpio0 for out of band wake-on-bt:
3838
compatible = "usb1286,204e";
3939
reg = <1>;
4040
interrupt-parent = <&gpio0>;
41-
interrupt-name = "wakeup";
41+
interrupt-names = "wakeup";
4242
interrupts = <3 IRQ_TYPE_LEVEL_LOW>;
4343
};
4444
};

Documentation/devicetree/bindings/net/ethernet-controller.yaml

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -206,6 +206,11 @@ properties:
206206
Indicates that full-duplex is used. When absent, half
207207
duplex is assumed.
208208

209+
pause:
210+
$ref: /schemas/types.yaml#definitions/flag
211+
description:
212+
Indicates that pause should be enabled.
213+
209214
asym-pause:
210215
$ref: /schemas/types.yaml#definitions/flag
211216
description:

Documentation/filesystems/seq_file.rst

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -217,6 +217,12 @@ between the calls to start() and stop(), so holding a lock during that time
217217
is a reasonable thing to do. The seq_file code will also avoid taking any
218218
other locks while the iterator is active.
219219

220+
The iterater value returned by start() or next() is guaranteed to be
221+
passed to a subsequent next() or stop() call. This allows resources
222+
such as locks that were taken to be reliably released. There is *no*
223+
guarantee that the iterator will be passed to show(), though in practice
224+
it often will be.
225+
220226

221227
Formatted output
222228
================

Documentation/networking/ip-sysctl.rst

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -630,16 +630,15 @@ tcp_rmem - vector of 3 INTEGERs: min, default, max
630630

631631
default: initial size of receive buffer used by TCP sockets.
632632
This value overrides net.core.rmem_default used by other protocols.
633-
Default: 87380 bytes. This value results in window of 65535 with
634-
default setting of tcp_adv_win_scale and tcp_app_win:0 and a bit
635-
less for default tcp_app_win. See below about these variables.
633+
Default: 131072 bytes.
634+
This value results in initial window of 65535.
636635

637636
max: maximal size of receive buffer allowed for automatically
638637
selected receiver buffers for TCP socket. This value does not override
639638
net.core.rmem_max. Calling setsockopt() with SO_RCVBUF disables
640639
automatic tuning of that socket's receive buffer size, in which
641640
case this value is ignored.
642-
Default: between 87380B and 6MB, depending on RAM size.
641+
Default: between 131072 and 6MB, depending on RAM size.
643642

644643
tcp_sack - BOOLEAN
645644
Enable select acknowledgments (SACKS).

Documentation/scsi/libsas.rst

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -189,7 +189,6 @@ num_phys
189189
The event interface::
190190

191191
/* LLDD calls these to notify the class of an event. */
192-
void (*notify_ha_event)(struct sas_ha_struct *, enum ha_event);
193192
void (*notify_port_event)(struct sas_phy *, enum port_event);
194193
void (*notify_phy_event)(struct sas_phy *, enum phy_event);
195194

Documentation/security/keys/core.rst

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1040,8 +1040,8 @@ The keyctl syscall functions are:
10401040

10411041
"key" is the ID of the key to be watched.
10421042

1043-
"queue_fd" is a file descriptor referring to an open "/dev/watch_queue"
1044-
which manages the buffer into which notifications will be delivered.
1043+
"queue_fd" is a file descriptor referring to an open pipe which
1044+
manages the buffer into which notifications will be delivered.
10451045

10461046
"filter" is either NULL to remove a watch or a filter specification to
10471047
indicate what events are required from the key.

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 = 5
33
PATCHLEVEL = 10
4-
SUBLEVEL = 19
4+
SUBLEVEL = 23
55
EXTRAVERSION =
66
NAME = Dare mighty things
77

arch/arm/boot/compressed/head.S

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1175,9 +1175,9 @@ __armv4_mmu_cache_off:
11751175
__armv7_mmu_cache_off:
11761176
mrc p15, 0, r0, c1, c0
11771177
#ifdef CONFIG_MMU
1178-
bic r0, r0, #0x000d
1178+
bic r0, r0, #0x0005
11791179
#else
1180-
bic r0, r0, #0x000c
1180+
bic r0, r0, #0x0004
11811181
#endif
11821182
mcr p15, 0, r0, c1, c0 @ turn MMU and cache off
11831183
mov r0, #0

0 commit comments

Comments
 (0)