Skip to content

Commit b7c2686

Browse files
committed
regmap: Merge up v6.4-rc6
The fix for maple tree RCU locking on sync is a dependency for the block sync code for the maple tree.
2 parents 99e8dd3 + 858fd16 commit b7c2686

1,065 files changed

Lines changed: 8633 additions & 4641 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/cgroup-v2.rst

Lines changed: 10 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -1213,23 +1213,25 @@ PAGE_SIZE multiple when read back.
12131213
A read-write single value file which exists on non-root
12141214
cgroups. The default is "max".
12151215

1216-
Memory usage throttle limit. This is the main mechanism to
1217-
control memory usage of a cgroup. If a cgroup's usage goes
1216+
Memory usage throttle limit. If a cgroup's usage goes
12181217
over the high boundary, the processes of the cgroup are
12191218
throttled and put under heavy reclaim pressure.
12201219

12211220
Going over the high limit never invokes the OOM killer and
1222-
under extreme conditions the limit may be breached.
1221+
under extreme conditions the limit may be breached. The high
1222+
limit should be used in scenarios where an external process
1223+
monitors the limited cgroup to alleviate heavy reclaim
1224+
pressure.
12231225

12241226
memory.max
12251227
A read-write single value file which exists on non-root
12261228
cgroups. The default is "max".
12271229

1228-
Memory usage hard limit. This is the final protection
1229-
mechanism. If a cgroup's memory usage reaches this limit and
1230-
can't be reduced, the OOM killer is invoked in the cgroup.
1231-
Under certain circumstances, the usage may go over the limit
1232-
temporarily.
1230+
Memory usage hard limit. This is the main mechanism to limit
1231+
memory usage of a cgroup. If a cgroup's memory usage reaches
1232+
this limit and can't be reduced, the OOM killer is invoked in
1233+
the cgroup. Under certain circumstances, the usage may go
1234+
over the limit temporarily.
12331235

12341236
In default configuration regular 0-order allocations always
12351237
succeed unless OOM killer chooses current task as a victim.
@@ -1238,10 +1240,6 @@ PAGE_SIZE multiple when read back.
12381240
Caller could retry them differently, return into userspace
12391241
as -ENOMEM or silently ignore in cases like disk readahead.
12401242

1241-
This is the ultimate protection mechanism. As long as the
1242-
high limit is used and monitored properly, this limit's
1243-
utility is limited to providing the final safety net.
1244-
12451243
memory.reclaim
12461244
A write-only nested-keyed file which exists for all cgroups.
12471245

Documentation/admin-guide/cifs/changes.rst

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,5 +5,5 @@ Changes
55
See https://wiki.samba.org/index.php/LinuxCIFSKernel for summary
66
information about fixes/improvements to CIFS/SMB2/SMB3 support (changes
77
to cifs.ko module) by kernel version (and cifs internal module version).
8-
This may be easier to read than parsing the output of "git log fs/cifs"
9-
by release.
8+
This may be easier to read than parsing the output of
9+
"git log fs/smb/client" by release.

Documentation/admin-guide/cifs/usage.rst

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -45,7 +45,7 @@ Installation instructions
4545

4646
If you have built the CIFS vfs as module (successfully) simply
4747
type ``make modules_install`` (or if you prefer, manually copy the file to
48-
the modules directory e.g. /lib/modules/2.4.10-4GB/kernel/fs/cifs/cifs.ko).
48+
the modules directory e.g. /lib/modules/6.3.0-060300-generic/kernel/fs/smb/client/cifs.ko).
4949

