Skip to content

Commit e438aa4

Browse files
author
Alexei Starovoitov
committed
Merge branch 'bpf-next/master' into for-next
Signed-off-by: Alexei Starovoitov <[email protected]>
2 parents b0feb30 + 224ee86 commit e438aa4

File tree

301 files changed

+3534
-2174
lines changed

Some content is hidden

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

301 files changed

+3534
-2174
lines changed

‎Documentation/admin-guide/xfs.rst

Lines changed: 8 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -562,7 +562,7 @@ The interesting knobs for XFS workqueues are as follows:
562562
Zoned Filesystems
563563
=================
564564

565-
For zoned file systems, the following attribute is exposed in:
565+
For zoned file systems, the following attributes are exposed in:
566566

567567
/sys/fs/xfs/<dev>/zoned/
568568

@@ -572,23 +572,10 @@ For zoned file systems, the following attribute is exposed in:
572572
is limited by the capabilities of the backing zoned device, file system
573573
size and the max_open_zones mount option.
574574

575-
Zoned Filesystems
576-
=================
577-
578-
For zoned file systems, the following attributes are exposed in:
579-
580-
/sys/fs/xfs/<dev>/zoned/
581-
582-
max_open_zones (Min: 1 Default: Varies Max: UINTMAX)
583-
This read-only attribute exposes the maximum number of open zones
584-
available for data placement. The value is determined at mount time and
585-
is limited by the capabilities of the backing zoned device, file system
586-
size and the max_open_zones mount option.
587-
588-
zonegc_low_space (Min: 0 Default: 0 Max: 100)
589-
Define a percentage for how much of the unused space that GC should keep
590-
available for writing. A high value will reclaim more of the space
591-
occupied by unused blocks, creating a larger buffer against write
592-
bursts at the cost of increased write amplification. Regardless
593-
of this value, garbage collection will always aim to free a minimum
594-
amount of blocks to keep max_open_zones open for data placement purposes.
575+
zonegc_low_space (Min: 0 Default: 0 Max: 100)
576+
Define a percentage for how much of the unused space that GC should keep
577+
available for writing. A high value will reclaim more of the space
578+
occupied by unused blocks, creating a larger buffer against write
579+
bursts at the cost of increased write amplification. Regardless
580+
of this value, garbage collection will always aim to free a minimum
581+
amount of blocks to keep max_open_zones open for data placement purposes.

‎Documentation/arch/openrisc/openrisc_port.rst

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -7,10 +7,10 @@ target architecture, specifically, is the 32-bit OpenRISC 1000 family (or1k).
77

88
For information about OpenRISC processors and ongoing development:
99

10-
======= =============================
10+
======= ==============================
1111
website https://openrisc.io
12-
email openrisc@lists.librecores.org
13-
======= =============================
12+
email linux-openrisc@vger.kernel.org
13+
======= ==============================
1414

1515
---------------------------------------------------------------------
1616

@@ -27,11 +27,11 @@ Toolchain binaries can be obtained from openrisc.io or our github releases page.
2727
Instructions for building the different toolchains can be found on openrisc.io
2828
or Stafford's toolchain build and release scripts.
2929

30-
========== =================================================
31-
binaries https://github.com/openrisc/or1k-gcc/releases
30+
========== ==========================================================
31+
binaries https://github.com/stffrdhrn/or1k-toolchain-build/releases
3232
toolchains https://openrisc.io/software
3333
building https://github.com/stffrdhrn/or1k-toolchain-build
34-
========== =================================================
34+
========== ==========================================================
3535

3636
2) Building
3737

‎Documentation/bpf/bpf_devel_QA.rst

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -382,6 +382,14 @@ In case of new BPF instructions, once the changes have been accepted
382382
into the Linux kernel, please implement support into LLVM's BPF back
383383
end. See LLVM_ section below for further information.
384384

385+
Q: What "BPF_INTERNAL" symbol namespace is for?
386+
-----------------------------------------------
387+
A: Symbols exported as BPF_INTERNAL can only be used by BPF infrastructure
388+
like preload kernel modules with light skeleton. Most symbols outside
389+
of BPF_INTERNAL are not expected to be used by code outside of BPF either.
390+
Symbols may lack the designation because they predate the namespaces,
391+
or due to an oversight.
392+
385393
Stable submission
386394
=================
387395

‎Documentation/bpf/bpf_iterators.rst

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -323,8 +323,8 @@ Now, in the userspace program, pass the pointer of struct to the
323323

324324
::
325325

326-
link = bpf_program__attach_iter(prog, &opts); iter_fd =
327-
bpf_iter_create(bpf_link__fd(link));
326+
link = bpf_program__attach_iter(prog, &opts);
327+
iter_fd = bpf_iter_create(bpf_link__fd(link));
328328

