All patches automatically rebased. Signed-off-by: John Audia <[email protected]>
@@ -6,10 +6,10 @@ ifdef CONFIG_TESTING_KERNEL
KERNEL_PATCHVER:=$(KERNEL_TESTING_PATCHVER)
endif
-LINUX_VERSION-5.4 = .153
+LINUX_VERSION-5.4 = .154
LINUX_VERSION-5.10 = .72
-LINUX_KERNEL_HASH-5.4.153 = 6d9f07c9d611e5a7317eb6d5114880bad5c2dc1ac48d89f861b887d2f4295f49
+LINUX_KERNEL_HASH-5.4.154 = 058994f4666b6b0474a4d5228583e394594e406783b7e93d487c2a66c35f3c06
LINUX_KERNEL_HASH-5.10.72 = b4d635afe7646ac6a6617c738e747ba0a6006675cd9735d18f672f8b1fba4c7c
remove_uri_prefix=$(subst git://,,$(subst http://,,$(subst https://,,$(1))))
@@ -202,7 +202,7 @@
+subsys_initcall(ar5312_gpio_init);
--- a/arch/mips/Kconfig
+++ b/arch/mips/Kconfig
-@@ -190,6 +190,7 @@ config ATH25
+@@ -192,6 +192,7 @@ config ATH25
select CEVT_R4K
select CSRC_R4K
select DMA_NONCOHERENT
@@ -15,7 +15,7 @@ Signed-off-by: John Crispin <[email protected]>
-@@ -218,6 +218,8 @@ config ATH79
+@@ -220,6 +220,8 @@ config ATH79
select SYS_SUPPORTS_BIG_ENDIAN
select SYS_SUPPORTS_MIPS16
select SYS_SUPPORTS_ZBOOT_UART_PROM
@@ -24,7 +24,7 @@ Signed-off-by: David S. Miller <[email protected]>
--- a/MAINTAINERS
+++ b/MAINTAINERS
-@@ -3207,6 +3207,15 @@ F: Documentation/devicetree/bindings/mip
+@@ -3208,6 +3208,15 @@ F: Documentation/devicetree/bindings/mip
F: arch/mips/bcm47xx/*
F: arch/mips/include/asm/mach-bcm47xx/*
@@ -117,7 +117,7 @@ Signed-off-by: David S. Miller <[email protected]>
+ };
-@@ -3212,7 +3212,7 @@ M: Rafał Miłecki <[email protected]>
+@@ -3213,7 +3213,7 @@ M: Rafał Miłecki <[email protected]>
M: [email protected]
L: [email protected]
S: Maintained
-@@ -3213,7 +3213,7 @@ M: [email protected]
+@@ -3214,7 +3214,7 @@ M: [email protected]
F: Documentation/devicetree/bindings/net/brcm,bcm4908-enet.yaml
@@ -24,7 +24,7 @@ Signed-off-by: Florian Fainelli <[email protected]>
-@@ -3414,6 +3414,16 @@ L: [email protected]
+@@ -3415,6 +3415,16 @@ L: [email protected]
F: drivers/firmware/broadcom/*
@@ -14,7 +14,7 @@ Signed-off-by: Jonas Gorski <[email protected]>
-@@ -292,6 +292,9 @@ config BCM63XX
+@@ -294,6 +294,9 @@ config BCM63XX
select SYNC_R4K
select IRQ_MIPS_CPU
@@ -44,7 +44,7 @@ Signed-off-by: Felix Fietkau <[email protected]>
device, it has to decide which ones to send first, which ones to
--- a/net/sched/sch_api.c
+++ b/net/sched/sch_api.c
-@@ -2272,7 +2272,7 @@ static int __init pktsched_init(void)
+@@ -2278,7 +2278,7 @@ static int __init pktsched_init(void)
return err;
}
@@ -1,6 +1,6 @@
-@@ -2379,6 +2379,12 @@ config MIPS_VPE_LOADER
+@@ -2381,6 +2381,12 @@ config MIPS_VPE_LOADER
Includes a loader for loading an elf relocatable object
onto another VPE and running it.
@@ -16,7 +16,7 @@ Signed-off-by: Ioana Ciornei <[email protected]>
-@@ -13437,6 +13437,8 @@ S: Maintained
+@@ -13438,6 +13438,8 @@ S: Maintained
F: drivers/bus/fsl-mc/
F: Documentation/devicetree/bindings/misc/fsl,qoriq-mc.txt
F: Documentation/networking/device_drivers/freescale/dpaa2/overview.rst
@@ -31,7 +31,7 @@ Signed-off-by: Ioana Ciornei <[email protected]>
+Users: Userspace drivers and management tools
-@@ -13439,6 +13439,7 @@ F: Documentation/devicetree/bindings/mis
+@@ -13440,6 +13440,7 @@ F: Documentation/devicetree/bindings/mis
F: Documentation/networking/dpaa2/overview.rst
F: include/uapi/linux/fsl_mc.h
-@@ -10825,6 +10825,7 @@ M: Microchip Linux Driver Support <UNGLi
+@@ -10826,6 +10826,7 @@ M: Microchip Linux Driver Support <UNGLi
S: Supported
F: drivers/net/ethernet/mscc/
@@ -39,7 +39,7 @@ Signed-off-by: David S. Miller <[email protected]>
-@@ -17355,6 +17355,13 @@ S: Maintained
+@@ -17356,6 +17356,13 @@ S: Maintained
F: drivers/input/serio/userio.c
F: include/uapi/linux/userio.h
@@ -57,7 +57,7 @@ Signed-off-by: David S. Miller <[email protected]>
-@@ -17360,6 +17360,7 @@ M: Vladimir Oltean <vladimir.oltean@nxp.
+@@ -17361,6 +17361,7 @@ M: Vladimir Oltean <vladimir.oltean@nxp.
M: Claudiu Manoil <[email protected]>
@@ -15,7 +15,7 @@ Signed-off-by: Dong Aisheng <[email protected]>
-@@ -6575,6 +6575,14 @@ F: drivers/ptp/ptp_qoriq_debugfs.c
+@@ -6576,6 +6576,14 @@ F: drivers/ptp/ptp_qoriq_debugfs.c
F: include/linux/fsl/ptp_qoriq.h
F: Documentation/devicetree/bindings/ptp/ptp-qoriq.txt
@@ -21,7 +21,7 @@ From http://git.kiszka.org/?p=linux.git;a=shortlog;h=refs/heads/queues/jailhouse
-@@ -8773,6 +8773,7 @@ L: [email protected]
+@@ -8774,6 +8774,7 @@ L: [email protected]
F: arch/x86/kernel/jailhouse.c
F: arch/x86/include/asm/jailhouse_para.h
@@ -100,7 +100,7 @@ Reviewed-by: Sahil Malhotra <[email protected]>
+ $ keyctl load secure kmk-master "load 'cat secure_key.blob'" @u
-@@ -9074,6 +9074,17 @@ F: include/keys/trusted-type.h
+@@ -9075,6 +9075,17 @@ F: include/keys/trusted-type.h
F: security/keys/trusted.c
F: include/keys/trusted.h
@@ -23,7 +23,7 @@ Reviewed-by: Sahil Malhotra <[email protected]>
-@@ -9084,6 +9084,7 @@ F: include/keys/secure-type.h
+@@ -9085,6 +9085,7 @@ F: include/keys/secure-type.h
F: security/keys/secure_key.c
F: security/keys/securekey_desc.c
F: security/keys/securekey_desc.h
@@ -34,7 +34,7 @@ Reviewed-by: Subrahmanya Lingappa <[email protected]>
-@@ -12503,7 +12503,7 @@ M: Hou Zhiqiang <[email protected]>
+@@ -12504,7 +12504,7 @@ M: Hou Zhiqiang <[email protected]>
F: Documentation/devicetree/bindings/pci/mobiveil-pcie.txt
@@ -20,7 +20,7 @@ Signed-off-by: Hou Zhiqiang <[email protected]>
-@@ -12500,6 +12500,7 @@ F: drivers/ntb/hw/mscc/
+@@ -12501,6 +12501,7 @@ F: drivers/ntb/hw/mscc/
PCI DRIVER FOR MOBIVEIL PCIE IP
M: Karthikeyan Mitran <[email protected]>
M: Hou Zhiqiang <[email protected]>
@@ -12,7 +12,7 @@ Signed-off-by: Zhao Qiang <[email protected]>
-@@ -6597,6 +6597,12 @@ F: drivers/soc/fsl/qe/
+@@ -6598,6 +6598,12 @@ F: drivers/soc/fsl/qe/
F: include/soc/fsl/*qe*.h
F: include/soc/fsl/*ucc*.h
@@ -10,7 +10,7 @@
platforms += sgi-ip27
-@@ -631,6 +631,26 @@ config RALINK
+@@ -633,6 +633,26 @@ config RALINK
select ARCH_HAS_RESET_CONTROLLER
select RESET_CONTROLLER