Skip to content

Commit bd4319b

Browse files
author
Alexei Starovoitov
committed
Merge git://git.kernel.org/pub/scm/linux/kernel/git/bpf/bpf bpf-6.14-rc4
Cross-merge bpf fixes after downstream PR (bpf-6.14-rc4). Minor conflict: kernel/bpf/btf.c Adjacent changes: kernel/bpf/arena.c kernel/bpf/btf.c kernel/bpf/syscall.c kernel/bpf/verifier.c mm/memory.c Signed-off-by: Alexei Starovoitov <[email protected]>
2 parents 7042882 + 319fc77 commit bd4319b

File tree

727 files changed

+8714
-4714
lines changed

Some content is hidden

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

727 files changed

+8714
-4714
lines changed

.mailmap

+5
Original file line numberDiff line numberDiff line change
@@ -226,6 +226,7 @@ Fangrui Song <[email protected]> <[email protected]>
226226
Felipe W Damasio <[email protected]>
227227
Felix Kuhling <[email protected]>
228228
Felix Moeller <[email protected]>
229+
229230
230231
Filipe Lautert <[email protected]>
231232
@@ -317,6 +318,8 @@ Jayachandran C <[email protected]> <[email protected]>
317318
Jean Tourrilhes <[email protected]>
318319
319320
Jeff Garzik <[email protected]>
321+
322+
320323
321324
322325
@@ -376,6 +379,7 @@ Juha Yrjola <[email protected]>
376379
377380
378381
382+
379383
380384
Karthikeyan Periyasamy <[email protected]> <[email protected]>
381385
@@ -530,6 +534,7 @@ Nicholas Piggin <[email protected]> <[email protected]>
530534
531535
532536
537+
533538
534539
535540

CREDITS

+2-4
Original file line numberDiff line numberDiff line change
@@ -2515,11 +2515,9 @@ D: SLS distribution
25152515
D: Initial implementation of VC's, pty's and select()
25162516

25172517
N: Pavel Machek
2518-
E: pavel@ucw.cz
2518+
E: pavel@kernel.org
25192519
P: 4096R/92DFCE96 4FA7 9EEF FCD4 C44F C585 B8C7 C060 2241 92DF CE96
2520-
D: Softcursor for vga, hypertech cdrom support, vcsa bugfix, nbd,
2521-
D: sun4/330 port, capabilities for elf, speedup for rm on ext2, USB,
2522-
D: work on suspend-to-ram/disk, killing duplicates from ioctl32,
2520+
D: NBD, Sun4/330 port, USB, work on suspend-to-ram/disk,
25232521
D: Altera SoCFPGA and Nokia N900 support.
25242522
S: Czech Republic
25252523

Documentation/arch/arm64/gcs.rst

+1-1
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,7 @@ intended to be exhaustive.
3737
shadow stacks rather than GCS.
3838

3939
* Support for GCS is reported to userspace via HWCAP_GCS in the aux vector
40-
AT_HWCAP2 entry.
40+
AT_HWCAP entry.
4141

4242
* GCS is enabled per thread. While there is support for disabling GCS
4343
at runtime this should be done with great care.

Documentation/devicetree/bindings/clock/qcom,gpucc.yaml

+3
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,7 @@ title: Qualcomm Graphics Clock & Reset Controller
88

99
maintainers:
1010
- Taniya Das <[email protected]>
11+
- Imran Shaik <[email protected]>
1112

1213
description: |
1314
Qualcomm graphics clock control module provides the clocks, resets and power
@@ -23,10 +24,12 @@ description: |
2324
include/dt-bindings/clock/qcom,gpucc-sm8150.h
2425
include/dt-bindings/clock/qcom,gpucc-sm8250.h
2526
include/dt-bindings/clock/qcom,gpucc-sm8350.h
27+
include/dt-bindings/clock/qcom,qcs8300-gpucc.h
2628
2729
properties:
2830
compatible:
2931
enum:
32+
- qcom,qcs8300-gpucc
3033
- qcom,sdm845-gpucc
3134
- qcom,sa8775p-gpucc
3235
- qcom,sc7180-gpucc

Documentation/devicetree/bindings/clock/qcom,sa8775p-camcc.yaml

+5-1
Original file line numberDiff line numberDiff line change
@@ -8,16 +8,20 @@ title: Qualcomm Camera Clock & Reset Controller on SA8775P
88

99
maintainers:
1010
- Taniya Das <[email protected]>
11+
- Imran Shaik <[email protected]>
1112

