Skip to content

Commit 6e0fac6

Browse files
ojedaojeda
authored
Merge pull request torvalds#689 from ojeda/sync
Sync with v5.17-rc6
2 parents d267af1 + b0e0018 commit 6e0fac6

File tree

751 files changed

+6009
-3616
lines changed

Some content is hidden

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

751 files changed

+6009
-3616
lines changed

‎.mailmap

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -333,6 +333,9 @@ Rémi Denis-Courmont <[email protected]>
333333
Ricardo Ribalda <[email protected]> <[email protected]>
334334
Ricardo Ribalda <[email protected]> Ricardo Ribalda Delgado <[email protected]>
335335
Ricardo Ribalda <[email protected]> <[email protected]>
336+
Roman Gushchin <[email protected]> <[email protected]>
337+
Roman Gushchin <[email protected]> <[email protected]>
338+
Roman Gushchin <[email protected]> <[email protected]>
336339
Ross Zwisler <[email protected]> <[email protected]>
337340
Rudolf Marek <[email protected]>
338341
Rui Saraiva <[email protected]>

‎Documentation/ABI/testing/sysfs-class-power

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -468,6 +468,7 @@ Description:
468468
auto: Charge normally, respect thresholds
469469
inhibit-charge: Do not charge while AC is attached
470470
force-discharge: Force discharge while AC is attached
471+
================ ====================================
471472

472473
What: /sys/class/power_supply/<supply_name>/technology
473474
Date: May 2007

‎Documentation/ABI/testing/sysfs-driver-aspeed-uart-routing

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
What: /sys/bus/platform/drivers/aspeed-uart-routing/*/uart*
1+
What: /sys/bus/platform/drivers/aspeed-uart-routing/\*/uart\*
22
Date: September 2021
33
Contact: Oskar Senft <[email protected]>
44
Chia-Wei Wang <[email protected]>
@@ -9,15 +9,15 @@ Description: Selects the RX source of the UARTx device.
99
depends on the selected file.
1010

1111
e.g.
12-
cat /sys/bus/platform/drivers/aspeed-uart-routing/*.uart_routing/uart1
12+
cat /sys/bus/platform/drivers/aspeed-uart-routing/\*.uart_routing/uart1
1313
[io1] io2 io3 io4 uart2 uart3 uart4 io6
1414

1515
In this case, UART1 gets its input from IO1 (physical serial port 1).
1616

1717
Users: OpenBMC. Proposed changes should be mailed to
1818
[email protected]
1919

20-
What: /sys/bus/platform/drivers/aspeed-uart-routing/*/io*
20+
What: /sys/bus/platform/drivers/aspeed-uart-routing/\*/io\*
2121
Date: September 2021
2222
Contact: Oskar Senft <[email protected]>
2323
Chia-Wei Wang <[email protected]>

‎Documentation/core-api/dma-attributes.rst

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -130,3 +130,11 @@ accesses to DMA buffers in both privileged "supervisor" and unprivileged
130130
subsystem that the buffer is fully accessible at the elevated privilege
131131
level (and ideally inaccessible or at least read-only at the
132132
lesser-privileged levels).
133+
134+
DMA_ATTR_OVERWRITE
135+
------------------
136+
137+
This is a hint to the DMA-mapping subsystem that the device is expected to
138+
overwrite the entire mapped size, thus the caller does not require any of the
139+
previous buffer contents to be preserved. This allows bounce-buffering
140+
implementations to optimise DMA_FROM_DEVICE transfers.

‎Documentation/cpu-freq/cpu-drivers.rst

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -75,6 +75,9 @@ And optionally
7575
.resume - A pointer to a per-policy resume function which is called
7676
with interrupts disabled and _before_ the governor is started again.
7777

78+
.ready - A pointer to a per-policy ready function which is called after
79+
the policy is fully initialized.
80+
7881
.attr - A pointer to a NULL-terminated list of "struct freq_attr" which
7982
allow to export values to sysfs.
8083

‎Documentation/dev-tools/kunit/usage.rst

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -242,7 +242,7 @@ example:
242242
243243
int rectangle_area(struct shape *this)
244244
{
245-
struct rectangle *self = container_of(this, struct shape, parent);
245+
struct rectangle *self = container_of(this, struct rectangle, parent);
246246
247247
return self->length * self->width;
248248
};

