Skip to content

Commit 442bc81

Browse files
author
Alexei Starovoitov
committed
Merge git://git.kernel.org/pub/scm/linux/kernel/git/bpf/bpf
Cross-merge bpf fixes after downstream PR. Trivial conflict: tools/testing/selftests/bpf/prog_tests/verifier.c Adjacent changes in: Auto-merging kernel/bpf/verifier.c Auto-merging samples/bpf/Makefile Auto-merging tools/testing/selftests/bpf/.gitignore Auto-merging tools/testing/selftests/bpf/Makefile Auto-merging tools/testing/selftests/bpf/prog_tests/verifier.c Signed-off-by: Alexei Starovoitov <[email protected]>
2 parents d6212d8 + fac04ef commit 442bc81

File tree

1,284 files changed

+7554
-5439
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,284 files changed

+7554
-5439
lines changed

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -76,7 +76,7 @@ Description:
7676
timeout when the pretimeout interrupt is delivered. Pretimeout
7777
is an optional feature.
7878

79-
What: /sys/class/watchdog/watchdogn/pretimeout_avaialable_governors
79+
What: /sys/class/watchdog/watchdogn/pretimeout_available_governors
8080
Date: February 2017
8181
Contact: Wim Van Sebroeck <[email protected]>
8282
Description:

‎Documentation/arch/arm64/silicon-errata.rst

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -255,8 +255,9 @@ stable kernels.
255255
+----------------+-----------------+-----------------+-----------------------------+
256256
| Hisilicon | Hip08 SMMU PMCG | #162001800 | N/A |
257257
+----------------+-----------------+-----------------+-----------------------------+
258-
| Hisilicon | Hip{08,09,10,10C| #162001900 | N/A |
259-
| | ,11} SMMU PMCG | | |
258+
| Hisilicon | Hip{08,09,09A,10| #162001900 | N/A |
259+
| | ,10C,11} | | |
260+
| | SMMU PMCG | | |
260261
+----------------+-----------------+-----------------+-----------------------------+
261262
| Hisilicon | Hip09 | #162100801 | HISILICON_ERRATUM_162100801 |
262263
+----------------+-----------------+-----------------+-----------------------------+

‎Documentation/core-api/symbol-namespaces.rst

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -46,7 +46,7 @@ Please note that due to macro expansion that argument needs to be a
4646
preprocessor symbol. E.g. to export the symbol ``usb_stor_suspend`` into the
4747
namespace ``USB_STORAGE``, use::
4848

49-
EXPORT_SYMBOL_NS(usb_stor_suspend, USB_STORAGE);
49+
EXPORT_SYMBOL_NS(usb_stor_suspend, "USB_STORAGE");
5050

5151
The corresponding ksymtab entry struct ``kernel_symbol`` will have the member
5252
``namespace`` set accordingly. A symbol that is exported without a namespace will
@@ -68,7 +68,7 @@ is to define the default namespace in the ``Makefile`` of the subsystem. E.g. to
6868
export all symbols defined in usb-common into the namespace USB_COMMON, add a
6969
line like this to drivers/usb/common/Makefile::
7070

71-
ccflags-y += -DDEFAULT_SYMBOL_NAMESPACE=USB_COMMON
71+
ccflags-y += -DDEFAULT_SYMBOL_NAMESPACE='"USB_COMMON"'
7272

7373
That will affect all EXPORT_SYMBOL() and EXPORT_SYMBOL_GPL() statements. A
7474
symbol exported with EXPORT_SYMBOL_NS() while this definition is present, will
@@ -79,7 +79,7 @@ A second option to define the default namespace is directly in the compilation
7979
unit as preprocessor statement. The above example would then read::
8080

8181
#undef DEFAULT_SYMBOL_NAMESPACE
82-
#define DEFAULT_SYMBOL_NAMESPACE USB_COMMON
82+
#define DEFAULT_SYMBOL_NAMESPACE "USB_COMMON"
8383

8484
within the corresponding compilation unit before any EXPORT_SYMBOL macro is
8585
used.
@@ -94,7 +94,7 @@ for the namespaces it uses symbols from. E.g. a module using the
9494
usb_stor_suspend symbol from above, needs to import the namespace USB_STORAGE
9595
using a statement like::
9696

