Skip to content
This repository was archived by the owner on Nov 8, 2023. It is now read-only.

Commit 1dfbe41

Browse files
lag-googlelag-google
committed
Merge 6706415 ("Merge tag 'gfs2-v6.10-rc1-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/gfs2/linux-gfs2") into android-mainline
Steps on the way to v6.11-rc1 Signed-off-by: Lee Jones <joneslee@google.com> Change-Id: I6810160c1188e3aeb621a7227aba3e3497e321e8
2 parents 809fb94 + 6706415 commit 1dfbe41

File tree

1,740 files changed

+101147
-30772
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,740 files changed

+101147
-30772
lines changed

‎CREDITS

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -271,6 +271,9 @@ D: Driver for WaveFront soundcards (Turtle Beach Maui, Tropez, Tropez+)
271271
D: Various bugfixes and changes to sound drivers
272272
S: USA
273273

274+
N: Daniel Bristot de Oliveira
275+
D: Scheduler contributions, notably: SCHED_DEADLINE
276+
274277
N: Carlos Henrique Bauer
275278
E: chbauer@acm.org
276279
E: bauer@atlas.unisinos.br

‎Documentation/ABI/testing/sysfs-bus-auxiliary

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,9 @@
1+
What: /sys/bus/auxiliary/devices/.../irqs/
2+
Date: April, 2024
3+
Contact: Shay Drory <shayd@nvidia.com>
4+
Description:
5+
The /sys/devices/.../irqs directory contains a variable set of
6+
files, with each file is named as irq number similar to PCI PF
7+
or VF's irq number located in msi_irqs directory.
8+
These irq files are added and removed dynamically when an IRQ
9+
is requested and freed respectively for the PCI SF.

‎Documentation/admin-guide/kernel-parameters.txt

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4732,7 +4732,9 @@
47324732
none - Limited to cond_resched() calls
47334733
voluntary - Limited to cond_resched() and might_sleep() calls
47344734
full - Any section that isn't explicitly preempt disabled
4735-
can be preempted anytime.
4735+
can be preempted anytime. Tasks will also yield
4736+
contended spinlocks (if the critical section isn't
4737+
explicitly preempt disabled beyond the lock itself).
47364738

47374739
print-fatal-signals=
47384740
[KNL] debug: print fatal signals

‎Documentation/bpf/libbpf/libbpf_overview.rst

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -219,6 +219,14 @@ compilation and skeleton generation. Using Libbpf-rs will make building user
219219
space part of the BPF application easier. Note that the BPF program themselves
220220
must still be written in plain C.
221221

222+
libbpf logging
223+
==============
224+
225+
By default, libbpf logs informational and warning messages to stderr. The
226+
verbosity of these messages can be controlled by setting the environment
227+
variable LIBBPF_LOG_LEVEL to either warn, info, or debug. A custom log
228+
callback can be set using ``libbpf_set_print()``.
229+
222230
Additional Documentation
223231
========================
224232

‎Documentation/bpf/standardization/abi.rst

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -23,3 +23,6 @@ The BPF calling convention is defined as:
2323

2424
R0 - R5 are scratch registers and BPF programs needs to spill/fill them if
2525
necessary across calls.
26+
27+
The BPF program needs to store the return value into register R0 before doing an
28+
``EXIT``.

‎Documentation/bpf/standardization/instruction-set.rst

Lines changed: 193 additions & 140 deletions
Large diffs are not rendered by default.

‎Documentation/dev-tools/kselftest.rst

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -228,6 +228,13 @@ In general, the rules for selftests are
228228
* Don't cause the top-level "make run_tests" to fail if your feature is
229229
unconfigured.
230230

231+
* The output of tests must conform to the TAP standard to ensure high
232+
testing quality and to capture failures/errors with specific details.
233+
The kselftest.h and kselftest_harness.h headers provide wrappers for
234+
outputting test results. These wrappers should be used for pass,
235+
fail, exit, and skip messages. CI systems can easily parse TAP output
236+
messages to detect test results.
237+
231238
Contributing new tests (details)
232239
================================
233240

‎Documentation/devicetree/bindings/net/airoha,en7581-eth.yaml