‎Documentation/devicetree/bindings/arm/omap/omap.txt

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -119,6 +119,9 @@ Boards (incomplete list of examples):
119119
- OMAP3 BeagleBoard : Low cost community board
120120
compatible = "ti,omap3-beagle", "ti,omap3430", "ti,omap3"
121121

122+
- OMAP3 BeagleBoard A to B4 : Early BeagleBoard revisions A to B4 with a timer quirk
123+
compatible = "ti,omap3-beagle-ab4", "ti,omap3-beagle", "ti,omap3430", "ti,omap3"
124+
122125
- OMAP3 Tobi with Overo : Commercial expansion board with daughter board
123126
compatible = "gumstix,omap3-overo-tobi", "gumstix,omap3-overo", "ti,omap3430", "ti,omap3"
124127

‎Documentation/devicetree/bindings/gpio/sifive,gpio.yaml

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,6 @@ $schema: http://devicetree.org/meta-schemas/core.yaml#
77
title: SiFive GPIO controller
88

99
maintainers:
10-
- Yash Shah <[email protected]>
1110
- Paul Walmsley <[email protected]>
1211

1312
properties:

‎Documentation/devicetree/bindings/interrupt-controller/sifive,plic-1.0.0.yaml

Lines changed: 15 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -35,19 +35,28 @@ description:
3535
contains a specific memory layout, which is documented in chapter 8 of the
3636
SiFive U5 Coreplex Series Manual <https://static.dev.sifive.com/U54-MC-RVCoreIP.pdf>.
3737

38+
The thead,c900-plic is different from sifive,plic-1.0.0 in opensbi, the
39+
T-HEAD PLIC implementation requires setting a delegation bit to allow access
40+
from S-mode. So add thead,c900-plic to distinguish them.
41+
3842
maintainers:
3943
- Sagar Kadam <[email protected]>
4044
- Paul Walmsley <[email protected]>
4145
- Palmer Dabbelt <[email protected]>
4246

4347
properties:
4448
compatible:
45-
items:
46-
- enum:
47-
- sifive,fu540-c000-plic
48-
- starfive,jh7100-plic
49-
- canaan,k210-plic
50-
- const: sifive,plic-1.0.0
49+
oneOf:
50+
- items:
51+
- enum:
52+
- sifive,fu540-c000-plic
53+
- starfive,jh7100-plic
54+
- canaan,k210-plic
55+
- const: sifive,plic-1.0.0
56+
- items:
57+
- enum:
58+
- allwinner,sun20i-d1-plic
59+
- const: thead,c900-plic
5160

5261
reg:
5362
maxItems: 1

‎Documentation/devicetree/bindings/mfd/ti,j721e-system-controller.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ description: |
2020
2121
maintainers:
2222
- Kishon Vijay Abraham I <[email protected]>
23-
- Roger Quadros <rogerq@ti.com
23+
- Roger Quadros <rogerq@kernel.org>
2424

2525
properties:
2626
compatible:

‎Documentation/devicetree/bindings/phy/ti,omap-usb2.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ title: OMAP USB2 PHY
88

99
maintainers:
1010
- Kishon Vijay Abraham I <[email protected]>
11-
- Roger Quadros <rogerq@ti.com>
11+
- Roger Quadros <rogerq@kernel.org>
1212

1313
properties:
1414
compatible:

‎Documentation/devicetree/bindings/pwm/pwm-sifive.yaml

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,6 @@ $schema: http://devicetree.org/meta-schemas/core.yaml#
88
title: SiFive PWM controller
99

1010
maintainers:
11-
- Yash Shah <[email protected]>
1211
- Sagar Kadam <[email protected]>
1312
- Paul Walmsley <[email protected]>
1413

‎Documentation/devicetree/bindings/riscv/sifive-l2-cache.yaml

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,6 @@ title: SiFive L2 Cache Controller
99

1010
maintainers:
1111
- Sagar Kadam <[email protected]>
12-
- Yash Shah <[email protected]>
1312
- Paul Walmsley <[email protected]>
1413

1514
description:

‎Documentation/devicetree/bindings/sound/google,cros-ec-codec.yaml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,7 @@ title: Audio codec controlled by ChromeOS EC
88

99
maintainers:
1010
- Cheng-Yi Chiang <[email protected]>
11+
- Tzung-Bi Shih <[email protected]>
1112