97-
MODULE_IMPORT_NS(USB_STORAGE);
97+
MODULE_IMPORT_NS("USB_STORAGE");
9898

9999
This will create a ``modinfo`` tag in the module for each imported namespace.
100100
This has the side effect, that the imported namespaces of a module can be

‎Documentation/devicetree/bindings/power/mediatek,power-controller.yaml

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -55,6 +55,10 @@ patternProperties:
5555
patternProperties:
5656
"^power-domain@[0-9a-f]+$":
5757
$ref: "#/$defs/power-domain-node"
58+
patternProperties:
59+
"^power-domain@[0-9a-f]+$":
60+
$ref: "#/$defs/power-domain-node"
61+
unevaluatedProperties: false
5862
unevaluatedProperties: false
5963
unevaluatedProperties: false
6064
unevaluatedProperties: false

‎Documentation/devicetree/bindings/watchdog/airoha,en7581-wdt.yaml

Lines changed: 47 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,47 @@
1+
# SPDX-License-Identifier: (GPL-2.0-only OR BSD-2-Clause)
2+
%YAML 1.2
3+
---
4+
$id: http://devicetree.org/schemas/watchdog/airoha,en7581-wdt.yaml#
5+
$schema: http://devicetree.org/meta-schemas/core.yaml#
6+
7+
title: Airoha EN7581 Watchdog Timer
8+
9+
maintainers:
10+
- Christian Marangi <[email protected]>
11+
12+
allOf:
13+
- $ref: watchdog.yaml#
14+
15+
properties:
16+
compatible:
17+
const: airoha,en7581-wdt
18+
19+
reg:
20+
maxItems: 1
21+
22+
clocks:
23+
description: BUS clock (timer ticks at half the BUS clock)
24+
maxItems: 1
25+
26+
clock-names:
27+
const: bus
28+
29+
required:
30+
- compatible
31+
- reg
32+
- clocks
33+
- clock-names
34+
35+
unevaluatedProperties: false
36+
37+
examples:
38+
- |
39+
#include <dt-bindings/clock/en7523-clk.h>
40+
41+
watchdog@1fbf0100 {
42+
compatible = "airoha,en7581-wdt";
43+
reg = <0x1fbf0100 0x3c>;
44+
45+
clocks = <&scuclk EN7523_CLK_BUS>;
46+
clock-names = "bus";
47+
};

‎Documentation/devicetree/bindings/watchdog/fsl-imx-wdt.yaml

Lines changed: 14 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -48,6 +48,8 @@ properties:
4848
clocks:
4949
maxItems: 1
5050

51+
big-endian: true
52+
5153
fsl,ext-reset-output:
5254
$ref: /schemas/types.yaml#/definitions/flag
5355
description: |
@@ -93,6 +95,18 @@ allOf:
9395
properties:
9496
fsl,suspend-in-wait: false
9597

98+
- if:
99+
not:
100+
properties:
101+
compatible:
102+
contains:
103+
enum:
104+
- fsl,ls1012a-wdt
105+
- fsl,ls1043a-wdt
106+
then:
107+
properties:
108+
big-endian: false
109+
96110
unevaluatedProperties: false
97111

98112
examples:

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

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -26,6 +26,8 @@ properties:
2626
- qcom,apss-wdt-msm8994
2727
- qcom,apss-wdt-qcm2290
2828
- qcom,apss-wdt-qcs404
29+
- qcom,apss-wdt-qcs615
30+
- qcom,apss-wdt-qcs8300
2931
- qcom,apss-wdt-sa8255p
3032
- qcom,apss-wdt-sa8775p
3133
- qcom,apss-wdt-sc7180

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

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -26,6 +26,7 @@ properties:
2626
- samsung,exynos7-wdt # for Exynos7
2727
- samsung,exynos850-wdt # for Exynos850
2828
- samsung,exynosautov9-wdt # for Exynosautov9
29+
- samsung,exynosautov920-wdt # for Exynosautov920
2930
- items:
3031
- enum:
3132
- tesla,fsd-wdt
@@ -77,6 +78,7 @@ allOf:
7778
- samsung,exynos7-wdt
7879
- samsung,exynos850-wdt
7980
- samsung,exynosautov9-wdt
81+
- samsung,exynosautov920-wdt
8082
then:
8183
required:
8284
- samsung,syscon-phandle
@@ -88,6 +90,7 @@ allOf:
8890
- google,gs101-wdt
8991
- samsung,exynos850-wdt
9092
- samsung,exynosautov9-wdt
93+
- samsung,exynosautov920-wdt
9194
then:
9295
properties:
9396
clocks:

