Skip to content

Commit ab809ef

Browse files
committed
Merge remote-tracking branch 'torvalds/master' into perf/core
To sync with libbpf, etc. Signed-off-by: Arnaldo Carvalho de Melo <[email protected]>
2 parents 17f248a + d2d11f3 commit ab809ef

File tree

483 files changed

+4340
-2189
lines changed

Some content is hidden

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

483 files changed

+4340
-2189
lines changed

.mailmap

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -130,6 +130,7 @@ Domen Puncer <[email protected]>
130130
Douglas Gilbert <[email protected]>
131131
Ed L. Cashin <[email protected]>
132132
133+
133134
Evgeniy Polyakov <[email protected]>
134135
135136
Felipe W Damasio <[email protected]>
@@ -214,6 +215,7 @@ Jisheng Zhang <[email protected]> <[email protected]>
214215
215216
216217
218+
217219
John Paul Adrian Glaubitz <[email protected]>
218220
John Stultz <[email protected]>
219221

CREDITS

Lines changed: 15 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1173,6 +1173,10 @@ D: Future Domain TMC-16x0 SCSI driver (author)
11731173
D: APM driver (early port)
11741174
D: DRM drivers (author of several)
11751175

1176+
N: Veaceslav Falico
1177+
1178+
D: Co-maintainer and co-author of the network bonding driver.
1179+
11761180
N: János Farkas
11771181
11781182
D: romfs, various (mostly networking) fixes
@@ -2489,6 +2493,13 @@ D: XF86_Mach8
24892493
D: XF86_8514
24902494
D: cfdisk (curses based disk partitioning program)
24912495

2496+
N: Mat Martineau
2497+
2498+
D: MPTCP subsystem co-maintainer 2020-2023
2499+
D: Keyctl restricted keyring and Diffie-Hellman UAPI
2500+
D: Bluetooth L2CAP ERTM mode and AMP
2501+
S: USA
2502+
24922503
N: John S. Marvin
24932504
24942505
D: PA-RISC port
@@ -4172,6 +4183,10 @@ S: B-1206 Jingmao Guojigongyu
41724183
S: 16 Baliqiao Nanjie, Beijing 101100
41734184
S: People's Repulic of China
41744185

4186+
N: Vlad Yasevich
4187+
4188+
D: SCTP protocol maintainer.
4189+
41754190
N: Aviad Yehezkel
41764191
41774192
D: Kernel TLS implementation and offload support.

Documentation/admin-guide/cgroup-v2.rst

Lines changed: 6 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1245,13 +1245,17 @@ PAGE_SIZE multiple when read back.
12451245
This is a simple interface to trigger memory reclaim in the
12461246
target cgroup.
12471247

1248-
This file accepts a string which contains the number of bytes to
1249-
reclaim.
1248+
This file accepts a single key, the number of bytes to reclaim.
1249+
No nested keys are currently supported.
12501250

12511251
Example::
12521252

12531253
echo "1G" > memory.reclaim
12541254

1255+
The interface can be later extended with nested keys to
1256+
configure the reclaim behavior. For example, specify the
1257+
type of memory to reclaim from (anon, file, ..).
1258+
12551259
Please note that the kernel can over or under reclaim from
12561260
the target cgroup. If less bytes are reclaimed than the
12571261
specified amount, -EAGAIN is returned.
@@ -1263,13 +1267,6 @@ PAGE_SIZE multiple when read back.
12631267
This means that the networking layer will not adapt based on
12641268
reclaim induced by memory.reclaim.
12651269

1266-
This file also allows the user to specify the nodes to reclaim from,
1267-
via the 'nodes=' key, for example::
1268-
1269-
echo "1G nodes=0,1" > memory.reclaim
1270-
1271-
The above instructs the kernel to reclaim memory from nodes 0,1.
1272-
12731270
memory.peak
12741271
A read-only single value file which exists on non-root
12751272
cgroups.

Documentation/devicetree/bindings/i2c/renesas,rzv2m.yaml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ properties:
1616
compatible:
1717
items:
1818
- enum:
19-
- renesas,i2c-r9a09g011 # RZ/V2M
19+
- renesas,r9a09g011-i2c # RZ/V2M
2020
- const: renesas,rzv2m-i2c
2121

