Skip to content

Commit 966a9b4

Browse files
kuba-mookuba-moo
committed
Merge git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net
drivers/net/can/pch_can.c ae64438 ("can: dev: fix skb drop check") 1dd1b52 ("can: remove obsolete PCH CAN driver") https://lore.kernel.org/all/[email protected]/ Signed-off-by: Jakub Kicinski <[email protected]>
2 parents c1b0510 + 4bbf342 commit 966a9b4

File tree

385 files changed

+4395
-2203
lines changed

Some content is hidden

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

385 files changed

+4395
-2203
lines changed

‎CREDITS

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -918,6 +918,11 @@ S: Ottawa, Ontario
918918
S: K1N 6Z9
919919
S: CANADA
920920

921+
N: Vivien Didelot
922+
E: [email protected]
923+
D: DSA framework and MV88E6XXX driver
924+
S: Montreal, Quebec, Canada
925+
921926
N: Jeff Dike
922927
E: [email protected]
923928
W: http://user-mode-linux.sourceforge.net

‎Documentation/arm64/booting.rst

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -340,6 +340,14 @@ Before jumping into the kernel, the following conditions must be met:
340340
- SMCR_EL2.LEN must be initialised to the same value for all CPUs the
341341
kernel will execute on.
342342

343+
- HWFGRTR_EL2.nTPIDR2_EL0 (bit 55) must be initialised to 0b01.
344+
345+
- HWFGWTR_EL2.nTPIDR2_EL0 (bit 55) must be initialised to 0b01.
346+
347+
- HWFGRTR_EL2.nSMPRI_EL1 (bit 54) must be initialised to 0b01.
348+
349+
- HWFGWTR_EL2.nSMPRI_EL1 (bit 54) must be initialised to 0b01.
350+
343351
For CPUs with the Scalable Matrix Extension FA64 feature (FEAT_SME_FA64)
344352

345353
- If EL3 is present:

‎Documentation/arm64/cpu-feature-registers.rst

Lines changed: 37 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -92,7 +92,7 @@ operation if the source belongs to the supported system register space.
9292

9393
The infrastructure emulates only the following system register space::
9494

95-
Op0=3, Op1=0, CRn=0, CRm=0,4,5,6,7
95+
Op0=3, Op1=0, CRn=0, CRm=0,2,3,4,5,6,7
9696

9797
(See Table C5-6 'System instruction encodings for non-Debug System
9898
register accesses' in ARMv8 ARM DDI 0487A.h, for the list of
@@ -293,6 +293,42 @@ infrastructure:
293293
| WFXT | [3-0] | y |
294294
+------------------------------+---------+---------+
295295

296+
10) MVFR0_EL1 - AArch32 Media and VFP Feature Register 0
297+
298+
+------------------------------+---------+---------+
299+
| Name | bits | visible |
300+
+------------------------------+---------+---------+
301+
| FPDP | [11-8] | y |
302+
+------------------------------+---------+---------+
303+
304+
11) MVFR1_EL1 - AArch32 Media and VFP Feature Register 1
305+
306+
+------------------------------+---------+---------+
307+
| Name | bits | visible |
308+
+------------------------------+---------+---------+
309+
| SIMDFMAC | [31-28] | y |
310+
+------------------------------+---------+---------+
311+
| SIMDSP | [19-16] | y |
312+
+------------------------------+---------+---------+
313+
| SIMDInt | [15-12] | y |
314+
+------------------------------+---------+---------+
315+
| SIMDLS | [11-8] | y |
316+
+------------------------------+---------+---------+
317+
318+
12) ID_ISAR5_EL1 - AArch32 Instruction Set Attribute Register 5
319+
320+
+------------------------------+---------+---------+
321+
| Name | bits | visible |
322+
+------------------------------+---------+---------+
323+
| CRC32 | [19-16] | y |
324+
+------------------------------+---------+---------+
325+
| SHA2 | [15-12] | y |
326+
+------------------------------+---------+---------+
327+
| SHA1 | [11-8] | y |
328+
+------------------------------+---------+---------+
329+
| AES | [7-4] | y |
330+
+------------------------------+---------+---------+
331+
296332

297333
Appendix I: Example
298334
-------------------

‎Documentation/devicetree/bindings/hwlock/qcom-hwspinlock.yaml

Lines changed: 21 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -15,9 +15,22 @@ description:
1515

