Просмотр исходного кода

kernel: bump 5.4 to 5.4.154

All patches automatically rebased.

Signed-off-by: John Audia <[email protected]>
John Audia 4 лет назад
Родитель
Сommit
3d0499bcdb
23 измененных файлов с 24 добавлено и 24 удалено
  1. 2 2
      include/kernel-version.mk
  2. 1 1
      target/linux/ath25/patches-5.4/107-ar5312_gpio.patch
  3. 1 1
      target/linux/ath79/patches-5.4/0032-MIPS-ath79-sanitize-symbols.patch
  4. 1 1
      target/linux/bcm4908/patches-5.4/072-v5.12-0002-net-broadcom-bcm4908enet-add-BCM4908-controller-driv.patch
  5. 1 1
      target/linux/bcm4908/patches-5.4/073-v5.12-0001-dt-bindings-net-rename-BCM4908-Ethernet-binding.patch
  6. 1 1
      target/linux/bcm4908/patches-5.4/073-v5.12-0003-net-broadcom-rename-BCM4908-driver-update-DT-binding.patch
  7. 1 1
      target/linux/bcm4908/patches-5.4/082-v5.12-0002-soc-bcm-add-PM-driver-for-Broadcom-s-PMB.patch
  8. 1 1
      target/linux/bcm63xx/patches-5.4/322-MIPS-BCM63XX-switch-to-IRQ_DOMAIN.patch
  9. 1 1
      target/linux/generic/hack-5.4/661-use_fq_codel_by_default.patch
  10. 1 1
      target/linux/lantiq/patches-5.4/0152-lantiq-VPE.patch
  11. 1 1
      target/linux/layerscape/patches-5.4/701-net-0130-bus-fsl-mc-move-fsl_mc_command-struct-in-a-uapi-head.patch
  12. 1 1
      target/linux/layerscape/patches-5.4/701-net-0132-bus-fsl-mc-add-root-dprc-rescan-attribute.patch
  13. 1 1
      target/linux/layerscape/patches-5.4/701-net-0261-net-mscc-ocelot-publish-ocelot_sys.h-to-include-soc-.patch
  14. 1 1
      target/linux/layerscape/patches-5.4/701-net-0262-net-dsa-ocelot-add-tagger-for-Ocelot-Felix-switches.patch
  15. 1 1
      target/linux/layerscape/patches-5.4/701-net-0263-net-dsa-ocelot-add-driver-for-Felix-switch-family.patch
  16. 1 1
      target/linux/layerscape/patches-5.4/701-net-0323-staging-fsl_ppfe-eth-add-pfe-support-to-Kconfig-and-.patch
  17. 1 1
      target/linux/layerscape/patches-5.4/809-jailhouse-0020-jailhouse-Add-simple-debug-console-via-the-hyperviso.patch
  18. 1 1
      target/linux/layerscape/patches-5.4/810-keys-0001-security-keys-secure_key-Adds-the-secure-key-support.patch
  19. 1 1
      target/linux/layerscape/patches-5.4/810-keys-0002-encrypted_keys-Adds-support-for-secure-key-type-as-m.patch
  20. 1 1
      target/linux/layerscape/patches-5.4/812-pcie-0009-PCI-mobiveil-Refactor-Mobiveil-PCIe-Host-Bridge-IP-d.patch
  21. 1 1
      target/linux/layerscape/patches-5.4/812-pcie-0016-PCI-mobiveil-Add-the-EP-driver-support.patch
  22. 1 1
      target/linux/layerscape/patches-5.4/814-qe-0006-config-qe-add-irq-qeic-support.patch
  23. 1 1
      target/linux/realtek/patches-5.4/300-mips-add-rtl838x-platform.patch

+ 2 - 2
include/kernel-version.mk

@@ -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))))

+ 1 - 1
target/linux/ath25/patches-5.4/107-ar5312_gpio.patch

@@ -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

+ 1 - 1
target/linux/ath79/patches-5.4/0032-MIPS-ath79-sanitize-symbols.patch

@@ -15,7 +15,7 @@ Signed-off-by: John Crispin <[email protected]>
 
 --- a/arch/mips/Kconfig
 +++ b/arch/mips/Kconfig
-@@ -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

+ 1 - 1
target/linux/bcm4908/patches-5.4/072-v5.12-0002-net-broadcom-bcm4908enet-add-BCM4908-controller-driv.patch