‎Documentation/networking/bareudp.rst

Lines changed: 6 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -6,16 +6,17 @@ Bare UDP Tunnelling Module Documentation
66

77
There are various L3 encapsulation standards using UDP being discussed to
88
leverage the UDP based load balancing capability of different networks.
9-
MPLSoUDP (__ https://tools.ietf.org/html/rfc7510) is one among them.
9+
MPLSoUDP (https://tools.ietf.org/html/rfc7510) is one among them.
1010

1111
The Bareudp tunnel module provides a generic L3 encapsulation support for
1212
tunnelling different L3 protocols like MPLS, IP, NSH etc. inside a UDP tunnel.
1313

1414
Special Handling
1515
----------------
16+
1617
The bareudp device supports special handling for MPLS & IP as they can have
1718
multiple ethertypes.
18-
MPLS procotcol can have ethertypes ETH_P_MPLS_UC (unicast) & ETH_P_MPLS_MC (multicast).
19+
The MPLS protocol can have ethertypes ETH_P_MPLS_UC (unicast) & ETH_P_MPLS_MC (multicast).
1920
IP protocol can have ethertypes ETH_P_IP (v4) & ETH_P_IPV6 (v6).
2021
This special handling can be enabled only for ethertypes ETH_P_IP & ETH_P_MPLS_UC
2122
with a flag called multiproto mode.
@@ -52,7 +53,7 @@ be enabled explicitly with the "multiproto" flag.
5253
3) Device Usage
5354

5455
The bareudp device could be used along with OVS or flower filter in TC.
55-
The OVS or TC flower layer must set the tunnel information in SKB dst field before
56-
sending packet buffer to the bareudp device for transmission. On reception the
57-
bareudp device extracts and stores the tunnel information in SKB dst field before
56+
The OVS or TC flower layer must set the tunnel information in the SKB dst field before
57+
sending the packet buffer to the bareudp device for transmission. On reception, the
58+
bareUDP device extracts and stores the tunnel information in the SKB dst field before
5859
passing the packet buffer to the network stack.

‎Documentation/translations/it_IT/core-api/symbol-namespaces.rst

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -43,7 +43,7 @@ Tenete presente che per via dell'espansione delle macro questo argomento deve
4343
essere un simbolo di preprocessore. Per esempio per esportare il
4444
simbolo ``usb_stor_suspend`` nello spazio dei nomi ``USB_STORAGE`` usate::
4545

46-
EXPORT_SYMBOL_NS(usb_stor_suspend, USB_STORAGE);
46+
EXPORT_SYMBOL_NS(usb_stor_suspend, "USB_STORAGE");
4747

4848
Di conseguenza, nella tabella dei simboli del kernel ci sarà una voce
4949
rappresentata dalla struttura ``kernel_symbol`` che avrà il campo
@@ -69,7 +69,7 @@ Per esempio per esportare tutti i simboli definiti in usb-common nello spazio
6969
dei nomi USB_COMMON, si può aggiungere la seguente linea in
7070
drivers/usb/common/Makefile::
7171

72-
ccflags-y += -DDEFAULT_SYMBOL_NAMESPACE=USB_COMMON
72+
ccflags-y += -DDEFAULT_SYMBOL_NAMESPACE='"USB_COMMON"'
7373

7474
Questo cambierà tutte le macro EXPORT_SYMBOL() ed EXPORT_SYMBOL_GPL(). Invece,
7575
un simbolo esportato con EXPORT_SYMBOL_NS() non verrà cambiato e il simbolo
@@ -79,7 +79,7 @@ Una seconda possibilità è quella di definire il simbolo di preprocessore
7979
direttamente nei file da compilare. L'esempio precedente diventerebbe::
8080

8181
#undef DEFAULT_SYMBOL_NAMESPACE
82-
#define DEFAULT_SYMBOL_NAMESPACE USB_COMMON
82+
#define DEFAULT_SYMBOL_NAMESPACE "USB_COMMON"
8383

8484
Questo va messo prima di un qualsiasi uso di EXPORT_SYMBOL.
8585

@@ -94,7 +94,7 @@ dei nomi che contiene i simboli desiderati. Per esempio un modulo che
9494
usa il simbolo usb_stor_suspend deve importare lo spazio dei nomi
9595
USB_STORAGE usando la seguente dichiarazione::
9696

97-
MODULE_IMPORT_NS(USB_STORAGE);
97+
MODULE_IMPORT_NS("USB_STORAGE");
9898

9999
Questo creerà un'etichetta ``modinfo`` per ogni spazio dei nomi
100100
importato. Un risvolto di questo fatto è che gli spazi dei

‎Documentation/translations/zh_CN/core-api/symbol-namespaces.rst

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -48,7 +48,7 @@
4848
要是一个预处理器符号。例如，要把符号 ``usb_stor_suspend`` 导出到命名空间 ``USB_STORAGE``，
4949
请使用::
5050

51-
EXPORT_SYMBOL_NS(usb_stor_suspend, USB_STORAGE);
51+
EXPORT_SYMBOL_NS(usb_stor_suspend, "USB_STORAGE");
5252

5353
相应的 ksymtab 条目结构体 ``kernel_symbol`` 将有相应的成员 ``命名空间`` 集。
5454
导出时未指明命名空间的符号将指向 ``NULL`` 。如果没有定义命名空间，则默认没有。
@@ -66,7 +66,7 @@
6666
子系统的 ``Makefile`` 中定义默认命名空间。例如，如果要将usb-common中定义的所有符号导
6767
出到USB_COMMON命名空间，可以在drivers/usb/common/Makefile中添加这样一行::
6868

69-
ccflags-y += -DDEFAULT_SYMBOL_NAMESPACE=USB_COMMON
69+
ccflags-y += -DDEFAULT_SYMBOL_NAMESPACE='"USB_COMMON"'
7070

7171
这将影响所有 EXPORT_SYMBOL() 和 EXPORT_SYMBOL_GPL() 语句。当这个定义存在时，
7272
用EXPORT_SYMBOL_NS()导出的符号仍然会被导出到作为命名空间参数传递的命名空间中，
@@ -76,7 +76,7 @@
7676
成::
7777

7878
#undef DEFAULT_SYMBOL_NAMESPACE
79-
#define DEFAULT_SYMBOL_NAMESPACE USB_COMMON
79+
#define DEFAULT_SYMBOL_NAMESPACE "USB_COMMON"
8080

8181
应置于相关编译单元中任何 EXPORT_SYMBOL 宏之前
8282

@@ -88,7 +88,7 @@
8888
表示它所使用的命名空间的符号。例如，一个使用usb_stor_suspend符号的
8989
模块，需要使用如下语句导入命名空间USB_STORAGE::
9090

91-
MODULE_IMPORT_NS(USB_STORAGE);
91+
MODULE_IMPORT_NS("USB_STORAGE");
9292

9393
这将在模块中为每个导入的命名空间创建一个 ``modinfo`` 标签。这也顺带
9494
使得可以用modinfo检查模块已导入的命名空间::

‎Documentation/watchdog/watchdog-parameters.rst

Lines changed: 0 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -120,16 +120,6 @@ coh901327_wdt:
120120

121121
-------------------------------------------------
122122

123-
cpu5wdt:
124-
port:
125-
base address of watchdog card, default is 0x91
126-
verbose:
127-
be verbose, default is 0 (no)
128-
ticks:
129-
count down ticks, default is 10000
130-
131-
-------------------------------------------------
132-
133123
cpwd:
134124
wd0_timeout:
135125
Default watchdog0 timeout in 1/10secs

‎MAINTAINERS

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3376,6 +3376,8 @@ S: Maintained
33763376
T: git git://git.kernel.org/pub/scm/linux/kernel/git/arm64/linux.git
33773377
F: Documentation/arch/arm64/
33783378
F: arch/arm64/
3379+
F: drivers/virt/coco/arm-cca-guest/
3380+
F: drivers/virt/coco/pkvm-guest/
33793381
F: tools/testing/selftests/arm64/
33803382
X: arch/arm64/boot/dts/
33813383

@@ -16267,6 +16269,7 @@ F: Documentation/devicetree/bindings/net/
1626716269
F: Documentation/networking/net_cachelines/net_device.rst
1626816270
F: drivers/connector/
1626916271
F: drivers/net/
16272+
F: drivers/ptp/
1627016273
F: include/dt-bindings/net/
1627116274
F: include/linux/cn_proc.h
1627216275
F: include/linux/etherdevice.h
@@ -22407,7 +22410,7 @@ F: drivers/char/hw_random/jh7110-trng.c
2240722410

2240822411
STARFIVE WATCHDOG DRIVER
2240922412
M: Xingyu Wu <[email protected]>
22410-
M: Samin Guo <samin.guo@starfivetech.com>
22413+
M: Ziv Xu <ziv.xu@starfivetech.com>
2241122414
S: Supported
2241222415
F: Documentation/devicetree/bindings/watchdog/starfive*
2241322416
F: drivers/watchdog/starfive-wdt.c

‎Makefile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
VERSION = 6
33
PATCHLEVEL = 13
44
SUBLEVEL = 0
5-
EXTRAVERSION = -rc1
5+
EXTRAVERSION = -rc2
66
NAME = Baby Opossum Posse
77

88
# *DOCUMENTATION*

‎arch/arm64/crypto/aes-ce-ccm-glue.c

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

1919
#include "aes-ce-setkey.h"
2020

21-
MODULE_IMPORT_NS(CRYPTO_INTERNAL);
21+
MODULE_IMPORT_NS("CRYPTO_INTERNAL");
2222

2323
static int num_rounds(struct crypto_aes_ctx *ctx)
2424
{

‎arch/arm64/crypto/aes-glue.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1048,7 +1048,7 @@ static int __init aes_init(void)
10481048

10491049
#ifdef USE_V8_CRYPTO_EXTENSIONS
10501050
module_cpu_feature_match(AES, aes_init);
1051-
EXPORT_SYMBOL_NS(ce_aes_mac_update, CRYPTO_INTERNAL);
1051+
EXPORT_SYMBOL_NS(ce_aes_mac_update, "CRYPTO_INTERNAL");
10521052
#else
10531053
module_init(aes_init);
10541054
EXPORT_SYMBOL(neon_aes_ecb_encrypt);

‎arch/arm64/include/asm/cpucaps.h

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -44,6 +44,8 @@ cpucap_is_possible(const unsigned int cap)
4444
return IS_ENABLED(CONFIG_ARM64_TLB_RANGE);
4545
case ARM64_HAS_S1POE:
4646
return IS_ENABLED(CONFIG_ARM64_POE);
47+
case ARM64_HAS_GCS:
48+
return IS_ENABLED(CONFIG_ARM64_GCS);
4749
case ARM64_UNMAP_KERNEL_AT_EL0:
4850
return IS_ENABLED(CONFIG_UNMAP_KERNEL_AT_EL0);
4951
case ARM64_WORKAROUND_843419:

‎arch/arm64/include/asm/cpufeature.h

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -847,8 +847,7 @@ static inline bool system_supports_poe(void)
847847

848848
static inline bool system_supports_gcs(void)
849849
{
850-
return IS_ENABLED(CONFIG_ARM64_GCS) &&
851-
alternative_has_cap_unlikely(ARM64_HAS_GCS);
850+
return alternative_has_cap_unlikely(ARM64_HAS_GCS);
852851
}
853852

854853
static inline bool system_supports_haft(void)

‎arch/arm64/include/asm/mman.h

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,7 @@
77
#ifndef BUILD_VDSO
88
#include <linux/compiler.h>
99
#include <linux/fs.h>
10+
#include <linux/hugetlb.h>
1011
#include <linux/shmem_fs.h>
1112
#include <linux/types.h>
1213

@@ -44,7 +45,7 @@ static inline unsigned long arch_calc_vm_flag_bits(struct file *file,
4445
if (system_supports_mte()) {
4546
if (flags & (MAP_ANONYMOUS | MAP_HUGETLB))
4647
return VM_MTE_ALLOWED;
47-
if (shmem_file(file))
48+
if (shmem_file(file) || is_file_hugepages(file))
4849
return VM_MTE_ALLOWED;
4950
}
5051

0 commit comments

Comments
 (0)