kernel: bump 5.4 to 5.4.154

All patches automatically rebased.

Signed-off-by: John Audia <graysky@archlinux.us>

12 files changed, 12 insertions, 12 deletions

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@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@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@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@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@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@davemloft.net>
 
 --- 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 <claudiu.manoil@nxp.com>
  L:	netdev@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@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@googlegroups.com
+@@ -8774,6 +8774,7 @@ L:	jailhouse-dev@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@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@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@mobiveil.co.in>
 
 --- a/MAINTAINERS
 +++ b/MAINTAINERS
-@@ -12503,7 +12503,7 @@ M:	Hou Zhiqiang <Zhiqiang.Hou@nxp.com>
+@@ -12504,7 +12504,7 @@ M:	Hou Zhiqiang <Zhiqiang.Hou@nxp.com>
  L:	linux-pci@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@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@mobiveil.co.in>
  M:	Hou Zhiqiang <Zhiqiang.Hou@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@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