329329
If both *tid* and *pid* are zero, an iterator created from this struct
330330
``bpf_iter_attach_opts`` will include every opened file of every task in the

‎Documentation/devicetree/bindings/nvmem/layouts/fixed-cell.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@ properties:
2727
$ref: /schemas/types.yaml#/definitions/uint32-array
2828
items:
2929
- minimum: 0
30-
maximum: 7
30+
maximum: 31
3131
description:
3232
Offset in bit within the address range specified by reg.
3333
- minimum: 1

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

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -19,6 +19,7 @@ properties:
1919
- enum:
2020
- qcom,apq8064-qfprom
2121
- qcom,apq8084-qfprom
22+
- qcom,ipq5018-qfprom
2223
- qcom,ipq5332-qfprom
2324
- qcom,ipq5424-qfprom
2425
- qcom,ipq6018-qfprom
@@ -28,6 +29,8 @@ properties:
2829
- qcom,msm8226-qfprom
2930
- qcom,msm8916-qfprom
3031
- qcom,msm8917-qfprom
32+
- qcom,msm8937-qfprom
33+
- qcom,msm8960-qfprom
3134
- qcom,msm8974-qfprom
3235
- qcom,msm8976-qfprom
3336
- qcom,msm8996-qfprom
@@ -51,6 +54,7 @@ properties:
5154
- qcom,sm8450-qfprom
5255
- qcom,sm8550-qfprom
5356
- qcom,sm8650-qfprom
57+
- qcom,x1e80100-qfprom
5458
- const: qcom,qfprom
5559

5660
reg:

‎Documentation/devicetree/bindings/nvmem/rockchip,otp.yaml

Lines changed: 25 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -14,6 +14,7 @@ properties:
1414
enum:
1515
- rockchip,px30-otp
1616
- rockchip,rk3308-otp
17+
- rockchip,rk3576-otp
1718
- rockchip,rk3588-otp
1819

1920
reg:
@@ -62,12 +63,34 @@ allOf:
6263
properties:
6364
clocks:
6465
maxItems: 3
66+
clock-names:
67+
maxItems: 3
6568
resets:
6669
maxItems: 1
6770
reset-names:
6871
items:
6972
- const: phy
7073

74+
- if:
75+
properties:
76+
compatible:
77+
contains:
78+
enum:
79+
- rockchip,rk3576-otp
80+
then:
81+
properties:
82+
clocks:
83+
maxItems: 3
84+
clock-names:
85+
maxItems: 3
86+
resets:
87+
minItems: 2
88+
maxItems: 2
89+
reset-names:
90+
items:
91+
- const: otp
92+
- const: apb
93+
7194
- if:
7295
properties:
7396
compatible:
@@ -78,6 +101,8 @@ allOf:
78101
properties:
79102
clocks:
80103
minItems: 4
104+
clock-names:
105+
minItems: 4
81106
resets:
82107
minItems: 3
83108
reset-names:

‎Documentation/translations/zh_CN/arch/openrisc/openrisc_port.rst

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -17,10 +17,10 @@ OpenRISC 1000系列（或1k）。
1717

1818
关于OpenRISC处理器和正在进行中的开发的信息:
1919

20-
======= =============================
20+
======= ==============================
2121
网站 https://openrisc.io
22-
邮箱 openrisc@lists.librecores.org
23-
======= =============================
22+
邮箱 linux-openrisc@vger.kernel.org
23+
======= ==============================
2424

2525
---------------------------------------------------------------------
2626

@@ -36,11 +36,11 @@ OpenRISC工具链和Linux的构建指南
3636
工具链的构建指南可以在openrisc.io或Stafford的工具链构建和发布脚本
3737
中找到。
3838

39-
====== =================================================
40-
二进制 https://github.com/openrisc/or1k-gcc/releases
39+
====== ==========================================================
40+
二进制 https://github.com/stffrdhrn/or1k-toolchain-build/releases
4141
工具链 https://openrisc.io/software
4242
构建 https://github.com/stffrdhrn/or1k-toolchain-build
43-
====== =================================================
43+
====== ==========================================================
4444

4545
2) 构建
4646

‎Documentation/translations/zh_TW/arch/openrisc/openrisc_port.rst

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -17,10 +17,10 @@ OpenRISC 1000系列（或1k）。
1717

1818
關於OpenRISC處理器和正在進行中的開發的信息:
1919