1616
properties:
1717
compatible:
18-
enum:
19-
- qcom,sfpb-mutex
20-
- qcom,tcsr-mutex
18+
oneOf:
19+
- enum:
20+
- qcom,sfpb-mutex
21+
- qcom,tcsr-mutex
22+
- items:
23+
- enum:
24+
- qcom,apq8084-tcsr-mutex
25+
- qcom,ipq6018-tcsr-mutex
26+
- qcom,msm8226-tcsr-mutex
27+
- qcom,msm8994-tcsr-mutex
28+
- const: qcom,tcsr-mutex
29+
- items:
30+
- enum:
31+
- qcom,msm8974-tcsr-mutex
32+
- const: qcom,tcsr-mutex
33+
- const: syscon
2134

2235
reg:
2336
maxItems: 1
@@ -34,9 +47,9 @@ additionalProperties: false
3447

3548
examples:
3649
- |
37-
tcsr_mutex: hwlock@1f40000 {
38-
compatible = "qcom,tcsr-mutex";
39-
reg = <0x01f40000 0x40000>;
40-
#hwlock-cells = <1>;
41-
};
50+
hwlock@1f40000 {
51+
compatible = "qcom,tcsr-mutex";
52+
reg = <0x01f40000 0x40000>;
53+
#hwlock-cells = <1>;
54+
};
4255
...

‎Documentation/devicetree/bindings/net/engleder,tsnep.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -47,7 +47,7 @@ properties:
4747

4848
nvmem-cells: true
4949

50-
nvmem-cells-names: true
50+
nvmem-cell-names: true
5151

5252
phy-connection-type:
5353
enum:

‎Documentation/devicetree/bindings/power/fsl,imx-gpcv2.yaml

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -81,6 +81,9 @@ properties:
8181

8282
power-supply: true
8383

84+
power-domains:
85+
maxItems: 1
86+
8487
resets:
8588
description: |
8689
A number of phandles to resets that need to be asserted during

‎Documentation/driver-api/driver-model/devres.rst

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -279,6 +279,7 @@ GPIO
279279
devm_gpio_request_one()
280280

281281
I2C
282+
devm_i2c_add_adapter()
282283
devm_i2c_new_dummy_device()
283284

284285
IIO

‎Documentation/kbuild/reproducible-builds.rst

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -119,6 +119,16 @@ To avoid this, you can make the vDSO different for different
119119
kernel versions by including an arbitrary string of "salt" in it.
120120
This is specified by the Kconfig symbol ``CONFIG_BUILD_SALT``.
121121

122+
Git
123+
---
124+
125+
Uncommitted changes or different commit ids in git can also lead
126+
to different compilation results. For example, after executing
127+
``git reset HEAD^``, even if the code is the same, the
128+
``include/config/kernel.release`` generated during compilation
129+
will be different, which will eventually lead to binary differences.
130+
See ``scripts/setlocalversion`` for details.
131+
122132
.. _KBUILD_BUILD_TIMESTAMP: kbuild.html#kbuild-build-timestamp
123133
.. _KBUILD_BUILD_USER and KBUILD_BUILD_HOST: kbuild.html#kbuild-build-user-kbuild-build-host
124134
.. _KCFLAGS: kbuild.html#kcflags

‎MAINTAINERS