1213
description: |
1314
Qualcomm camera clock control module provides the clocks, resets and power
1415
domains on SA8775p.
1516
16-
See also: include/dt-bindings/clock/qcom,sa8775p-camcc.h
17+
See also:
18+
include/dt-bindings/clock/qcom,qcs8300-camcc.h
19+
include/dt-bindings/clock/qcom,sa8775p-camcc.h
1720
1821
properties:
1922
compatible:
2023
enum:
24+
- qcom,qcs8300-camcc
2125
- qcom,sa8775p-camcc
2226

2327
clocks:

Documentation/devicetree/bindings/clock/qcom,sa8775p-videocc.yaml

+1
Original file line numberDiff line numberDiff line change
@@ -18,6 +18,7 @@ description: |
1818
properties:
1919
compatible:
2020
enum:
21+
- qcom,qcs8300-videocc
2122
- qcom,sa8775p-videocc
2223

2324
clocks:
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,29 @@
1+
# SPDX-License-Identifier: GPL-2.0-only OR BSD-2-Clause
2+
%YAML 1.2
3+
---
4+
$id: http://devicetree.org/schemas/display/panel/powertip,hx8238a.yaml#
5+
$schema: http://devicetree.org/meta-schemas/core.yaml#
6+
7+
title: Powertip Electronic Technology Co. 320 x 240 LCD panel
8+
9+
maintainers:
10+
- Lukasz Majewski <[email protected]>
11+
12+
allOf:
13+
- $ref: panel-dpi.yaml#
14+
15+
properties:
16+
compatible:
17+
items:
18+
- const: powertip,hx8238a
19+
- {} # panel-dpi, but not listed here to avoid false select
20+
21+
height-mm: true
22+
panel-timing: true
23+
port: true
24+
power-supply: true
25+
width-mm: true
26+
27+
additionalProperties: false
28+
29+
...
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,29 @@
1+
# SPDX-License-Identifier: GPL-2.0-only OR BSD-2-Clause
2+
%YAML 1.2
3+
---
4+
$id: http://devicetree.org/schemas/display/panel/powertip,st7272.yaml#
5+
$schema: http://devicetree.org/meta-schemas/core.yaml#
6+
7+
title: Powertip Electronic Technology Co. 320 x 240 LCD panel
8+
9+
maintainers:
10+
- Lukasz Majewski <[email protected]>
11+
12+
allOf:
13+
- $ref: panel-dpi.yaml#
14+
15+
properties:
16+
compatible:
17+
items:
18+
- const: powertip,st7272
19+
- {} # panel-dpi, but not listed here to avoid false select
20+
21+
height-mm: true
22+
panel-timing: true
23+
port: true
24+
power-supply: true
25+
width-mm: true
26+
27+
additionalProperties: false
28+
29+
...

Documentation/devicetree/bindings/display/ti/ti,am65x-dss.yaml

+1-1
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@ properties:
2323
compatible:
2424
enum:
2525
- ti,am625-dss
26-
- ti,am62a7,dss
26+
- ti,am62a7-dss
2727
- ti,am65x-dss
2828

2929
reg:

Documentation/devicetree/bindings/interrupt-controller/microchip,lan966x-oic.yaml

+2-3
Original file line numberDiff line numberDiff line change
@@ -14,9 +14,8 @@ allOf:
1414

1515
description: |
1616
The Microchip LAN966x outband interrupt controller (OIC) maps the internal
17-
interrupt sources of the LAN966x device to an external interrupt.
18-
When the LAN966x device is used as a PCI device, the external interrupt is
19-
routed to the PCI interrupt.
17+
interrupt sources of the LAN966x device to a PCI interrupt when the LAN966x
18+
device is used as a PCI device.
2019
2120
properties:
2221
compatible:

Documentation/devicetree/bindings/net/wireless/qcom,ath10k.yaml

-1
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,6 @@ $schema: http://devicetree.org/meta-schemas/core.yaml#
77
title: Qualcomm Technologies ath10k wireless devices
88

99
maintainers:
10-
- Kalle Valo <[email protected]>
1110
- Jeff Johnson <[email protected]>
1211

1312
description:

Documentation/devicetree/bindings/net/wireless/qcom,ath11k-pci.yaml

-1
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,6 @@ $schema: http://devicetree.org/meta-schemas/core.yaml#
88
title: Qualcomm Technologies ath11k wireless devices (PCIe)
99

1010
maintainers:
11-
- Kalle Valo <[email protected]>
1211
- Jeff Johnson <[email protected]>
1312

