Thanks to visit codestin.com
Credit goes to github.com

Skip to content

Commit dc67714

Browse files
popcornmixpopcornmix
committed
Merge remote-tracking branch 'stable/linux-5.10.y' into stable
2 parents 650082a + 915a747 commit dc67714

File tree

1,079 files changed

+10436
-5546
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,079 files changed

+10436
-5546
lines changed

‎Documentation/ABI/testing/sysfs-bus-iio-lptimer-stm32‎

Lines changed: 0 additions & 62 deletions
This file was deleted.

‎Documentation/accounting/psi.rst‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -92,7 +92,8 @@ Triggers can be set on more than one psi metric and more than one trigger
9292
for the same psi metric can be specified. However for each trigger a separate
9393
file descriptor is required to be able to poll it separately from others,
9494
therefore for each trigger a separate open() syscall should be made even
95-
when opening the same psi interface file.
95+
when opening the same psi interface file. Write operations to a file descriptor
96+
with an already existing psi trigger will fail with EBUSY.
9697

9798
Monitors activate only when system enters stall state for the monitored
9899
psi metric and deactivates upon exit from the stall state. While system is

‎Documentation/admin-guide/hw-vuln/spectre.rst‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -468,7 +468,7 @@ Spectre variant 2
468468
before invoking any firmware code to prevent Spectre variant 2 exploits
469469
using the firmware.
470470

471-
Using kernel address space randomization (CONFIG_RANDOMIZE_SLAB=y
471+
Using kernel address space randomization (CONFIG_RANDOMIZE_BASE=y
472472
and CONFIG_SLAB_FREELIST_RANDOM=y in the kernel configuration) makes
473473
attacks on the kernel generally more difficult.
474474

‎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/display/amlogic,meson-dw-hdmi.yaml‎

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,9 @@ title: Amlogic specific extensions to the Synopsys Designware HDMI Controller
1010
maintainers:
1111
- Neil Armstrong <[email protected]>
1212

13+
allOf:
14+
- $ref: /schemas/sound/name-prefix.yaml#
15+
1316
description: |
1417
The Amlogic Meson Synopsys Designware Integration is composed of
1518
- A Synopsys DesignWare HDMI Controller IP
@@ -99,6 +102,8 @@ properties:
99102
"#sound-dai-cells":
100103
const: 0
101104

105+
sound-name-prefix: true
106+
102107
required:
103108
- compatible
104109
- reg

‎Documentation/devicetree/bindings/display/amlogic,meson-vpu.yaml‎

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -78,6 +78,10 @@ properties:
7878
interrupts:
7979
maxItems: 1
8080

81+
amlogic,canvas:
82+
description: should point to a canvas provider node
83+
$ref: /schemas/types.yaml#/definitions/phandle
84+
8185
power-domains:
8286
maxItems: 1
8387
description: phandle to the associated power domain
@@ -106,6 +110,7 @@ required:
106110
- port@1
107111
- "#address-cells"
108112
- "#size-cells"
113+
- amlogic,canvas
109114

110115
additionalProperties: false
111116

@@ -118,6 +123,7 @@ examples:
118123
interrupts = <3>;
119124
#address-cells = <1>;
120125
#size-cells = <0>;
126+
amlogic,canvas = <&canvas>;
121127
122128
/* CVBS VDAC output port */
123129
port@0 {

‎Documentation/devicetree/bindings/net/can/tcan4x5x.txt‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@ tcan4x5x: tcan4x5x@0 {
3131
#address-cells = <1>;
3232
#size-cells = <1>;
3333
spi-max-frequency = <10000000>;
34-
bosch,mram-cfg = <0x0 0 0 32 0 0 1 1>;
34+
bosch,mram-cfg = <0x0 0 0 16 0 0 1 1>;
3535
interrupt-parent = <&gpio1>;
3636
interrupts = <14 IRQ_TYPE_LEVEL_LOW>;
3737
device-state-gpios = <&gpio3 21 GPIO_ACTIVE_HIGH>;

‎Documentation/devicetree/bindings/thermal/thermal-zones.yaml‎

Lines changed: 4 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -199,12 +199,11 @@ patternProperties:
199199

200200
contribution:
201201
$ref: /schemas/types.yaml#/definitions/uint32
202-
minimum: 0
203-
maximum: 100
204202
description:
205-
The percentage contribution of the cooling devices at the
206-
specific trip temperature referenced in this map
207-
to this thermal zone
203+
The cooling contribution to the thermal zone of the referred
204+
cooling device at the referred trip point. The contribution is
205+
a ratio of the sum of all cooling contributions within a
206+
thermal zone.
208207

209208
required:
210209
- trip

‎Documentation/devicetree/bindings/watchdog/samsung-wdt.yaml‎

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -39,8 +39,8 @@ properties:
3939
samsung,syscon-phandle:
4040
$ref: /schemas/types.yaml#/definitions/phandle
4141
description:
42-
Phandle to the PMU system controller node (in case of Exynos5250
43-
and Exynos5420).
42+
Phandle to the PMU system controller node (in case of Exynos5250,
43+
Exynos5420 and Exynos7).
4444

4545
required:
4646
- compatible
@@ -58,6 +58,7 @@ allOf:
5858
enum:
5959
- samsung,exynos5250-wdt
6060
- samsung,exynos5420-wdt
61+
- samsung,exynos7-wdt
6162
then:
6263
required:
6364
- samsung,syscon-phandle

‎Documentation/driver-api/dmaengine/dmatest.rst‎

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -143,13 +143,14 @@ Part 5 - Handling channel allocation
143143
Allocating Channels
144144
-------------------
145145

146-
Channels are required to be configured prior to starting the test run.
147-
Attempting to run the test without configuring the channels will fail.
146+
Channels do not need to be configured prior to starting a test run. Attempting
147+
to run the test without configuring the channels will result in testing any
148+
channels that are available.
148149

149150
Example::
150151

151152
% echo 1 > /sys/module/dmatest/parameters/run
152-
dmatest: Could not start test, no channels configured
153+
dmatest: No channels configured, continue with any
153154

154155
Channels are registered using the "channel" parameter. Channels can be requested by their
155156
name, once requested, the channel is registered and a pending thread is added to the test list.

0 commit comments

Comments
 (0)