@@ -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/*
  

+ 1 - 1
target/linux/bcm4908/patches-5.4/073-v5.12-0001-dt-bindings-net-rename-BCM4908-Ethernet-binding.patch

@@ -117,7 +117,7 @@ Signed-off-by: David S. Miller <[email protected]>
 +    };
 --- a/MAINTAINERS
 +++ b/MAINTAINERS
-@@ -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

+ 1 - 1
target/linux/bcm4908/patches-5.4/073-v5.12-0003-net-broadcom-rename-BCM4908-driver-update-DT-binding.patch

@@ -24,7 +24,7 @@ Signed-off-by: David S. Miller <[email protected]>
 
 --- a/MAINTAINERS
 +++ b/MAINTAINERS
-@@ -3213,7 +3213,7 @@ M:	[email protected]
+@@ -3214,7 +3214,7 @@ M:	[email protected]
  L:	[email protected]
  S:	Maintained
  F:	Documentation/devicetree/bindings/net/brcm,bcm4908-enet.yaml

+ 1 - 1
target/linux/bcm4908/patches-5.4/082-v5.12-0002-soc-bcm-add-PM-driver-for-Broadcom-s-PMB.patch

@@ -24,7 +24,7 @@ Signed-off-by: Florian Fainelli <[email protected]>
 
 --- a/MAINTAINERS
 +++ b/MAINTAINERS
-@@ -3414,6 +3414,16 @@ L:	[email protected]
+@@ -3415,6 +3415,16 @@ L:	[email protected]
  S:	Maintained
  F:	drivers/firmware/broadcom/*
  

+ 1 - 1
target/linux/bcm63xx/patches-5.4/322-MIPS-BCM63XX-switch-to-IRQ_DOMAIN.patch

@@ -14,7 +14,7 @@ Signed-off-by: Jonas Gorski <[email protected]>
 
 --- a/arch/mips/Kconfig
 +++ b/arch/mips/Kconfig
-@@ -292,6 +292,9 @@ config BCM63XX
+@@ -294,6 +294,9 @@ config BCM63XX
  	select SYNC_R4K
  	select DMA_NONCOHERENT
  	select IRQ_MIPS_CPU

+ 1 - 1
target/linux/generic/hack-5.4/661-use_fq_codel_by_default.patch

@@ -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 - 1
target/linux/lantiq/patches-5.4/0152-lantiq-VPE.patch

@@ -1,6 +1,6 @@
 --- a/arch/mips/Kconfig
 +++ b/arch/mips/Kconfig
-@@ -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.
  

+ 1 - 1
target/linux/layerscape/patches-5.4/701-net-0130-bus-fsl-mc-move-fsl_mc_command-struct-in-a-uapi-head.patch

@@ -16,7 +16,7 @@ Signed-off-by: Ioana Ciornei <[email protected]>
 
 --- a/MAINTAINERS
 +++ b/MAINTAINERS
-@@ -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

+ 1 - 1
target/linux/layerscape/patches-5.4/701-net-0132-bus-fsl-mc-add-root-dprc-rescan-attribute.patch

@@ -31,7 +31,7 @@ Signed-off-by: Ioana Ciornei <[email protected]>
 +Users:		Userspace drivers and management tools
 --- a/MAINTAINERS
 +++ b/MAINTAINERS
-@@ -13439,6 +13439,7 @@ F:	Documentation/devicetree/bindings/mis
+@@ -13440,6 +13440,7 @@ F:	Documentation/devicetree/bindings/mis
  F:	Documentation/networking/device_drivers/freescale/dpaa2/overview.rst
  F:	Documentation/networking/dpaa2/overview.rst
  F:	include/uapi/linux/fsl_mc.h

+ 1 - 1
target/linux/layerscape/patches-5.4/701-net-0261-net-mscc-ocelot-publish-ocelot_sys.h-to-include-soc-.patch

@@ -24,7 +24,7 @@ Signed-off-by: David S. Miller <[email protected]>
 
 --- a/MAINTAINERS
 +++ b/MAINTAINERS
-@@ -10825,6 +10825,7 @@ M:	Microchip Linux Driver Support <UNGLi
+@@ -10826,6 +10826,7 @@ M:	Microchip Linux Driver Support <UNGLi
  L:	[email protected]
  S:	Supported
  F:	drivers/net/ethernet/mscc/

+ 1 - 1
target/linux/layerscape/patches-5.4/701-net-0262-net-dsa-ocelot-add-tagger-for-Ocelot-Felix-switches.patch

@@ -39,7 +39,7 @@ Signed-off-by: David S. Miller <[email protected]>
 
 --- a/MAINTAINERS
 +++ b/MAINTAINERS
-@@ -17355,6 +17355,13 @@ S:	Maintained
+@@ -17356,6 +17356,13 @@ S:	Maintained
  F:	drivers/input/serio/userio.c
  F:	include/uapi/linux/userio.h
  

+ 1 - 1
target/linux/layerscape/patches-5.4/701-net-0263-net-dsa-ocelot-add-driver-for-Felix-switch-family.patch

@@ -57,7 +57,7 @@ Signed-off-by: David S. Miller <[email protected]>
 
 --- a/MAINTAINERS
 +++ b/MAINTAINERS
-@@ -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]>
  L:	[email protected]
  S:	Maintained

+ 1 - 1
target/linux/layerscape/patches-5.4/701-net-0323-staging-fsl_ppfe-eth-add-pfe-support-to-Kconfig-and-.patch

@@ -15,7 +15,7 @@ Signed-off-by: Dong Aisheng <[email protected]>
 
 --- a/MAINTAINERS
 +++ b/MAINTAINERS
-@@ -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
  

+ 1 - 1
target/linux/layerscape/patches-5.4/809-jailhouse-0020-jailhouse-Add-simple-debug-console-via-the-hyperviso.patch

@@ -21,7 +21,7 @@ From http://git.kiszka.org/?p=linux.git;a=shortlog;h=refs/heads/queues/jailhouse
 
 --- a/MAINTAINERS
 +++ b/MAINTAINERS
-@@ -8773,6 +8773,7 @@ L:	[email protected]
+@@ -8774,6 +8774,7 @@ L:	[email protected]
  S:	Maintained
  F:	arch/x86/kernel/jailhouse.c
  F:	arch/x86/include/asm/jailhouse_para.h

+ 1 - 1
target/linux/layerscape/patches-5.4/810-keys-0001-security-keys-secure_key-Adds-the-secure-key-support.patch

@@ -100,7 +100,7 @@ Reviewed-by: Sahil Malhotra <[email protected]>
 +	$ keyctl load secure kmk-master "load 'cat secure_key.blob'" @u
 --- a/MAINTAINERS
 +++ b/MAINTAINERS
-@@ -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
  

+ 1 - 1
target/linux/layerscape/patches-5.4/810-keys-0002-encrypted_keys-Adds-support-for-secure-key-type-as-m.patch

@@ -23,7 +23,7 @@ Reviewed-by: Sahil Malhotra <[email protected]>
 
 --- a/MAINTAINERS
 +++ b/MAINTAINERS
-@@ -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

+ 1 - 1
target/linux/layerscape/patches-5.4/812-pcie-0009-PCI-mobiveil-Refactor-Mobiveil-PCIe-Host-Bridge-IP-d.patch

@@ -34,7 +34,7 @@ Reviewed-by: Subrahmanya Lingappa <[email protected]>
 
 --- a/MAINTAINERS
 +++ b/MAINTAINERS
-@@ -12503,7 +12503,7 @@ M:	Hou Zhiqiang <[email protected]>
+@@ -12504,7 +12504,7 @@ M:	Hou Zhiqiang <[email protected]>
  L:	[email protected]
  S:	Supported
  F:	Documentation/devicetree/bindings/pci/mobiveil-pcie.txt

+ 1 - 1
target/linux/layerscape/patches-5.4/812-pcie-0016-PCI-mobiveil-Add-the-EP-driver-support.patch

@@ -20,7 +20,7 @@ Signed-off-by: Hou Zhiqiang <[email protected]>
 
 --- a/MAINTAINERS
 +++ b/MAINTAINERS
-@@ -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]>

+ 1 - 1
target/linux/layerscape/patches-5.4/814-qe-0006-config-qe-add-irq-qeic-support.patch

@@ -12,7 +12,7 @@ Signed-off-by: Zhao Qiang <[email protected]>
 
 --- a/MAINTAINERS
 +++ b/MAINTAINERS
-@@ -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
  

+ 1 - 1
target/linux/realtek/patches-5.4/300-mips-add-rtl838x-platform.patch

@@ -10,7 +10,7 @@
  platforms += sgi-ip27
 --- a/arch/mips/Kconfig
 +++ b/arch/mips/Kconfig
-@@ -631,6 +631,26 @@ config RALINK
+@@ -633,6 +633,26 @@ config RALINK
  	select ARCH_HAS_RESET_CONTROLLER
  	select RESET_CONTROLLER