1413
description: |

Documentation/devicetree/bindings/net/wireless/qcom,ath11k.yaml

-1
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,6 @@ $schema: http://devicetree.org/meta-schemas/core.yaml#
88
title: Qualcomm Technologies ath11k wireless devices
99

1010
maintainers:
11-
- Kalle Valo <[email protected]>
1211
- Jeff Johnson <[email protected]>
1312

1413
description: |

Documentation/devicetree/bindings/net/wireless/qcom,ath12k-wsi.yaml

-1
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,6 @@ title: Qualcomm Technologies ath12k wireless devices (PCIe) with WSI interface
99

1010
maintainers:
1111
- Jeff Johnson <[email protected]>
12-
- Kalle Valo <[email protected]>
1312

1413
description: |
1514
Qualcomm Technologies IEEE 802.11be PCIe devices with WSI interface.

Documentation/devicetree/bindings/net/wireless/qcom,ath12k.yaml

-1
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,6 @@ title: Qualcomm Technologies ath12k wireless devices (PCIe)
99

1010
maintainers:
1111
- Jeff Johnson <[email protected]>
12-
- Kalle Valo <[email protected]>
1312

1413
description:
1514
Qualcomm Technologies IEEE 802.11be PCIe devices.

Documentation/devicetree/bindings/nvmem/qcom,qfprom.yaml

+1
Original file line numberDiff line numberDiff line change
@@ -36,6 +36,7 @@ properties:
3636
- qcom,qcs404-qfprom
3737
- qcom,qcs615-qfprom
3838
- qcom,qcs8300-qfprom
39+
- qcom,sar2130p-qfprom
3940
- qcom,sc7180-qfprom
4041
- qcom,sc7280-qfprom
4142
- qcom,sc8280xp-qfprom

Documentation/devicetree/bindings/regulator/qcom,smd-rpm-regulator.yaml

+1-1
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ description:
2222
Each sub-node is identified using the node's name, with valid values listed
2323
for each of the pmics below.
2424

25-
For mp5496, s1, s2
25+
For mp5496, s1, s2, l2, l5
2626

2727
For pm2250, s1, s2, s3, s4, l1, l2, l3, l4, l5, l6, l7, l8, l9, l10, l11,
2828
l12, l13, l14, l15, l16, l17, l18, l19, l20, l21, l22

Documentation/driver-api/infrastructure.rst

+6
Original file line numberDiff line numberDiff line change
@@ -41,6 +41,12 @@ Device Drivers Base
4141
.. kernel-doc:: drivers/base/class.c
4242
:export:
4343

44+
.. kernel-doc:: include/linux/device/faux.h
45+
:internal:
46+
47+
.. kernel-doc:: drivers/base/faux.c
48+
:export:
49+
4450
.. kernel-doc:: drivers/base/node.c
4551
:internal:
4652

