[openwrt/openwrt] kernel: bump 5.4 to 5.4.154
LEDE Commits
lede-commits at lists.infradead.org
Wed Oct 20 15:18:46 PDT 2021
hauke pushed a commit to openwrt/openwrt.git, branch master:
https://git.openwrt.org/3d0499bcdb9869075d1a7470c73c9ea4c7a32e8f
commit 3d0499bcdb9869075d1a7470c73c9ea4c7a32e8f
Author: John Audia <graysky at archlinux.us>
AuthorDate: Sun Oct 17 09:14:42 2021 -0400
kernel: bump 5.4 to 5.4.154
All patches automatically rebased.
Signed-off-by: John Audia <graysky at archlinux.us>
---
include/kernel-version.mk | 4 ++--
target/linux/ath25/patches-5.4/107-ar5312_gpio.patch | 2 +-
target/linux/ath79/patches-5.4/0032-MIPS-ath79-sanitize-symbols.patch | 2 +-
...12-0002-net-broadcom-bcm4908enet-add-BCM4908-controller-driv.patch | 2 +-
...3-v5.12-0001-dt-bindings-net-rename-BCM4908-Ethernet-binding.patch | 2 +-
...12-0003-net-broadcom-rename-BCM4908-driver-update-DT-binding.patch | 2 +-
.../082-v5.12-0002-soc-bcm-add-PM-driver-for-Broadcom-s-PMB.patch | 2 +-
.../bcm63xx/patches-5.4/322-MIPS-BCM63XX-switch-to-IRQ_DOMAIN.patch | 2 +-
target/linux/generic/hack-5.4/661-use_fq_codel_by_default.patch | 2 +-
target/linux/lantiq/patches-5.4/0152-lantiq-VPE.patch | 2 +-
...et-0130-bus-fsl-mc-move-fsl_mc_command-struct-in-a-uapi-head.patch | 2 +-
.../701-net-0132-bus-fsl-mc-add-root-dprc-rescan-attribute.patch | 2 +-
...et-0261-net-mscc-ocelot-publish-ocelot_sys.h-to-include-soc-.patch | 2 +-
...net-0262-net-dsa-ocelot-add-tagger-for-Ocelot-Felix-switches.patch | 2 +-
...1-net-0263-net-dsa-ocelot-add-driver-for-Felix-switch-family.patch | 2 +-
...et-0323-staging-fsl_ppfe-eth-add-pfe-support-to-Kconfig-and-.patch | 2 +-
...se-0020-jailhouse-Add-simple-debug-console-via-the-hyperviso.patch | 2 +-
...ys-0001-security-keys-secure_key-Adds-the-secure-key-support.patch | 2 +-
...ys-0002-encrypted_keys-Adds-support-for-secure-key-type-as-m.patch | 2 +-
...ie-0009-PCI-mobiveil-Refactor-Mobiveil-PCIe-Host-Bridge-IP-d.patch | 2 +-
.../812-pcie-0016-PCI-mobiveil-Add-the-EP-driver-support.patch | 2 +-
.../patches-5.4/814-qe-0006-config-qe-add-irq-qeic-support.patch | 2 +-
target/linux/realtek/patches-5.4/300-mips-add-rtl838x-platform.patch | 2 +-
23 files changed, 24 insertions(+), 24 deletions(-)
diff --git a/include/kernel-version.mk b/include/kernel-version.mk
index 46aa185525..4008511940 100644
--- a/include/kernel-version.mk
+++ b/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))))
diff --git a/target/linux/ath25/patches-5.4/107-ar5312_gpio.patch b/target/linux/ath25/patches-5.4/107-ar5312_gpio.patch
index 7b8c9650cc..321ebc7fb8 100644
--- a/target/linux/ath25/patches-5.4/107-ar5312_gpio.patch
+++ b/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
diff --git a/target/linux/ath79/patches-5.4/0032-MIPS-ath79-sanitize-symbols.patch b/target/linux/ath79/patches-5.4/0032-MIPS-ath79-sanitize-symbols.patch
index 9fa199a204..3d79121e94 100644
--- a/target/linux/ath79/patches-5.4/0032-MIPS-ath79-sanitize-symbols.patch
+++ b/target/linux/ath79/patches-5.4/0032-MIPS-ath79-sanitize-symbols.patch
@@ -15,7 +15,7 @@ Signed-off-by: John Crispin <john at phrozen.org>
--- 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
diff --git a/target/linux/bcm4908/patches-5.4/072-v5.12-0002-net-broadcom-bcm4908enet-add-BCM4908-controller-driv.patch b/target/linux/bcm4908/patches-5.4/072-v5.12-0002-net-broadcom-bcm4908enet-add-BCM4908-controller-driv.patch
index adef3d87ac..3f6444e6b3 100644
--- a/target/linux/bcm4908/patches-5.4/072-v5.12-0002-net-broadcom-bcm4908enet-add-BCM4908-controller-driv.patch
+++ b/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 <davem at davemloft.net>
--- 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/*
diff --git a/target/linux/bcm4908/patches-5.4/073-v5.12-0001-dt-bindings-net-rename-BCM4908-Ethernet-binding.patch b/target/linux/bcm4908/patches-5.4/073-v5.12-0001-dt-bindings-net-rename-BCM4908-Ethernet-binding.patch
index df3fca624a..563cb3ba91 100644
--- a/target/linux/bcm4908/patches-5.4/073-v5.12-0001-dt-bindings-net-rename-BCM4908-Ethernet-binding.patch
+++ b/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 <davem at davemloft.net>
+ };
--- a/MAINTAINERS
+++ b/MAINTAINERS
-@@ -3212,7 +3212,7 @@ M: Rafał Miłecki <rafal at milecki.pl>
+@@ -3213,7 +3213,7 @@ M: Rafał Miłecki <rafal at milecki.pl>
M: bcm-kernel-feedback-list at broadcom.com
L: netdev at vger.kernel.org
S: Maintained
diff --git a/target/linux/bcm4908/patches-5.4/073-v5.12-0003-net-broadcom-rename-BCM4908-driver-update-DT-binding.patch b/target/linux/bcm4908/patches-5.4/073-v5.12-0003-net-broadcom-rename-BCM4908-driver-update-DT-binding.patch
index 603d4c9c0c..66681963c1 100644
--- a/target/linux/bcm4908/patches-5.4/073-v5.12-0003-net-broadcom-rename-BCM4908-driver-update-DT-binding.patch
+++ b/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 <davem at davemloft.net>
--- a/MAINTAINERS
+++ b/MAINTAINERS
-@@ -3213,7 +3213,7 @@ M: bcm-kernel-feedback-list at broadcom.com
+@@ -3214,7 +3214,7 @@ M: bcm-kernel-feedback-list at broadcom.com
L: netdev at vger.kernel.org
S: Maintained
F: Documentation/devicetree/bindings/net/brcm,bcm4908-enet.yaml
diff --git a/target/linux/bcm4908/patches-5.4/082-v5.12-0002-soc-bcm-add-PM-driver-for-Broadcom-s-PMB.patch b/target/linux/bcm4908/patches-5.4/082-v5.12-0002-soc-bcm-add-PM-driver-for-Broadcom-s-PMB.patch
index 5b8781a339..40126a968b 100644
--- a/target/linux/bcm4908/patches-5.4/082-v5.12-0002-soc-bcm-add-PM-driver-for-Broadcom-s-PMB.patch
+++ b/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 <f.fainelli at gmail.com>
--- a/MAINTAINERS
+++ b/MAINTAINERS
-@@ -3414,6 +3414,16 @@ L: linux-mips at vger.kernel.org
+@@ -3415,6 +3415,16 @@ L: linux-mips at vger.kernel.org
S: Maintained
F: drivers/firmware/broadcom/*
diff --git a/target/linux/bcm63xx/patches-5.4/322-MIPS-BCM63XX-switch-to-IRQ_DOMAIN.patch b/target/linux/bcm63xx/patches-5.4/322-MIPS-BCM63XX-switch-to-IRQ_DOMAIN.patch
index eff4af025e..7fe81ba5b0 100644
--- a/target/linux/bcm63xx/patches-5.4/322-MIPS-BCM63XX-switch-to-IRQ_DOMAIN.patch
+++ b/target/linux/bcm63xx/patches-5.4/322-MIPS-BCM63XX-switch-to-IRQ_DOMAIN.patch
@@ -14,7 +14,7 @@ Signed-off-by: Jonas Gorski <jogo at openwrt.org>
--- 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
diff --git a/target/linux/generic/hack-5.4/661-use_fq_codel_by_default.patch b/target/linux/generic/hack-5.4/661-use_fq_codel_by_default.patch
index cd86a7ab84..bbe43d24c2 100644
--- a/target/linux/generic/hack-5.4/661-use_fq_codel_by_default.patch
+++ b/target/linux/generic/hack-5.4/661-use_fq_codel_by_default.patch
@@ -44,7 +44,7 @@ Signed-off-by: Felix Fietkau <nbd at nbd.name>
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;
}
diff --git a/target/linux/lantiq/patches-5.4/0152-lantiq-VPE.patch b/target/linux/lantiq/patches-5.4/0152-lantiq-VPE.patch
index 2aff479024..f9c116a330 100644
--- a/target/linux/lantiq/patches-5.4/0152-lantiq-VPE.patch
+++ b/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.
diff --git a/target/linux/layerscape/patches-5.4/701-net-0130-bus-fsl-mc-move-fsl_mc_command-struct-in-a-uapi-head.patch b/target/linux/layerscape/patches-5.4/701-net-0130-bus-fsl-mc-move-fsl_mc_command-struct-in-a-uapi-head.patch
index 335ec7108c..5aa85bf51c 100644
--- a/target/linux/layerscape/patches-5.4/701-net-0130-bus-fsl-mc-move-fsl_mc_command-struct-in-a-uapi-head.patch
+++ b/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 <ioana.ciornei at nxp.com>
--- 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
diff --git a/target/linux/layerscape/patches-5.4/701-net-0132-bus-fsl-mc-add-root-dprc-rescan-attribute.patch b/target/linux/layerscape/patches-5.4/701-net-0132-bus-fsl-mc-add-root-dprc-rescan-attribute.patch
index 9062346821..8fd964993e 100644
--- a/target/linux/layerscape/patches-5.4/701-net-0132-bus-fsl-mc-add-root-dprc-rescan-attribute.patch
+++ b/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 <ioana.ciornei at nxp.com>
+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
diff --git a/target/linux/layerscape/patches-5.4/701-net-0261-net-mscc-ocelot-publish-ocelot_sys.h-to-include-soc-.patch b/target/linux/layerscape/patches-5.4/701-net-0261-net-mscc-ocelot-publish-ocelot_sys.h-to-include-soc-.patch
index 98556523e3..f65ae631dc 100644
--- a/target/linux/layerscape/patches-5.4/701-net-0261-net-mscc-ocelot-publish-ocelot_sys.h-to-include-soc-.patch
+++ b/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 <davem at davemloft.net>
--- 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: netdev at vger.kernel.org
S: Supported
F: drivers/net/ethernet/mscc/
diff --git a/target/linux/layerscape/patches-5.4/701-net-0262-net-dsa-ocelot-add-tagger-for-Ocelot-Felix-switches.patch b/target/linux/layerscape/patches-5.4/701-net-0262-net-dsa-ocelot-add-tagger-for-Ocelot-Felix-switches.patch
index b849387c44..5304bbca0a 100644
--- a/target/linux/layerscape/patches-5.4/701-net-0262-net-dsa-ocelot-add-tagger-for-Ocelot-Felix-switches.patch
+++ b/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 <davem at davemloft.net>
--- 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
diff --git a/target/linux/layerscape/patches-5.4/701-net-0263-net-dsa-ocelot-add-driver-for-Felix-switch-family.patch b/target/linux/layerscape/patches-5.4/701-net-0263-net-dsa-ocelot-add-driver-for-Felix-switch-family.patch
index 3c729498a9..5dc50c5ee6 100644
--- a/target/linux/layerscape/patches-5.4/701-net-0263-net-dsa-ocelot-add-driver-for-Felix-switch-family.patch
+++ b/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 <davem at davemloft.net>
--- a/MAINTAINERS
+++ b/MAINTAINERS
-@@ -17360,6 +17360,7 @@ M: Vladimir Oltean <vladimir.oltean at nxp.
+@@ -17361,6 +17361,7 @@ M: Vladimir Oltean <vladimir.oltean at nxp.
M: Claudiu Manoil <claudiu.manoil at nxp.com>
L: netdev at vger.kernel.org
S: Maintained
diff --git a/target/linux/layerscape/patches-5.4/701-net-0323-staging-fsl_ppfe-eth-add-pfe-support-to-Kconfig-and-.patch b/target/linux/layerscape/patches-5.4/701-net-0323-staging-fsl_ppfe-eth-add-pfe-support-to-Kconfig-and-.patch
index 7d071397f0..d370f728dd 100644
--- a/target/linux/layerscape/patches-5.4/701-net-0323-staging-fsl_ppfe-eth-add-pfe-support-to-Kconfig-and-.patch
+++ b/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 <aisheng.dong at nxp.com>
--- 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
diff --git a/target/linux/layerscape/patches-5.4/809-jailhouse-0020-jailhouse-Add-simple-debug-console-via-the-hyperviso.patch b/target/linux/layerscape/patches-5.4/809-jailhouse-0020-jailhouse-Add-simple-debug-console-via-the-hyperviso.patch
index 72f3048d8f..d3fb53ec58 100644
--- a/target/linux/layerscape/patches-5.4/809-jailhouse-0020-jailhouse-Add-simple-debug-console-via-the-hyperviso.patch
+++ b/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: jailhouse-dev at googlegroups.com
+@@ -8774,6 +8774,7 @@ L: jailhouse-dev at googlegroups.com
S: Maintained
F: arch/x86/kernel/jailhouse.c
F: arch/x86/include/asm/jailhouse_para.h
diff --git a/target/linux/layerscape/patches-5.4/810-keys-0001-security-keys-secure_key-Adds-the-secure-key-support.patch b/target/linux/layerscape/patches-5.4/810-keys-0001-security-keys-secure_key-Adds-the-secure-key-support.patch
index 65b996d879..2347212a91 100644
--- a/target/linux/layerscape/patches-5.4/810-keys-0001-security-keys-secure_key-Adds-the-secure-key-support.patch
+++ b/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 <sahil.malhotra at nxp.com>
+ $ 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
diff --git a/target/linux/layerscape/patches-5.4/810-keys-0002-encrypted_keys-Adds-support-for-secure-key-type-as-m.patch b/target/linux/layerscape/patches-5.4/810-keys-0002-encrypted_keys-Adds-support-for-secure-key-type-as-m.patch
index ed2eaa8a61..3a354e1fa8 100644
--- a/target/linux/layerscape/patches-5.4/810-keys-0002-encrypted_keys-Adds-support-for-secure-key-type-as-m.patch
+++ b/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 <sahil.malhotra at nxp.com>
--- 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
diff --git a/target/linux/layerscape/patches-5.4/812-pcie-0009-PCI-mobiveil-Refactor-Mobiveil-PCIe-Host-Bridge-IP-d.patch b/target/linux/layerscape/patches-5.4/812-pcie-0009-PCI-mobiveil-Refactor-Mobiveil-PCIe-Host-Bridge-IP-d.patch
index acbf2fe35a..08f7a7a0f0 100644
--- a/target/linux/layerscape/patches-5.4/812-pcie-0009-PCI-mobiveil-Refactor-Mobiveil-PCIe-Host-Bridge-IP-d.patch
+++ b/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 <l.subrahmanya at mobiveil.co.in>
--- a/MAINTAINERS
+++ b/MAINTAINERS
-@@ -12503,7 +12503,7 @@ M: Hou Zhiqiang <Zhiqiang.Hou at nxp.com>
+@@ -12504,7 +12504,7 @@ M: Hou Zhiqiang <Zhiqiang.Hou at nxp.com>
L: linux-pci at vger.kernel.org
S: Supported
F: Documentation/devicetree/bindings/pci/mobiveil-pcie.txt
diff --git a/target/linux/layerscape/patches-5.4/812-pcie-0016-PCI-mobiveil-Add-the-EP-driver-support.patch b/target/linux/layerscape/patches-5.4/812-pcie-0016-PCI-mobiveil-Add-the-EP-driver-support.patch
index 5182eed992..667094355f 100644
--- a/target/linux/layerscape/patches-5.4/812-pcie-0016-PCI-mobiveil-Add-the-EP-driver-support.patch
+++ b/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 <Zhiqiang.Hou at nxp.com>
--- 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 <m.karthikeyan at mobiveil.co.in>
M: Hou Zhiqiang <Zhiqiang.Hou at nxp.com>
diff --git a/target/linux/layerscape/patches-5.4/814-qe-0006-config-qe-add-irq-qeic-support.patch b/target/linux/layerscape/patches-5.4/814-qe-0006-config-qe-add-irq-qeic-support.patch
index babf74329b..5d8c35d04f 100644
--- a/target/linux/layerscape/patches-5.4/814-qe-0006-config-qe-add-irq-qeic-support.patch
+++ b/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 <qiang.zhao at nxp.com>
--- 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
diff --git a/target/linux/realtek/patches-5.4/300-mips-add-rtl838x-platform.patch b/target/linux/realtek/patches-5.4/300-mips-add-rtl838x-platform.patch
index ecc77b2a73..c680d5f4a5 100644
--- a/target/linux/realtek/patches-5.4/300-mips-add-rtl838x-platform.patch
+++ b/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
More information about the lede-commits
mailing list