Lines changed: 143 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,143 @@
1+
# SPDX-License-Identifier: (GPL-2.0-only OR BSD-2-Clause)
2+
%YAML 1.2
3+
---
4+
$id: http://devicetree.org/schemas/net/airoha,en7581-eth.yaml#
5+
$schema: http://devicetree.org/meta-schemas/core.yaml#
6+
7+
title: Airoha EN7581 Frame Engine Ethernet controller
8+
9+
maintainers:
10+
- Lorenzo Bianconi <lorenzo@kernel.org>
11+
12+
description:
13+
The frame engine ethernet controller can be found on Airoha SoCs.
14+
These SoCs have multi-GMAC ports.
15+
16+
properties:
17+
compatible:
18+
enum:
19+
- airoha,en7581-eth
20+
21+
reg:
22+
items:
23+
- description: Frame engine base address
24+
- description: QDMA0 base address
25+
- description: QDMA1 base address
26+
27+
reg-names:
28+
items:
29+
- const: fe
30+
- const: qdma0
31+
- const: qdma1
32+
33+
interrupts:
34+
items:
35+
- description: QDMA lan irq0
36+
- description: QDMA lan irq1
37+
- description: QDMA lan irq2
38+
- description: QDMA lan irq3
39+
- description: QDMA wan irq0
40+
- description: QDMA wan irq1
41+
- description: QDMA wan irq2
42+
- description: QDMA wan irq3
43+
- description: FE error irq
44+
- description: PDMA irq
45+
46+
resets:
47+
maxItems: 8
48+
49+
reset-names:
50+
items:
51+
- const: fe
52+
- const: pdma
53+
- const: qdma
54+
- const: xsi-mac
55+
- const: hsi0-mac
56+
- const: hsi1-mac
57+
- const: hsi-mac
58+
- const: xfp-mac
59+
60+
"#address-cells":
61+
const: 1
62+
63+
"#size-cells":
64+
const: 0
65+
66+
patternProperties:
67+
"^ethernet@[1-4]$":
68+
type: object
69+
unevaluatedProperties: false
70+
$ref: ethernet-controller.yaml#
71+
description:
72+
Ethernet GMAC port associated to the MAC controller
73+
properties:
74+
compatible:
75+
const: airoha,eth-mac
76+
77+
reg:
78+
minimum: 1
79+
maximum: 4
80+
description: GMAC port identifier
81+
82+
required:
83+
- reg
84+
- compatible
85+
86+
required:
87+
- compatible
88+
- reg
89+
- interrupts
90+
- resets
91+
- reset-names
92+
93+
unevaluatedProperties: false
94+
95+
examples:
96+
- |
97+
#include <dt-bindings/interrupt-controller/arm-gic.h>
98+
#include <dt-bindings/interrupt-controller/irq.h>
99+
#include <dt-bindings/clock/en7523-clk.h>
100+
101+
soc {
102+
#address-cells = <2>;
103+
#size-cells = <2>;
104+
105+
eth: ethernet@1fb50000 {
106+
compatible = "airoha,en7581-eth";
107+
reg = <0 0x1fb50000 0 0x2600>,
108+
<0 0x1fb54000 0 0x2000>,
109+
<0 0x1fb56000 0 0x2000>;
110+
reg-names = "fe", "qdma0", "qdma1";
111+
112+
resets = <&scuclk 44>,
113+
<&scuclk 30>,
114+
<&scuclk 31>,
115+
<&scuclk 6>,
116+
<&scuclk 15>,
117+
<&scuclk 16>,
118+
<&scuclk 17>,
119+
<&scuclk 26>;
120+
reset-names = "fe", "pdma", "qdma", "xsi-mac",
121+
"hsi0-mac", "hsi1-mac", "hsi-mac",
122+
"xfp-mac";
123+
124+
interrupts = <GIC_SPI 37 IRQ_TYPE_LEVEL_HIGH>,
125+
<GIC_SPI 55 IRQ_TYPE_LEVEL_HIGH>,
126+
<GIC_SPI 56 IRQ_TYPE_LEVEL_HIGH>,
127+
<GIC_SPI 57 IRQ_TYPE_LEVEL_HIGH>,
128+
<GIC_SPI 38 IRQ_TYPE_LEVEL_HIGH>,
129+
<GIC_SPI 58 IRQ_TYPE_LEVEL_HIGH>,
130+
<GIC_SPI 59 IRQ_TYPE_LEVEL_HIGH>,
131+
<GIC_SPI 60 IRQ_TYPE_LEVEL_HIGH>,
132+
<GIC_SPI 49 IRQ_TYPE_LEVEL_HIGH>,
133+
<GIC_SPI 64 IRQ_TYPE_LEVEL_HIGH>;
134+
135+
#address-cells = <1>;
136+
#size-cells = <0>;
137+
138+
mac: ethernet@1 {
139+
compatible = "airoha,eth-mac";
140+
reg = <1>;
141+
};
142+
};
143+
};

‎Documentation/devicetree/bindings/net/arc_emac.txt

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