Original file line numberDiff line numberDiff line change
@@ -0,0 +1,98 @@
1+
Submitting patches to bcachefs:
2+
===============================
3+
4+
Patches must be tested before being submitted, either with the xfstests suite
5+
[0], or the full bcachefs test suite in ktest [1], depending on what's being
6+
touched. Note that ktest wraps xfstests and will be an easier method to running
7+
it for most users; it includes single-command wrappers for all the mainstream
8+
in-kernel local filesystems.
9+
10+
Patches will undergo more testing after being merged (including
11+
lockdep/kasan/preempt/etc. variants), these are not generally required to be
12+
run by the submitter - but do put some thought into what you're changing and
13+
which tests might be relevant, e.g. are you dealing with tricky memory layout
14+
work? kasan, are you doing locking work? then lockdep; and ktest includes
15+
single-command variants for the debug build types you'll most likely need.
16+
17+
The exception to this rule is incomplete WIP/RFC patches: if you're working on
18+
something nontrivial, it's encouraged to send out a WIP patch to let people
19+
know what you're doing and make sure you're on the right track. Just make sure
20+
it includes a brief note as to what's done and what's incomplete, to avoid
21+
confusion.
22+
23+
Rigorous checkpatch.pl adherence is not required (many of its warnings are
24+
considered out of date), but try not to deviate too much without reason.
25+
26+
Focus on writing code that reads well and is organized well; code should be
27+
aesthetically pleasing.
28+
29+
CI:
30+
===
31+
32+
Instead of running your tests locally, when running the full test suite it's
33+
prefereable to let a server farm do it in parallel, and then have the results
34+
in a nice test dashboard (which can tell you which failures are new, and
35+
presents results in a git log view, avoiding the need for most bisecting).
36+
37+
That exists [2], and community members may request an account. If you work for
38+
a big tech company, you'll need to help out with server costs to get access -
39+
but the CI is not restricted to running bcachefs tests: it runs any ktest test
40+
(which generally makes it easy to wrap other tests that can run in qemu).
41+
42+
Other things to think about:
43+
============================
44+
45+
- How will we debug this code? Is there sufficient introspection to diagnose
46+
when something starts acting wonky on a user machine?
47+
48+
We don't necessarily need every single field of every data structure visible
49+
with introspection, but having the important fields of all the core data
50+
types wired up makes debugging drastically easier - a bit of thoughtful
51+
foresight greatly reduces the need to have people build custom kernels with
52+
debug patches.
53+
54+
More broadly, think about all the debug tooling that might be needed.
55+
56+
- Does it make the codebase more or less of a mess? Can we also try to do some
57+
organizing, too?
58+
59+
- Do new tests need to be written? New assertions? How do we know and verify
60+
that the code is correct, and what happens if something goes wrong?
61+
62+
We don't yet have automated code coverage analysis or easy fault injection -
63+
but for now, pretend we did and ask what they might tell us.
64+
65+
Assertions are hugely important, given that we don't yet have a systems
66+
language that can do ergonomic embedded correctness proofs. Hitting an assert
67+
in testing is much better than wandering off into undefined behaviour la-la
68+
land - use them. Use them judiciously, and not as a replacement for proper
69+
error handling, but use them.
70+
71+
- Does it need to be performance tested? Should we add new peformance counters?
72+
73+
bcachefs has a set of persistent runtime counters which can be viewed with
74+
the 'bcachefs fs top' command; this should give users a basic idea of what
75+
their filesystem is currently doing. If you're doing a new feature or looking
76+
at old code, think if anything should be added.
77+
78+
- If it's a new on disk format feature - have upgrades and downgrades been
79+
tested? (Automated tests exists but aren't in the CI, due to the hassle of
80+
disk image management; coordinate to have them run.)
81+
82+
Mailing list, IRC:
83+
==================
84+
85+
Patches should hit the list [3], but much discussion and code review happens on
86+
IRC as well [4]; many people appreciate the more conversational approach and
87+
quicker feedback.
88+
89+
Additionally, we have a lively user community doing excellent QA work, which
90+
exists primarily on IRC. Please make use of that resource; user feedback is
91+
important for any nontrivial feature, and documenting it in commit messages
92+
would be a good idea.
93+
94+
[0]: git://git.kernel.org/pub/scm/fs/xfs/xfstests-dev.git
95+
[1]: https://evilpiepirate.org/git/ktest.git/
96+
[2]: https://evilpiepirate.org/~testdashboard/ci/
97+
98+
[4]: irc.oftc.net#bcache, #bcachefs-dev

Documentation/filesystems/bcachefs/index.rst

+1
Original file line numberDiff line numberDiff line change
@@ -9,4 +9,5 @@ bcachefs Documentation
99
:numbered:
1010

1111
CodingStyle
12+
SubmittingPatches
1213
errorcodes

Documentation/netlink/specs/ethtool.yaml

+2-1
Original file line numberDiff line numberDiff line change
@@ -1524,7 +1524,8 @@ attribute-sets:
15241524
nested-attributes: bitset
15251525
-
15261526
name: hwtstamp-flags
1527-
type: u32
1527+
type: nest
1528+
nested-attributes: bitset
15281529

15291530
operations:
15301531
enum-model: directional

Documentation/networking/iso15765-2.rst

+2-2
Original file line numberDiff line numberDiff line change
@@ -369,8 +369,8 @@ to their default.
369369
370370
addr.can_family = AF_CAN;
371371
addr.can_ifindex = if_nametoindex("can0");
372-
addr.tp.tx_id = 0x18DA42F1 | CAN_EFF_FLAG;
373-
addr.tp.rx_id = 0x18DAF142 | CAN_EFF_FLAG;
372+
addr.can_addr.tp.tx_id = 0x18DA42F1 | CAN_EFF_FLAG;
373+
addr.can_addr.tp.rx_id = 0x18DAF142 | CAN_EFF_FLAG;
374374
375375
ret = bind(s, (struct sockaddr *)&addr, sizeof(addr));
376376
if (ret < 0)

0 commit comments

Comments
 (0)