Lines changed: 9 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -3985,7 +3985,7 @@ M: Rafał Miłecki <[email protected]>
39853985
R: Broadcom internal kernel review list <[email protected]>
39863986
L: [email protected] (moderated for non-subscribers)
39873987
S: Maintained
3988-
T: git git://github.com/broadcom/stblinux.git
3988+
T: git https://github.com/broadcom/stblinux.git
39893989
F: Documentation/devicetree/bindings/arm/bcm/brcm,bcmbca.yaml
39903990
F: arch/arm64/boot/dts/broadcom/bcmbca/*
39913991
N: bcmbca
@@ -4010,7 +4010,7 @@ R: Broadcom internal kernel review list <[email protected]>
40104010
L: [email protected] (moderated for non-subscribers)
40114011
L: [email protected] (moderated for non-subscribers)
40124012
S: Maintained
4013-
T: git git://github.com/broadcom/stblinux.git
4013+
T: git https://github.com/broadcom/stblinux.git
40144014
F: Documentation/devicetree/bindings/pci/brcm,stb-pcie.yaml
40154015
F: drivers/pci/controller/pcie-brcmstb.c
40164016
F: drivers/staging/vc04_services
@@ -4024,7 +4024,7 @@ M: Ray Jui <[email protected]>
40244024
M: Scott Branden <[email protected]>
40254025
R: Broadcom internal kernel review list <[email protected]>
40264026
S: Maintained
4027-
T: git git://github.com/broadcom/mach-bcm
4027+
T: git https://github.com/broadcom/mach-bcm
40284028
F: arch/arm/mach-bcm/
40294029
N: bcm281*
40304030
N: bcm113*
@@ -4089,7 +4089,7 @@ M: Florian Fainelli <[email protected]>
40894089
R: Broadcom internal kernel review list <[email protected]>
40904090
L: [email protected] (moderated for non-subscribers)
40914091
S: Maintained
4092-
T: git git://github.com/broadcom/stblinux.git
4092+
T: git https://github.com/broadcom/stblinux.git
40934093
F: Documentation/devicetree/bindings/pci/brcm,stb-pcie.yaml
40944094
F: arch/arm/boot/dts/bcm7*.dts*
40954095
F: arch/arm/include/asm/hardware/cache-b15-rac.h
@@ -4122,7 +4122,7 @@ M: Florian Fainelli <[email protected]>
41224122
R: Broadcom internal kernel review list <[email protected]>
41234123
L: [email protected]
41244124
S: Maintained
4125-
T: git git://github.com/broadcom/stblinux.git
4125+
T: git https://github.com/broadcom/stblinux.git
41264126
F: arch/mips/bmips/*
41274127
F: arch/mips/boot/dts/brcm/bcm*.dts*
41284128
F: arch/mips/include/asm/mach-bmips/*
@@ -4263,7 +4263,7 @@ M: Scott Branden <[email protected]>
42634263
R: Broadcom internal kernel review list <[email protected]>
42644264
L: [email protected] (moderated for non-subscribers)
42654265
S: Maintained
4266-
T: git git://github.com/broadcom/stblinux.git
4266+
T: git https://github.com/broadcom/stblinux.git
42674267
F: arch/arm64/boot/dts/broadcom/northstar2/*
42684268
F: arch/arm64/boot/dts/broadcom/stingray/*
42694269
F: drivers/clk/bcm/clk-ns*
@@ -4333,7 +4333,7 @@ M: Florian Fainelli <[email protected]>
43334333
R: Broadcom internal kernel review list <[email protected]>
43344334
L: [email protected]
43354335
S: Maintained
4336-
T: git git://github.com/broadcom/stblinux.git
4336+
T: git https://github.com/broadcom/stblinux.git
43374337
F: drivers/soc/bcm/bcm63xx/bcm-pmb.c
43384338
F: include/dt-bindings/soc/bcm-pmb.h
43394339

@@ -8604,8 +8604,8 @@ F: include/asm-generic/
86048604
F: include/uapi/asm-generic/
86058605

86068606
GENERIC PHY FRAMEWORK
8607-
M: Kishon Vijay Abraham I <[email protected]>
86088607
M: Vinod Koul <[email protected]>
8608+
M: Kishon Vijay Abraham I <[email protected]>
86098609
L: [email protected]
86108610
S: Supported
86118611
Q: https://patchwork.kernel.org/project/linux-phy/list/
@@ -9219,7 +9219,7 @@ W: https://www.hisilicon.com
92199219
F: drivers/i2c/busses/i2c-hisi.c
92209220

92219221
HISILICON LPC BUS DRIVER
9222-
M: john.garry@huawei.com
9222+
M: Jay Fang <f.fangjian@huawei.com>
92239223
S: Maintained
92249224
W: http://www.hisilicon.com
92259225
F: Documentation/devicetree/bindings/arm/hisilicon/low-pin-count.yaml
@@ -12229,7 +12229,6 @@ F: arch/mips/boot/dts/img/pistachio*
1222912229

1223012230
MARVELL 88E6XXX ETHERNET SWITCH FABRIC DRIVER
1223112231
M: Andrew Lunn <[email protected]>
12232-
M: Vivien Didelot <[email protected]>
1223312232
L: [email protected]
1223412233
S: Maintained
1223512234
F: Documentation/devicetree/bindings/net/dsa/marvell.txt
@@ -14328,7 +14327,6 @@ F: drivers/net/wireless/
1432814327

1432914328
NETWORKING [DSA]
1433014329
M: Andrew Lunn <[email protected]>
14331-
M: Vivien Didelot <[email protected]>
1433214330
M: Florian Fainelli <[email protected]>
1433314331
M: Vladimir Oltean <[email protected]>
1433414332
S: Maintained

‎Makefile

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
VERSION = 6
33
PATCHLEVEL = 1
44
SUBLEVEL = 0
5-
EXTRAVERSION = -rc3
5+
EXTRAVERSION = -rc4
66
NAME = Hurr durr I'ma ninja sloth
77

88
# *DOCUMENTATION*
@@ -1218,7 +1218,7 @@ quiet_cmd_ar_vmlinux.a = AR $@
12181218
cmd_ar_vmlinux.a = \
12191219
rm -f $@; \
12201220
$(AR) cDPrST $@ $(KBUILD_VMLINUX_OBJS); \
1221-
$(AR) mPiT $$($(AR) t $@ | head -n1) $@ $$($(AR) t $@ | grep -F --file=$(srctree)/scripts/head-object-list.txt)
1221+
$(AR) mPiT $$($(AR) t $@ | sed -n 1p) $@ $$($(AR) t $@ | grep -F -f $(srctree)/scripts/head-object-list.txt)
12221222

12231223
targets += vmlinux.a
12241224
vmlinux.a: $(KBUILD_VMLINUX_OBJS) scripts/head-object-list.txt autoksyms_recursive FORCE

‎arch/arm/boot/dts/imx6q-yapp4-crux.dts

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -33,6 +33,10 @@
3333
status = "okay";
3434
};
3535

36+
&reg_pu {
37+
regulator-always-on;
38+
};
39+
3640
&reg_usb_h1_vbus {
3741
status = "okay";
3842
};

‎arch/arm/boot/dts/imx6qdl-gw5910.dtsi

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

3030
user-pb {
3131
label = "user_pb";
32-
gpios = <&gsc_gpio 0 GPIO_ACTIVE_LOW>;
32+
gpios = <&gsc_gpio 2 GPIO_ACTIVE_LOW>;
3333
linux,code = <BTN_0>;
3434
};
3535

‎arch/arm/boot/dts/imx6qdl-gw5913.dtsi

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

2727
user-pb {
2828
label = "user_pb";
29-
gpios = <&gsc_gpio 0 GPIO_ACTIVE_LOW>;
29+
gpios = <&gsc_gpio 2 GPIO_ACTIVE_LOW>;
3030
linux,code = <BTN_0>;
3131
};
3232

‎arch/arm/boot/dts/imx6qp-yapp4-crux-plus.dts

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -33,6 +33,10 @@
3333
status = "okay";
3434
};
3535

36+
&reg_pu {
37+
regulator-always-on;
38+
};
39+
3640
&reg_usb_h1_vbus {
3741
status = "okay";
3842
};

‎arch/arm/boot/dts/ste-href.dtsi

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -24,6 +24,14 @@
2424
polling-delay = <0>;
2525
polling-delay-passive = <0>;
2626
thermal-sensors = <&bat_therm>;
27+
28+
trips {
29+
battery-crit-hi {
30+
temperature = <70000>;
31+
hysteresis = <2000>;
32+
type = "critical";
33+
};
34+
};
2735
};
2836
};
2937

‎arch/arm/boot/dts/ste-snowball.dts

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -28,6 +28,14 @@
2828
polling-delay = <0>;
2929
polling-delay-passive = <0>;
3030
thermal-sensors = <&bat_therm>;
31+
32+
trips {
33+
battery-crit-hi {
34+
temperature = <70000>;
35+
hysteresis = <2000>;
36+
type = "critical";
37+
};
38+
};
3139
};
3240
};
3341

‎arch/arm/boot/dts/ste-ux500-samsung-codina-tmo.dts

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -44,6 +44,14 @@
4444
polling-delay = <0>;
4545
polling-delay-passive = <0>;
4646
thermal-sensors = <&bat_therm>;
47+
48+
trips {
49+
battery-crit-hi {
50+
temperature = <70000>;
51+
hysteresis = <2000>;
52+
type = "critical";
53+
};
54+
};
4755
};
4856
};
4957

‎arch/arm/boot/dts/ste-ux500-samsung-codina.dts

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -57,6 +57,14 @@
5757
polling-delay = <0>;
5858
polling-delay-passive = <0>;
5959
thermal-sensors = <&bat_therm>;
60+
61+
trips {
62+
battery-crit-hi {
63+
temperature = <70000>;
64+
hysteresis = <2000>;
65+
type = "critical";
66+
};
67+
};
6068
};
6169
};
6270

‎arch/arm/boot/dts/ste-ux500-samsung-gavini.dts

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -30,6 +30,14 @@
3030
polling-delay = <0>;
3131
polling-delay-passive = <0>;
3232
thermal-sensors = <&bat_therm>;
33+
34+
trips {
35+
battery-crit-hi {
36+
temperature = <70000>;
37+
hysteresis = <2000>;
38+
type = "critical";
39+
};
40+
};
3341
};
3442
};
3543

0 commit comments

Comments
 (0)