20-
======= =============================
20+
======= ==============================
2121
網站 https://openrisc.io
22-
郵箱 openrisc@lists.librecores.org
23-
======= =============================
22+
郵箱 linux-openrisc@vger.kernel.org
23+
======= ==============================
2424

2525
---------------------------------------------------------------------
2626

@@ -36,11 +36,11 @@ OpenRISC工具鏈和Linux的構建指南
3636
工具鏈的構建指南可以在openrisc.io或Stafford的工具鏈構建和發佈腳本
3737
中找到。
3838

39-
====== =================================================
40-
二進制 https://github.com/openrisc/or1k-gcc/releases
39+
====== ==========================================================
40+
二進制 https://github.com/stffrdhrn/or1k-toolchain-build/releases
4141
工具鏈 https://openrisc.io/software
4242
構建 https://github.com/stffrdhrn/or1k-toolchain-build
43-
====== =================================================
43+
====== ==========================================================
4444

4545
2) 構建
4646

‎MAINTAINERS

Lines changed: 38 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -3191,6 +3191,12 @@ M: Dinh Nguyen <[email protected]>
31913191
S: Maintained
31923192
F: drivers/clk/socfpga/
31933193

3194+
ARM/SOCFPGA DWMAC GLUE LAYER
3195+
M: Maxime Chevallier <[email protected]>
3196+
S: Maintained
3197+
F: Documentation/devicetree/bindings/net/socfpga-dwmac.txt
3198+
F: drivers/net/ethernet/stmicro/stmmac/dwmac-socfpga.c
3199+
31943200
ARM/SOCFPGA EDAC BINDINGS
31953201
M: Matthew Gerlach <[email protected]>
31963202
S: Maintained
@@ -3867,8 +3873,9 @@ AUXILIARY BUS DRIVER
38673873
M: Greg Kroah-Hartman <[email protected]>
38683874
R: Dave Ertman <[email protected]>
38693875
R: Ira Weiny <[email protected]>
3876+
R: Leon Romanovsky <[email protected]>
38703877
S: Supported
3871-
T: git git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/driver-core.git
3878+
T: git git://git.kernel.org/pub/scm/linux/kernel/git/driver-core/driver-core.git
38723879
F: Documentation/driver-api/auxiliary_bus.rst
38733880
F: drivers/base/auxiliary.c
38743881
F: include/linux/auxiliary_bus.h
@@ -7227,7 +7234,7 @@ M: Greg Kroah-Hartman <[email protected]>
72277234
M: "Rafael J. Wysocki" <[email protected]>
72287235
M: Danilo Krummrich <[email protected]>
72297236
S: Supported
7230-
T: git git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/driver-core.git
7237+
T: git git://git.kernel.org/pub/scm/linux/kernel/git/driver-core/driver-core.git
72317238
F: Documentation/core-api/kobject.rst
72327239
F: drivers/base/
72337240
F: fs/debugfs/
@@ -10457,14 +10464,20 @@ S: Supported
1045710464
F: drivers/infiniband/hw/hfi1
1045810465

1045910466
HFS FILESYSTEM
10467+
M: Viacheslav Dubeyko <[email protected]>
10468+
M: John Paul Adrian Glaubitz <[email protected]>
10469+
M: Yangtao Li <[email protected]>
1046010470
L: [email protected]
10461-
S: Orphan
10471+
S: Maintained
1046210472
F: Documentation/filesystems/hfs.rst
1046310473
F: fs/hfs/
1046410474

1046510475
HFSPLUS FILESYSTEM
10476+
M: Viacheslav Dubeyko <[email protected]>
10477+
M: John Paul Adrian Glaubitz <[email protected]>
10478+
M: Yangtao Li <[email protected]>
1046610479
L: [email protected]
10467-
S: Orphan
10480+
S: Maintained
1046810481
F: Documentation/filesystems/hfsplus.rst
1046910482
F: fs/hfsplus/
1047010483

@@ -13112,7 +13125,7 @@ KERNFS
1311213125
M: Greg Kroah-Hartman <[email protected]>
1311313126
M: Tejun Heo <[email protected]>
1311413127
S: Supported
13115-
T: git git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/driver-core.git
13128+
T: git git://git.kernel.org/pub/scm/linux/kernel/git/driver-core/driver-core.git
1311613129
F: fs/kernfs/
1311713130
F: include/linux/kernfs.h
1311813131