5050
If you have built the CIFS vfs into the kernel itself, follow the instructions
5151
for your distribution on how to install a new kernel (usually you
@@ -66,15 +66,15 @@ If cifs is built as a module, then the size and number of network buffers
6666
and maximum number of simultaneous requests to one server can be configured.
6767
Changing these from their defaults is not recommended. By executing modinfo::
6868

69-
modinfo kernel/fs/cifs/cifs.ko
69+
modinfo <path to cifs.ko>
7070

71-
on kernel/fs/cifs/cifs.ko the list of configuration changes that can be made
71+
on kernel/fs/smb/client/cifs.ko the list of configuration changes that can be made
7272
at module initialization time (by running insmod cifs.ko) can be seen.
7373

7474
Recommendations
7575
===============
7676

77-
To improve security the SMB2.1 dialect or later (usually will get SMB3) is now
77+
To improve security the SMB2.1 dialect or later (usually will get SMB3.1.1) is now
7878
the new default. To use old dialects (e.g. to mount Windows XP) use "vers=1.0"
7979
on mount (or vers=2.0 for Windows Vista). Note that the CIFS (vers=1.0) is
8080
much older and less secure than the default dialect SMB3 which includes

Documentation/devicetree/bindings/cache/qcom,llcc.yaml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -129,6 +129,7 @@ allOf:
129129
- qcom,sm8250-llcc
130130
- qcom,sm8350-llcc
131131
- qcom,sm8450-llcc
132+
- qcom,sm8550-llcc
132133
then:
133134
properties:
134135
reg:

Documentation/devicetree/bindings/fpga/lattice,sysconfig.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ $schema: http://devicetree.org/meta-schemas/core.yaml#
77
title: Lattice Slave SPI sysCONFIG FPGA manager
88

99
maintainers:
10-
- Ivan Bornyakov <i.bornyakov@metrotek.ru>
10+
- Vladimir Georgiev <v.georgiev@metrotek.ru>
1111

1212
description: |
1313
Lattice sysCONFIG port, which is used for FPGA configuration, among others,

Documentation/devicetree/bindings/fpga/microchip,mpf-spi-fpga-mgr.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ $schema: http://devicetree.org/meta-schemas/core.yaml#
77
title: Microchip Polarfire FPGA manager.
88

99
maintainers:
10-
- Ivan Bornyakov <i.bornyakov@metrotek.ru>
10+
- Vladimir Georgiev <v.georgiev@metrotek.ru>
1111

1212
description:
1313
Device Tree Bindings for Microchip Polarfire FPGA Manager using slave SPI to

Documentation/devicetree/bindings/iio/adc/nxp,imx8qxp-adc.yaml

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -39,6 +39,12 @@ properties:
3939
power-domains:
4040
maxItems: 1
4141

42+
vref-supply:
43+
description: |
44+
External ADC reference voltage supply on VREFH pad. If VERID[MVI] is
45+
set, there are additional, internal reference voltages selectable.
46+
VREFH1 is always from VREFH pad.
47+
4248
"#io-channel-cells":
4349
const: 1
4450

@@ -72,6 +78,7 @@ examples:
7278
assigned-clocks = <&clk IMX_SC_R_ADC_0>;
7379
assigned-clock-rates = <24000000>;
7480
power-domains = <&pd IMX_SC_R_ADC_0>;
81+
vref-supply = <&reg_1v8>;
7582
#io-channel-cells = <1>;
7683
};
7784
};

Documentation/devicetree/bindings/iio/adc/renesas,rcar-gyroadc.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -90,7 +90,7 @@ patternProperties:
9090
of the MAX chips to the GyroADC, while MISO line of each Maxim
9191
ADC connects to a shared input pin of the GyroADC.
9292
enum:
93-
- adi,7476
93+
- adi,ad7476
9494
- fujitsu,mb88101a
9595
- maxim,max1162
9696
- maxim,max11100

Documentation/devicetree/bindings/interrupt-controller/arm,gic-v3.yaml

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -166,6 +166,12 @@ properties:
166166
resets:
167167
maxItems: 1
168168

169+
mediatek,broken-save-restore-fw:
170+
type: boolean
171+
description:
172+
Asserts that the firmware on this device has issues saving and restoring
173+
GICR registers when the GIC redistributors are powered off.
174+
169175
dependencies:
170176
mbi-ranges: [ msi-controller ]
171177
msi-controller: [ mbi-ranges ]

Documentation/devicetree/bindings/power/qcom,rpmpd.yaml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -29,6 +29,7 @@ properties:
2929
- qcom,qcm2290-rpmpd
3030
- qcom,qcs404-rpmpd
3131
- qcom,qdu1000-rpmhpd
32+
- qcom,sa8155p-rpmhpd
3233
- qcom,sa8540p-rpmhpd
3334
- qcom,sa8775p-rpmhpd
3435
- qcom,sdm660-rpmpd

0 commit comments

Comments
 (0)