1213
description: |
1314
Google's ChromeOS EC codec is a digital mic codec provided by the

‎Documentation/devicetree/bindings/usb/ti,j721e-usb.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: Bindings for the TI wrapper module for the Cadence USBSS-DRD controller
88

99
maintainers:
10-
- Roger Quadros <rogerq@ti.com>
10+
- Roger Quadros <rogerq@kernel.org>
1111

1212
properties:
1313
compatible:

‎Documentation/devicetree/bindings/usb/ti,keystone-dwc3.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: TI Keystone Soc USB Controller
88

99
maintainers:
10-
- Roger Quadros <rogerq@ti.com>
10+
- Roger Quadros <rogerq@kernel.org>
1111

1212
properties:
1313
compatible:

‎Documentation/tools/rtla/common_hist_options.rst

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22

33
Set the histogram bucket size (default *1*).
44

5-
**-e**, **--entries** *N*
5+
**-E**, **--entries** *N*
66

77
Set the number of entries of the histogram (default 256).
88

‎Documentation/tools/rtla/common_osnoise_description.rst

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
The **rtla osnoise** tool is an interface for the *osnoise* tracer. The
22
*osnoise* tracer dispatches a kernel thread per-cpu. These threads read the
33
time in a loop while with preemption, softirq and IRQs enabled, thus
4-
allowing all the sources of operating systme noise during its execution.
4+
allowing all the sources of operating system noise during its execution.
55
The *osnoise*'s tracer threads take note of the delta between each time
66
read, along with an interference counter of all sources of interference.
77
At the end of each period, the *osnoise* tracer displays a summary of

‎Documentation/tools/rtla/rtla-osnoise-hist.rst

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,7 @@ default). The reason for reducing the runtime is to avoid starving the
3636
**rtla** tool. The tool is also set to run for *one minute*. The output
3737
histogram is set to group outputs in buckets of *10us* and *25* entries::
3838

39-
[root@f34 ~/]# rtla osnoise hist -P F:1 -c 0-11 -r 900000 -d 1M -b 10 -e 25
39+
[root@f34 ~/]# rtla osnoise hist -P F:1 -c 0-11 -r 900000 -d 1M -b 10 -E 25
4040
# RTLA osnoise histogram
4141
# Time unit is microseconds (us)
4242
# Duration: 0 00:01:00

‎Documentation/translations/zh_CN/cpu-freq/cpu-drivers.rst

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -84,6 +84,8 @@ CPUfreq核心层注册一个cpufreq_driver结构体。
8484
.resume - 一个指向per-policy恢复函数的指针，该函数在关中断且在调节器再一次启动前被
8585
调用。
8686

87+
.ready - 一个指向per-policy准备函数的指针，该函数在策略完全初始化之后被调用。
88+
8789
.attr - 一个指向NULL结尾的"struct freq_attr"列表的指针，该列表允许导出值到
8890
sysfs。
8991

‎Documentation/virt/kvm/api.rst

Lines changed: 15 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1394,7 +1394,7 @@ documentation when it pops into existence).
13941394
-------------------
13951395

13961396
:Capability: KVM_CAP_ENABLE_CAP
1397-
:Architectures: mips, ppc, s390
1397+
:Architectures: mips, ppc, s390, x86
13981398
:Type: vcpu ioctl
13991399
:Parameters: struct kvm_enable_cap (in)
14001400
:Returns: 0 on success; -1 on error
@@ -6997,6 +6997,20 @@ indicated by the fd to the VM this is called on.
69976997
This is intended to support intra-host migration of VMs between userspace VMMs,
69986998
upgrading the VMM process without interrupting the guest.
69996999

7000+
7.30 KVM_CAP_PPC_AIL_MODE_3
7001+
-------------------------------
7002+
7003+
:Capability: KVM_CAP_PPC_AIL_MODE_3
7004+
:Architectures: ppc
7005+
:Type: vm
7006+
7007+
This capability indicates that the kernel supports the mode 3 setting for the
7008+
"Address Translation Mode on Interrupt" aka "Alternate Interrupt Location"
7009+
resource that is controlled with the H_SET_MODE hypercall.
7010+
7011+
This capability allows a guest kernel to use a better-performance mode for
7012+
handling interrupts and system calls.
7013+
70007014
8. Other capabilities.
70017015
======================
70027016

0 commit comments

Comments
 (0)