‎Documentation/devicetree/bindings/net/bluetooth/mediatek,mt7622-bluetooth.yaml

Lines changed: 51 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,51 @@
1+
# SPDX-License-Identifier: GPL-2.0-only OR BSD-2-Clause
2+
%YAML 1.2
3+
---
4+
$id: http://devicetree.org/schemas/net/bluetooth/mediatek,mt7622-bluetooth.yaml#
5+
$schema: http://devicetree.org/meta-schemas/core.yaml#
6+
7+
title: MediaTek SoC built-in Bluetooth
8+
9+
description:
10+
This device is a serial attached device to BTIF device and thus it must be a
11+
child node of the serial node with BTIF. The dt-bindings details for BTIF
12+
device can be known via Documentation/devicetree/bindings/serial/8250.yaml.
13+
14+
maintainers:
15+
- Sean Wang <sean.wang@mediatek.com>
16+
17+
allOf:
18+
- $ref: bluetooth-controller.yaml#
19+
20+
properties:
21+
compatible:
22+
const: mediatek,mt7622-bluetooth
23+
24+
clocks:
25+
maxItems: 1
26+
27+
clock-names:
28+
const: ref
29+
30+
power-domains:
31+
maxItems: 1
32+
33+
required:
34+
- clocks
35+
- clock-names
36+
- power-domains
37+
38+
unevaluatedProperties: false
39+
40+
examples:
41+
- |
42+
#include <dt-bindings/power/mt7622-power.h>
43+
44+
serial {
45+
bluetooth {
46+
compatible = "mediatek,mt7622-bluetooth";
47+
power-domains = <&scpsys MT7622_POWER_DOMAIN_WB>;
48+
clocks = <&clk25m>;
49+
clock-names = "ref";
50+
};
51+
};

‎Documentation/devicetree/bindings/net/bluetooth/nxp,88w8987-bt.yaml

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -31,6 +31,9 @@ properties:
3131
This property depends on the module vendor's
3232
configuration.
3333

34+
firmware-name:
35+
maxItems: 1
36+
3437
required:
3538
- compatible
3639

@@ -42,5 +45,6 @@ examples:
4245
bluetooth {
4346
compatible = "nxp,88w8987-bt";
4447
fw-init-baudrate = <3000000>;
48+
firmware-name = "uartuart8987_bt_v0.bin";
4549
};
4650
};

‎Documentation/devicetree/bindings/net/bluetooth/qualcomm-bluetooth.yaml

Lines changed: 30 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -62,6 +62,9 @@ properties:
6262
vdddig-supply:
6363
description: VDD_DIG supply regulator handle
6464

65+
vddbtcmx-supply:
66+
description: VDD_BT_CMX supply regulator handle
67+
6568
vddbtcxmx-supply:
6669
description: VDD_BT_CXMX supply regulator handle
6770

@@ -74,6 +77,9 @@ properties:
7477
vddrfa1p7-supply:
7578
description: VDD_RFA_1P7 supply regulator handle
7679

80+
vddrfa1p8-supply:
81+
description: VDD_RFA_1P8 supply regulator handle
82+
7783
vddrfa1p2-supply:
7884
description: VDD_RFA_1P2 supply regulator handle
7985

@@ -86,6 +92,12 @@ properties:
8692
vddasd-supply:
8793
description: VDD_ASD supply regulator handle
8894

95+
vddwlcx-supply:
96+
description: VDD_WLCX supply regulator handle
97+
98+
vddwlmx-supply:
99+
description: VDD_WLMX supply regulator handle
100+
89101
max-speed:
90102
description: see Documentation/devicetree/bindings/serial/serial.yaml
91103

@@ -176,14 +188,27 @@ allOf:
176188
- qcom,wcn7850-bt
177189
then:
178190
required:
179-
- enable-gpios
180-
- swctrl-gpios
181-
- vddio-supply
191+
- vddrfacmn-supply
192+
- vddaon-supply
193+
- vddwlcx-supply
194+
- vddwlmx-supply
195+
- vddrfa0p8-supply
196+
- vddrfa1p2-supply
197+
- vddrfa1p8-supply
198+
- if:
199+
properties:
200+
compatible:
201+
contains:
202+
enum:
203+
- qcom,qca6390-bt
204+
then:
205+
required:
206+
- vddrfacmn-supply
182207
- vddaon-supply
183-
- vdddig-supply
208+
- vddbtcmx-supply
184209
- vddrfa0p8-supply
185210
- vddrfa1p2-supply
186-
- vddrfa1p9-supply
211+
- vddrfa1p7-supply
187212

188213
examples:
189214
- |

0 commit comments

Comments
 (0)