@@ -16812,6 +16825,7 @@ F: Documentation/networking/net_cachelines/net_device.rst
1681216825
F: drivers/connector/
1681316826
F: drivers/net/
1681416827
F: drivers/ptp/
16828+
F: drivers/s390/net/
1681516829
F: include/dt-bindings/net/
1681616830
F: include/linux/cn_proc.h
1681716831
F: include/linux/etherdevice.h
@@ -16821,6 +16835,7 @@ F: include/linux/fddidevice.h
1682116835
F: include/linux/hippidevice.h
1682216836
F: include/linux/if_*
1682316837
F: include/linux/inetdevice.h
16838+
F: include/linux/ism.h
1682416839
F: include/linux/netdev*
1682516840
F: include/linux/platform_data/wiznet.h
1682616841
F: include/uapi/linux/cn_proc.h
@@ -18689,7 +18704,7 @@ F: drivers/pci/controller/pci-xgene-msi.c
1868918704
PCI NATIVE HOST BRIDGE AND ENDPOINT DRIVERS
1869018705
M: Lorenzo Pieralisi <[email protected]>
1869118706
M: Krzysztof Wilczyński <[email protected]>
18692-
R: Manivannan Sadhasivam <[email protected]>
18707+
M: Manivannan Sadhasivam <[email protected]>
1869318708
R: Rob Herring <[email protected]>
1869418709
L: [email protected]
1869518710
S: Supported
@@ -18742,6 +18757,16 @@ F: include/asm-generic/pci*
1874218757
F: include/linux/of_pci.h
1874318758
F: include/linux/pci*
1874418759
F: include/uapi/linux/pci*
18760+
18761+
PCI SUBSYSTEM [RUST]
18762+
M: Danilo Krummrich <[email protected]>
18763+
R: Bjorn Helgaas <[email protected]>
18764+
R: Krzysztof Wilczyński <[email protected]>
18765+
L: [email protected]
18766+
S: Maintained
18767+
C: irc://irc.oftc.net/linux-pci
18768+
T: git git://git.kernel.org/pub/scm/linux/kernel/git/pci/pci.git
18769+
F: rust/helpers/pci.c
1874518770
F: rust/kernel/pci.rs
1874618771
F: samples/rust/rust_driver_pci.rs
1874718772

@@ -21312,6 +21337,7 @@ L: [email protected]
2131221337
L: [email protected]
2131321338
S: Supported
2131421339
F: drivers/s390/net/
21340+
F: include/linux/ism.h
2131521341

2131621342
S390 PCI SUBSYSTEM
2131721343
M: Niklas Schnelle <[email protected]>
@@ -25184,9 +25210,13 @@ S: Maintained
2518425210
F: drivers/usb/typec/mux/pi3usb30532.c
2518525211

2518625212
USB TYPEC PORT CONTROLLER DRIVERS
25213+
M: Badhri Jagan Sridharan <[email protected]>
2518725214
L: [email protected]
25188-
S: Orphan
25189-
F: drivers/usb/typec/tcpm/
25215+
S: Maintained
25216+
F: drivers/usb/typec/tcpm/tcpci.c
25217+
F: drivers/usb/typec/tcpm/tcpm.c
25218+
F: include/linux/usb/tcpci.h
25219+
F: include/linux/usb/tcpm.h
2519025220

2519125221
USB TYPEC TUSB1046 MUX DRIVER
2519225222
M: Romain Gantois <[email protected]>

‎Makefile

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
VERSION = 6
33
PATCHLEVEL = 15
44
SUBLEVEL = 0
5-
EXTRAVERSION = -rc3
5+
EXTRAVERSION = -rc4
66
NAME = Baby Opossum Posse
77

88
# *DOCUMENTATION*
@@ -1053,11 +1053,11 @@ NOSTDINC_FLAGS += -nostdinc
10531053
KBUILD_CFLAGS += $(call cc-option, -fstrict-flex-arrays=3)
10541054

10551055
#Currently, disable -Wstringop-overflow for GCC 11, globally.
1056-
KBUILD_CFLAGS-$(CONFIG_CC_NO_STRINGOP_OVERFLOW) += $(call cc-option, -Wno-stringop-overflow)
1056+
KBUILD_CFLAGS-$(CONFIG_CC_NO_STRINGOP_OVERFLOW) += $(call cc-disable-warning, stringop-overflow)
10571057
KBUILD_CFLAGS-$(CONFIG_CC_STRINGOP_OVERFLOW) += $(call cc-option, -Wstringop-overflow)
10581058

10591059
#Currently, disable -Wunterminated-string-initialization as broken
1060-
KBUILD_CFLAGS += $(call cc-option, -Wno-unterminated-string-initialization)
1060+
KBUILD_CFLAGS += $(call cc-disable-warning, unterminated-string-initialization)
10611061

10621062
# disable invalid "can't wrap" optimizations for signed / pointers
10631063
KBUILD_CFLAGS += -fno-strict-overflow

0 commit comments

Comments
 (0)