2222
reg:
@@ -66,7 +66,7 @@ examples:
6666
#include <dt-bindings/interrupt-controller/arm-gic.h>
6767
6868
i2c0: i2c@a4030000 {
69-
compatible = "renesas,i2c-r9a09g011", "renesas,rzv2m-i2c";
69+
compatible = "renesas,r9a09g011-i2c", "renesas,rzv2m-i2c";
7070
reg = <0xa4030000 0x80>;
7171
interrupts = <GIC_SPI 232 IRQ_TYPE_EDGE_RISING>,
7272
<GIC_SPI 236 IRQ_TYPE_EDGE_RISING>;

Documentation/devicetree/bindings/regulator/samsung,s2mps14.yaml

Lines changed: 19 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -19,8 +19,8 @@ description: |
1919
additional information and example.
2020
2121
patternProperties:
22-
# 25 LDOs
23-
"^LDO([1-9]|[1][0-9]|2[0-5])$":
22+
# 25 LDOs, without LDO10-12
23+
"^LDO([1-9]|1[3-9]|2[0-5])$":
2424
type: object
2525
$ref: regulator.yaml#
2626
unevaluatedProperties: false
@@ -30,6 +30,23 @@ patternProperties:
3030
required:
3131
- regulator-name
3232

33+
"^LDO(1[0-2])$":
34+
type: object
35+
$ref: regulator.yaml#
36+
unevaluatedProperties: false
37+
description:
38+
Properties for single LDO regulator.
39+
40+
properties:
41+
samsung,ext-control-gpios:
42+
maxItems: 1
43+
description:
44+
LDO10, LDO11 and LDO12 can be configured to external control over
45+
GPIO.
46+
47+
required:
48+
- regulator-name
49+
3350
# 5 bucks
3451
"^BUCK[1-5]$":
3552
type: object

Documentation/devicetree/bindings/riscv/cpus.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -83,7 +83,7 @@ properties:
8383
insensitive, letters in the riscv,isa string must be all
8484
lowercase to simplify parsing.
8585
$ref: "/schemas/types.yaml#/definitions/string"
86-
pattern: ^rv(?:64|32)imaf?d?q?c?b?v?k?h?(?:_[hsxz](?:[a-z])+)*$
86+
pattern: ^rv(?:64|32)imaf?d?q?c?b?k?j?p?v?h?(?:[hsxz](?:[a-z])+)?(?:_[hsxz](?:[a-z])+)*$
8787

8888
# RISC-V requires 'timebase-frequency' in /cpus, so disallow it here
8989
timebase-frequency: false

Documentation/devicetree/bindings/rtc/qcom-pm8xxx-rtc.yaml

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -40,6 +40,8 @@ properties:
4040
description:
4141
Indicates that the setting of RTC time is allowed by the host CPU.
4242

43+
wakeup-source: true
44+
4345
required:
4446
- compatible
4547
- reg

Documentation/devicetree/bindings/sound/everest,es8326.yaml

100755100644
File mode changed.

Documentation/networking/bridge.rst

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ In order to use the Ethernet bridging functionality, you'll need the
88
userspace tools.
99

1010
Documentation for Linux bridging is on:
11-
http://www.linuxfoundation.org/collaborate/workgroups/networking/bridge
11+
https://wiki.linuxfoundation.org/networking/bridge
1212

1313
The bridge-utilities are maintained at:
1414
git://git.kernel.org/pub/scm/linux/kernel/git/shemminger/bridge-utils.git

Documentation/networking/device_drivers/ethernet/intel/ice.rst

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -819,7 +819,7 @@ NAPI
819819
----
820820
This driver supports NAPI (Rx polling mode).
821821
For more information on NAPI, see
822-
https://www.linuxfoundation.org/collaborate/workgroups/networking/napi
822+
https://wiki.linuxfoundation.org/networking/napi
823823

824824

825825
MACVLAN

0 commit comments

Comments
 (0)