Merge remote-tracking branch 'origin/master' into rawhide-user-thl-vanilla-fedorakernel-5.0.0-0.rc6.git1.1.vanilla.knurd.1.fc30kernel-5.0.0-0.rc6.git1.1.vanilla.knurd.1.fc29kernel-5.0.0-0.rc6.git1.1.vanilla.knurd.1.fc28

53 files changed, 159 insertions, 27 deletions

diff --git a/configs/fedora/generic/arm/armv7/armv7/CONFIG_CRYPTO_DEV_FSL_CAAM b/configs/fedora/generic/arm/CONFIG_CRYPTO_DEV_FSL_CAAM
index 9432ae930..9432ae930 100644
--- a/configs/fedora/generic/arm/armv7/armv7/CONFIG_CRYPTO_DEV_FSL_CAAM
+++ b/configs/fedora/generic/arm/CONFIG_CRYPTO_DEV_FSL_CAAM
diff --git a/configs/fedora/generic/arm/armv7/armv7/CONFIG_CRYPTO_DEV_FSL_CAAM_AHASH_API b/configs/fedora/generic/arm/CONFIG_CRYPTO_DEV_FSL_CAAM_AHASH_API
index 513a57a7c..513a57a7c 100644
--- a/configs/fedora/generic/arm/armv7/armv7/CONFIG_CRYPTO_DEV_FSL_CAAM_AHASH_API
+++ b/configs/fedora/generic/arm/CONFIG_CRYPTO_DEV_FSL_CAAM_AHASH_API
diff --git a/configs/fedora/generic/arm/armv7/armv7/CONFIG_CRYPTO_DEV_FSL_CAAM_CRYPTO_API b/configs/fedora/generic/arm/CONFIG_CRYPTO_DEV_FSL_CAAM_CRYPTO_API
index 88195c95c..88195c95c 100644
--- a/configs/fedora/generic/arm/armv7/armv7/CONFIG_CRYPTO_DEV_FSL_CAAM_CRYPTO_API
+++ b/configs/fedora/generic/arm/CONFIG_CRYPTO_DEV_FSL_CAAM_CRYPTO_API
diff --git a/configs/fedora/generic/arm/armv7/armv7/CONFIG_CRYPTO_DEV_FSL_CAAM_DEBUG b/configs/fedora/generic/arm/CONFIG_CRYPTO_DEV_FSL_CAAM_DEBUG
index a2ebce907..a2ebce907 100644
--- a/configs/fedora/generic/arm/armv7/armv7/CONFIG_CRYPTO_DEV_FSL_CAAM_DEBUG
+++ b/configs/fedora/generic/arm/CONFIG_CRYPTO_DEV_FSL_CAAM_DEBUG
diff --git a/configs/fedora/generic/arm/armv7/armv7/CONFIG_CRYPTO_DEV_FSL_CAAM_INTC b/configs/fedora/generic/arm/CONFIG_CRYPTO_DEV_FSL_CAAM_INTC
index e9a418ac8..e9a418ac8 100644
--- a/configs/fedora/generic/arm/armv7/armv7/CONFIG_CRYPTO_DEV_FSL_CAAM_INTC
+++ b/configs/fedora/generic/arm/CONFIG_CRYPTO_DEV_FSL_CAAM_INTC
diff --git a/configs/fedora/generic/arm/armv7/armv7/CONFIG_CRYPTO_DEV_FSL_CAAM_INTC_COUNT_THLD b/configs/fedora/generic/arm/CONFIG_CRYPTO_DEV_FSL_CAAM_INTC_COUNT_THLD
index 2ce83fc68..2ce83fc68 100644
--- a/configs/fedora/generic/arm/armv7/armv7/CONFIG_CRYPTO_DEV_FSL_CAAM_INTC_COUNT_THLD
+++ b/configs/fedora/generic/arm/CONFIG_CRYPTO_DEV_FSL_CAAM_INTC_COUNT_THLD
diff --git a/configs/fedora/generic/arm/armv7/armv7/CONFIG_CRYPTO_DEV_FSL_CAAM_INTC_TIME_THLD b/configs/fedora/generic/arm/CONFIG_CRYPTO_DEV_FSL_CAAM_INTC_TIME_THLD
index 626039201..626039201 100644
--- a/configs/fedora/generic/arm/armv7/armv7/CONFIG_CRYPTO_DEV_FSL_CAAM_INTC_TIME_THLD
+++ b/configs/fedora/generic/arm/CONFIG_CRYPTO_DEV_FSL_CAAM_INTC_TIME_THLD
diff --git a/configs/fedora/generic/arm/armv7/armv7/CONFIG_CRYPTO_DEV_FSL_CAAM_JR b/configs/fedora/generic/arm/CONFIG_CRYPTO_DEV_FSL_CAAM_JR
index 367a3c834..367a3c834 100644
--- a/configs/fedora/generic/arm/armv7/armv7/CONFIG_CRYPTO_DEV_FSL_CAAM_JR
+++ b/configs/fedora/generic/arm/CONFIG_CRYPTO_DEV_FSL_CAAM_JR
diff --git a/configs/fedora/generic/arm/armv7/armv7/CONFIG_CRYPTO_DEV_FSL_CAAM_PKC_API b/configs/fedora/generic/arm/CONFIG_CRYPTO_DEV_FSL_CAAM_PKC_API
index 668bf43f6..668bf43f6 100644
--- a/configs/fedora/generic/arm/armv7/armv7/CONFIG_CRYPTO_DEV_FSL_CAAM_PKC_API
+++ b/configs/fedora/generic/arm/CONFIG_CRYPTO_DEV_FSL_CAAM_PKC_API
diff --git a/configs/fedora/generic/arm/armv7/armv7/CONFIG_CRYPTO_DEV_FSL_CAAM_RINGSIZE b/configs/fedora/generic/arm/CONFIG_CRYPTO_DEV_FSL_CAAM_RINGSIZE
index ee310393e..ee310393e 100644
--- a/configs/fedora/generic/arm/armv7/armv7/CONFIG_CRYPTO_DEV_FSL_CAAM_RINGSIZE
+++ b/configs/fedora/generic/arm/CONFIG_CRYPTO_DEV_FSL_CAAM_RINGSIZE
diff --git a/configs/fedora/generic/arm/armv7/armv7/CONFIG_CRYPTO_DEV_FSL_CAAM_RNG_API b/configs/fedora/generic/arm/CONFIG_CRYPTO_DEV_FSL_CAAM_RNG_API
index 9e6e91b74..9e6e91b74 100644
--- a/configs/fedora/generic/arm/armv7/armv7/CONFIG_CRYPTO_DEV_FSL_CAAM_RNG_API
+++ b/configs/fedora/generic/arm/CONFIG_CRYPTO_DEV_FSL_CAAM_RNG_API
diff --git a/configs/fedora/generic/arm/armv7/armv7/CONFIG_I2C_IMX b/configs/fedora/generic/arm/CONFIG_I2C_IMX
index 295dda355..295dda355 100644
--- a/configs/fedora/generic/arm/armv7/armv7/CONFIG_I2C_IMX
+++ b/configs/fedora/generic/arm/CONFIG_I2C_IMX
diff --git a/configs/fedora/generic/arm/armv7/armv7/CONFIG_I2C_IMX_LPI2C b/configs/fedora/generic/arm/CONFIG_I2C_IMX_LPI2C
index 2d866d55f..2d866d55f 100644
--- a/configs/fedora/generic/arm/armv7/armv7/CONFIG_I2C_IMX_LPI2C
+++ b/configs/fedora/generic/arm/CONFIG_I2C_IMX_LPI2C
diff --git a/configs/fedora/generic/arm/armv7/armv7/CONFIG_IMX2_WDT b/configs/fedora/generic/arm/CONFIG_IMX2_WDT
index bf5eaba02..bf5eaba02 100644
--- a/configs/fedora/generic/arm/armv7/armv7/CONFIG_IMX2_WDT
+++ b/configs/fedora/generic/arm/CONFIG_IMX2_WDT
diff --git a/configs/fedora/generic/arm/armv7/armv7/CONFIG_MMC_SDHCI_OF_ESDHC b/configs/fedora/generic/arm/CONFIG_MMC_SDHCI_OF_ESDHC
index 40e2f68cb..40e2f68cb 100644
--- a/configs/fedora/generic/arm/armv7/armv7/CONFIG_MMC_SDHCI_OF_ESDHC
+++ b/configs/fedora/generic/arm/CONFIG_MMC_SDHCI_OF_ESDHC
diff --git a/configs/fedora/generic/arm/armv7/armv7/CONFIG_RTC_DRV_SNVS b/configs/fedora/generic/arm/CONFIG_RTC_DRV_SNVS
index bb8eb9dbc..bb8eb9dbc 100644
--- a/configs/fedora/generic/arm/armv7/armv7/CONFIG_RTC_DRV_SNVS
+++ b/configs/fedora/generic/arm/CONFIG_RTC_DRV_SNVS
diff --git a/configs/fedora/generic/arm/aarch64/CONFIG_AHCI_QORIQ b/configs/fedora/generic/arm/aarch64/CONFIG_AHCI_QORIQ
new file mode 100644
index 000000000..b8d75fd8c
--- /dev/null
+++ b/configs/fedora/generic/arm/aarch64/CONFIG_AHCI_QORIQ
@@ -0,0 +1 @@
+CONFIG_AHCI_QORIQ=m
diff --git a/configs/fedora/generic/arm/aarch64/CONFIG_ARCH_LAYERSCAPE b/configs/fedora/generic/arm/aarch64/CONFIG_ARCH_LAYERSCAPE
index 257f6f91d..617fb8cf5 100644
--- a/configs/fedora/generic/arm/aarch64/CONFIG_ARCH_LAYERSCAPE
+++ b/configs/fedora/generic/arm/aarch64/CONFIG_ARCH_LAYERSCAPE
@@ -1 +1 @@
-# CONFIG_ARCH_LAYERSCAPE is not set
+CONFIG_ARCH_LAYERSCAPE=y
diff --git a/configs/fedora/generic/arm/aarch64/CONFIG_CRYPTO_DEV_FSL_CAAM_CRYPTO_API_QI b/configs/fedora/generic/arm/aarch64/CONFIG_CRYPTO_DEV_FSL_CAAM_CRYPTO_API_QI
new file mode 100644
index 000000000..e58139a15
--- /dev/null
+++ b/configs/fedora/generic/arm/aarch64/CONFIG_CRYPTO_DEV_FSL_CAAM_CRYPTO_API_QI
@@ -0,0 +1 @@
+CONFIG_CRYPTO_DEV_FSL_CAAM_CRYPTO_API_QI=m
diff --git a/configs/fedora/generic/arm/aarch64/CONFIG_CRYPTO_DEV_FSL_DPAA2_CAAM b/configs/fedora/generic/arm/aarch64/CONFIG_CRYPTO_DEV_FSL_DPAA2_CAAM
new file mode 100644
index 000000000..20b163d01
--- /dev/null
+++ b/configs/fedora/generic/arm/aarch64/CONFIG_CRYPTO_DEV_FSL_DPAA2_CAAM
@@ -0,0 +1 @@
+CONFIG_CRYPTO_DEV_FSL_DPAA2_CAAM=m
diff --git a/configs/fedora/generic/arm/aarch64/CONFIG_EDAC_LAYERSCAPE b/configs/fedora/generic/arm/aarch64/CONFIG_EDAC_LAYERSCAPE
new file mode 100644
index 000000000..0d423e768
--- /dev/null
+++ b/configs/fedora/generic/arm/aarch64/CONFIG_EDAC_LAYERSCAPE
@@ -0,0 +1 @@
+CONFIG_EDAC_LAYERSCAPE=m
diff --git a/configs/fedora/generic/arm/aarch64/CONFIG_FSL_BMAN_TEST b/configs/fedora/generic/arm/aarch64/CONFIG_FSL_BMAN_TEST
new file mode 100644
index 000000000..231240e3a
--- /dev/null
+++ b/configs/fedora/generic/arm/aarch64/CONFIG_FSL_BMAN_TEST
@@ -0,0 +1 @@
+# CONFIG_FSL_BMAN_TEST is not set
diff --git a/configs/fedora/generic/arm/aarch64/CONFIG_FSL_DPAA b/configs/fedora/generic/arm/aarch64/CONFIG_FSL_DPAA
new file mode 100644
index 000000000..efa99c048
--- /dev/null
+++ b/configs/fedora/generic/arm/aarch64/CONFIG_FSL_DPAA
@@ -0,0 +1 @@
+CONFIG_FSL_DPAA=y
diff --git a/configs/fedora/generic/arm/aarch64/CONFIG_FSL_DPAA2 b/configs/fedora/generic/arm/aarch64/CONFIG_FSL_DPAA2
new file mode 100644
index 000000000..4d1c1c330
--- /dev/null
+++ b/configs/fedora/generic/arm/aarch64/CONFIG_FSL_DPAA2
@@ -0,0 +1 @@
+CONFIG_FSL_DPAA2=y
diff --git a/configs/fedora/generic/arm/aarch64/CONFIG_FSL_DPAA2_ETH b/configs/fedora/generic/arm/aarch64/CONFIG_FSL_DPAA2_ETH
new file mode 100644
index 000000000..27a71a788
--- /dev/null
+++ b/configs/fedora/generic/arm/aarch64/CONFIG_FSL_DPAA2_ETH
@@ -0,0 +1 @@
+CONFIG_FSL_DPAA2_ETH=m
diff --git a/configs/fedora/generic/arm/aarch64/CONFIG_FSL_DPAA2_ETHSW b/configs/fedora/generic/arm/aarch64/CONFIG_FSL_DPAA2_ETHSW
new file mode 100644
index 000000000..29727ada1
--- /dev/null
+++ b/configs/fedora/generic/arm/aarch64/CONFIG_FSL_DPAA2_ETHSW
@@ -0,0 +1 @@
+CONFIG_FSL_DPAA2_ETHSW=m
diff --git a/configs/fedora/generic/arm/aarch64/CONFIG_FSL_DPAA2_PTP_CLOCK b/configs/fedora/generic/arm/aarch64/CONFIG_FSL_DPAA2_PTP_CLOCK
new file mode 100644
index 000000000..18b6eec61
--- /dev/null
+++ b/configs/fedora/generic/arm/aarch64/CONFIG_FSL_DPAA2_PTP_CLOCK
@@ -0,0 +1 @@
+CONFIG_FSL_DPAA2_PTP_CLOCK=m
diff --git a/configs/fedora/generic/arm/aarch64/CONFIG_FSL_DPAA_CHECKING b/configs/fedora/generic/arm/aarch64/CONFIG_FSL_DPAA_CHECKING
new file mode 100644
index 000000000..57a0cadb5
--- /dev/null
+++ b/configs/fedora/generic/arm/aarch64/CONFIG_FSL_DPAA_CHECKING
@@ -0,0 +1 @@
+# CONFIG_FSL_DPAA_CHECKING is not set
diff --git a/configs/fedora/generic/arm/aarch64/CONFIG_FSL_DPAA_ETH b/configs/fedora/generic/arm/aarch64/CONFIG_FSL_DPAA_ETH
new file mode 100644
index 000000000..ba703fad8
--- /dev/null
+++ b/configs/fedora/generic/arm/aarch64/CONFIG_FSL_DPAA_ETH
@@ -0,0 +1 @@
+CONFIG_FSL_DPAA_ETH=m
diff --git a/configs/fedora/generic/arm/aarch64/CONFIG_FSL_EDMA b/configs/fedora/generic/arm/aarch64/CONFIG_FSL_EDMA
new file mode 100644
index 000000000..1e9501b0b
--- /dev/null
+++ b/configs/fedora/generic/arm/aarch64/CONFIG_FSL_EDMA
@@ -0,0 +1 @@
+CONFIG_FSL_EDMA=m
diff --git a/configs/fedora/generic/arm/aarch64/CONFIG_FSL_FMAN b/configs/fedora/generic/arm/aarch64/CONFIG_FSL_FMAN
new file mode 100644
index 000000000..e183a81bc
--- /dev/null
+++ b/configs/fedora/generic/arm/aarch64/CONFIG_FSL_FMAN
@@ -0,0 +1 @@
+CONFIG_FSL_FMAN=m
diff --git a/configs/fedora/generic/arm/aarch64/CONFIG_FSL_MC_BUS b/configs/fedora/generic/arm/aarch64/CONFIG_FSL_MC_BUS
new file mode 100644
index 000000000..1b8efedfd
--- /dev/null
+++ b/configs/fedora/generic/arm/aarch64/CONFIG_FSL_MC_BUS
@@ -0,0 +1 @@
+CONFIG_FSL_MC_BUS=y
diff --git a/configs/fedora/generic/arm/aarch64/CONFIG_FSL_MC_DPIO b/configs/fedora/generic/arm/aarch64/CONFIG_FSL_MC_DPIO
new file mode 100644
index 000000000..430e65623
--- /dev/null
+++ b/configs/fedora/generic/arm/aarch64/CONFIG_FSL_MC_DPIO
@@ -0,0 +1 @@
+CONFIG_FSL_MC_DPIO=m
diff --git a/configs/fedora/generic/arm/aarch64/CONFIG_FSL_PQ_MDIO b/configs/fedora/generic/arm/aarch64/CONFIG_FSL_PQ_MDIO
new file mode 100644
index 000000000..142162a7d
--- /dev/null
+++ b/configs/fedora/generic/arm/aarch64/CONFIG_FSL_PQ_MDIO
@@ -0,0 +1 @@
+CONFIG_FSL_PQ_MDIO=m
diff --git a/configs/fedora/generic/arm/aarch64/CONFIG_FSL_QMAN_TEST b/configs/fedora/generic/arm/aarch64/CONFIG_FSL_QMAN_TEST
new file mode 100644
index 000000000..eb0b40874
--- /dev/null
+++ b/configs/fedora/generic/arm/aarch64/CONFIG_FSL_QMAN_TEST
@@ -0,0 +1 @@
+# CONFIG_FSL_QMAN_TEST is not set
diff --git a/configs/fedora/generic/arm/aarch64/CONFIG_GIANFAR b/configs/fedora/generic/arm/aarch64/CONFIG_GIANFAR
new file mode 100644
index 000000000..c0188a32e
--- /dev/null
+++ b/configs/fedora/generic/arm/aarch64/CONFIG_GIANFAR
@@ -0,0 +1 @@
+CONFIG_GIANFAR=m
diff --git a/configs/fedora/generic/arm/aarch64/CONFIG_GPIO_MPC8XXX b/configs/fedora/generic/arm/aarch64/CONFIG_GPIO_MPC8XXX
new file mode 100644
index 000000000..71d1895b2
--- /dev/null
+++ b/configs/fedora/generic/arm/aarch64/CONFIG_GPIO_MPC8XXX
@@ -0,0 +1 @@
+CONFIG_GPIO_MPC8XXX=y
diff --git a/configs/fedora/generic/arm/aarch64/CONFIG_NET_VENDOR_FREESCALE b/configs/fedora/generic/arm/aarch64/CONFIG_NET_VENDOR_FREESCALE
new file mode 100644
index 000000000..2ac235a8e
--- /dev/null
+++ b/configs/fedora/generic/arm/aarch64/CONFIG_NET_VENDOR_FREESCALE
@@ -0,0 +1 @@
+CONFIG_NET_VENDOR_FREESCALE=y
diff --git a/configs/fedora/generic/arm/aarch64/CONFIG_PCI_LAYERSCAPE b/configs/fedora/generic/arm/aarch64/CONFIG_PCI_LAYERSCAPE
new file mode 100644
index 000000000..1c062ebee
--- /dev/null
+++ b/configs/fedora/generic/arm/aarch64/CONFIG_PCI_LAYERSCAPE
@@ -0,0 +1 @@
+CONFIG_PCI_LAYERSCAPE=y
diff --git a/configs/fedora/generic/arm/aarch64/CONFIG_PTP_1588_CLOCK_QORIQ b/configs/fedora/generic/arm/aarch64/CONFIG_PTP_1588_CLOCK_QORIQ
new file mode 100644
index 000000000..ce2f41092
--- /dev/null
+++ b/configs/fedora/generic/arm/aarch64/CONFIG_PTP_1588_CLOCK_QORIQ
@@ -0,0 +1 @@
+CONFIG_PTP_1588_CLOCK_QORIQ=m
diff --git a/configs/fedora/generic/arm/aarch64/CONFIG_SPI_FSL_DSPI b/configs/fedora/generic/arm/aarch64/CONFIG_SPI_FSL_DSPI
new file mode 100644
index 000000000..5ac22826c
--- /dev/null
+++ b/configs/fedora/generic/arm/aarch64/CONFIG_SPI_FSL_DSPI
@@ -0,0 +1 @@
+CONFIG_SPI_FSL_DSPI=m
diff --git a/configs/fedora/generic/x86/CONFIG_ACPI_APEI_EINJ b/configs/fedora/generic/x86/CONFIG_ACPI_APEI_EINJ
index 2d03b69a1..66e425d5b 100644
--- a/configs/fedora/generic/x86/CONFIG_ACPI_APEI_EINJ
+++ b/configs/fedora/generic/x86/CONFIG_ACPI_APEI_EINJ
@@ -1 +1 @@
-# CONFIG_ACPI_APEI_EINJ is not set
+CONFIG_ACPI_APEI_EINJ=m
diff --git a/gitrev b/gitrev
index 76fa7a46e..95cb6c123 100644
--- a/gitrev
+++ b/gitrev
@@ -1 +1 @@
-5b4746a031992d3b788b7e5280d949b8ab6d32d0
+1f947a7a011fcceb14cb912f5481a53b18f1879a
diff --git a/kernel-aarch64-debug.config b/kernel-aarch64-debug.config
index 2f290d677..f4dc5bf67 100644
--- a/kernel-aarch64-debug.config
+++ b/kernel-aarch64-debug.config
@@ -156,7 +156,7 @@ CONFIG_AFS_FSCACHE=y
 CONFIG_AFS_FS=m
 CONFIG_AHCI_CEVA=m
 CONFIG_AHCI_MVEBU=m
-# CONFIG_AHCI_QORIQ is not set
+CONFIG_AHCI_QORIQ=m
 CONFIG_AHCI_SUNXI=m
 CONFIG_AHCI_TEGRA=m
 CONFIG_AHCI_XGENE=y
@@ -233,7 +233,7 @@ CONFIG_ARCH_HISI=y
 # CONFIG_ARCH_IXP4XX is not set
 # CONFIG_ARCH_K3 is not set
 # CONFIG_ARCH_KS8695 is not set
-# CONFIG_ARCH_LAYERSCAPE is not set
+CONFIG_ARCH_LAYERSCAPE=y
 # CONFIG_ARCH_LG1K is not set
 # CONFIG_ARCH_LPC32XX is not set
 # CONFIG_ARCH_MEDIATEK is not set
@@ -1080,6 +1080,19 @@ CONFIG_CRYPTO_DEV_CCP=y
 CONFIG_CRYPTO_DEV_CCREE=m
 CONFIG_CRYPTO_DEV_CHELSIO=m
 CONFIG_CRYPTO_DEV_CHELSIO_TLS=m
+CONFIG_CRYPTO_DEV_FSL_CAAM_AHASH_API=m
+CONFIG_CRYPTO_DEV_FSL_CAAM_CRYPTO_API=m
+CONFIG_CRYPTO_DEV_FSL_CAAM_CRYPTO_API_QI=m
+# CONFIG_CRYPTO_DEV_FSL_CAAM_DEBUG is not set
+CONFIG_CRYPTO_DEV_FSL_CAAM_INTC_COUNT_THLD=8
+CONFIG_CRYPTO_DEV_FSL_CAAM_INTC_TIME_THLD=8192
+CONFIG_CRYPTO_DEV_FSL_CAAM_INTC=y
+CONFIG_CRYPTO_DEV_FSL_CAAM_JR=m
+CONFIG_CRYPTO_DEV_FSL_CAAM=m
+CONFIG_CRYPTO_DEV_FSL_CAAM_PKC_API=m
+CONFIG_CRYPTO_DEV_FSL_CAAM_RINGSIZE=3
+CONFIG_CRYPTO_DEV_FSL_CAAM_RNG_API=m
+CONFIG_CRYPTO_DEV_FSL_DPAA2_CAAM=m
 CONFIG_CRYPTO_DEV_HIFN_795X=m
 CONFIG_CRYPTO_DEV_HIFN_795X_RNG=y
 # CONFIG_CRYPTO_DEV_HISI_SEC is not set
@@ -1580,6 +1593,7 @@ CONFIG_ECRYPT_FS=m
 # CONFIG_ECRYPT_FS_MESSAGING is not set
 # CONFIG_EDAC_DEBUG is not set
 CONFIG_EDAC_GHES=y
+CONFIG_EDAC_LAYERSCAPE=m
 CONFIG_EDAC_LEGACY_SYSFS=y
 CONFIG_EDAC_QCOM=m
 CONFIG_EDAC_SYNOPSYS=m
@@ -1792,9 +1806,21 @@ CONFIG_FSI_MASTER_HUB=m
 # CONFIG_FSI_NEW_DEV_NODE is not set
 # CONFIG_FSI_SBEFIFO is not set
 CONFIG_FSI_SCOM=m
-# CONFIG_FSL_EDMA is not set
+# CONFIG_FSL_BMAN_TEST is not set
+CONFIG_FSL_DPAA2_ETH=m
+CONFIG_FSL_DPAA2_ETHSW=m
+CONFIG_FSL_DPAA2_PTP_CLOCK=m
+CONFIG_FSL_DPAA2=y
+# CONFIG_FSL_DPAA_CHECKING is not set
+CONFIG_FSL_DPAA_ETH=m
+CONFIG_FSL_DPAA=y
+CONFIG_FSL_EDMA=m
 CONFIG_FSL_ERRATUM_A008585=y
-# CONFIG_FSL_PQ_MDIO is not set
+CONFIG_FSL_FMAN=m
+CONFIG_FSL_MC_BUS=y
+CONFIG_FSL_MC_DPIO=m
+CONFIG_FSL_PQ_MDIO=m
+# CONFIG_FSL_QMAN_TEST is not set
 # CONFIG_FSL_XGMAC_MDIO is not set
 CONFIG_FS_MBCACHE=y
 CONFIG_FSNOTIFY=y
@@ -1846,6 +1872,7 @@ CONFIG_GENEVE=m
 # CONFIG_GENWQE is not set
 CONFIG_GFS2_FS_LOCKING_DLM=y
 CONFIG_GFS2_FS=m
+CONFIG_GIANFAR=m
 CONFIG_GIGASET_BASE=m
 CONFIG_GIGASET_CAPI=y
 # CONFIG_GIGASET_DEBUG is not set
@@ -1882,7 +1909,7 @@ CONFIG_GPIO_MAX77620=m
 CONFIG_GPIO_MB86S7X=m
 # CONFIG_GPIO_MC33880 is not set
 # CONFIG_GPIO_MOCKUP is not set
-# CONFIG_GPIO_MPC8XXX is not set
+CONFIG_GPIO_MPC8XXX=y
 CONFIG_GPIO_MVEBU=y
 CONFIG_GPIO_PCA953X_IRQ=y
 CONFIG_GPIO_PCA953X=y
@@ -2182,6 +2209,8 @@ CONFIG_I2C_HELPER_AUTO=y
 CONFIG_I2C_HID=m
 # CONFIG_I2C_HIX5HD2 is not set
 # CONFIG_I2C_I801 is not set
+CONFIG_I2C_IMX_LPI2C=m
+CONFIG_I2C_IMX=m
 # CONFIG_I2C_ISCH is not set
 CONFIG_I2C_MESON=m
 CONFIG_I2C_MLXCPLD=m
@@ -2317,6 +2346,7 @@ CONFIG_IMA_READ_POLICY=y
 CONFIG_IMA_WRITE_POLICY=y
 CONFIG_IMA=y
 # CONFIG_IMG_ASCII_LCD is not set
+CONFIG_IMX2_WDT=m
 # CONFIG_IMX_IPUV3_CORE is not set
 # CONFIG_IMX_IRQSTEER is not set
 CONFIG_IMX_SCU_PD=y
@@ -3334,7 +3364,7 @@ CONFIG_MMC_SDHCI_MSM=m
 CONFIG_MMC_SDHCI_OF_ARASAN=m
 # CONFIG_MMC_SDHCI_OF_AT91 is not set
 # CONFIG_MMC_SDHCI_OF_DWCMSHC is not set
-# CONFIG_MMC_SDHCI_OF_ESDHC is not set
+CONFIG_MMC_SDHCI_OF_ESDHC=m
 CONFIG_MMC_SDHCI_OMAP=m
 CONFIG_MMC_SDHCI_PCI=m
 CONFIG_MMC_SDHCI_PLTFM=m
@@ -3764,6 +3794,7 @@ CONFIG_NET_VENDOR_DLINK=y
 CONFIG_NET_VENDOR_EMULEX=y
 # CONFIG_NET_VENDOR_EZCHIP is not set
 # CONFIG_NET_VENDOR_FARADAY is not set
+CONFIG_NET_VENDOR_FREESCALE=y
 # CONFIG_NET_VENDOR_FUJITSU is not set
 # CONFIG_NET_VENDOR_HISILICON is not set
 # CONFIG_NET_VENDOR_HP is not set
@@ -4204,6 +4235,7 @@ CONFIG_PCI_HOST_GENERIC=y
 CONFIG_PCI_HOST_THUNDER_ECAM=y
 CONFIG_PCI_HOST_THUNDER_PEM=y
 CONFIG_PCI_IOV=y
+CONFIG_PCI_LAYERSCAPE=y
 CONFIG_PCI_MESON=y
 CONFIG_PCI_MSI_IRQ_DOMAIN=y
 CONFIG_PCI_MSI=y
@@ -4449,6 +4481,7 @@ CONFIG_PSTORE_RAM=m
 CONFIG_PSTORE=y
 # CONFIG_PSTORE_ZSTD_COMPRESS is not set
 CONFIG_PTP_1588_CLOCK_PCH=m
+CONFIG_PTP_1588_CLOCK_QORIQ=m
 CONFIG_PTP_1588_CLOCK=y
 CONFIG_PVPANIC=m
 CONFIG_PWM_BCM2835=m
@@ -4857,7 +4890,7 @@ CONFIG_RTC_DRV_RX8025=m
 CONFIG_RTC_DRV_RX8581=m
 CONFIG_RTC_DRV_S35390A=m
 # CONFIG_RTC_DRV_SA1100 is not set
-# CONFIG_RTC_DRV_SNVS is not set
+CONFIG_RTC_DRV_SNVS=m
 CONFIG_RTC_DRV_STK17TA8=m
 CONFIG_RTC_DRV_SUN6I=y
 CONFIG_RTC_DRV_TEGRA=m
@@ -5767,6 +5800,7 @@ CONFIG_SPI_DESIGNWARE=m
 # CONFIG_SPI_DW_MID_DMA is not set
 CONFIG_SPI_DW_MMIO=m
 CONFIG_SPI_DW_PCI=m
+CONFIG_SPI_FSL_DSPI=m
 CONFIG_SPI_FSL_LPSPI=m
 # CONFIG_SPI_FSL_SPI is not set
 CONFIG_SPI_GPIO=m
diff --git a/kernel-aarch64.config b/kernel-aarch64.config
index 733d3b43e..bc8369859 100644
--- a/kernel-aarch64.config
+++ b/kernel-aarch64.config
@@ -156,7 +156,7 @@ CONFIG_AFS_FSCACHE=y
 CONFIG_AFS_FS=m
 CONFIG_AHCI_CEVA=m
 CONFIG_AHCI_MVEBU=m
-# CONFIG_AHCI_QORIQ is not set
+CONFIG_AHCI_QORIQ=m
 CONFIG_AHCI_SUNXI=m
 CONFIG_AHCI_TEGRA=m
 CONFIG_AHCI_XGENE=y
@@ -233,7 +233,7 @@ CONFIG_ARCH_HISI=y
 # CONFIG_ARCH_IXP4XX is not set
 # CONFIG_ARCH_K3 is not set
 # CONFIG_ARCH_KS8695 is not set
-# CONFIG_ARCH_LAYERSCAPE is not set
+CONFIG_ARCH_LAYERSCAPE=y
 # CONFIG_ARCH_LG1K is not set
 # CONFIG_ARCH_LPC32XX is not set
 # CONFIG_ARCH_MEDIATEK is not set
@@ -1080,6 +1080,19 @@ CONFIG_CRYPTO_DEV_CCP=y
 CONFIG_CRYPTO_DEV_CCREE=m
 CONFIG_CRYPTO_DEV_CHELSIO=m
 CONFIG_CRYPTO_DEV_CHELSIO_TLS=m
+CONFIG_CRYPTO_DEV_FSL_CAAM_AHASH_API=m
+CONFIG_CRYPTO_DEV_FSL_CAAM_CRYPTO_API=m
+CONFIG_CRYPTO_DEV_FSL_CAAM_CRYPTO_API_QI=m
+# CONFIG_CRYPTO_DEV_FSL_CAAM_DEBUG is not set
+CONFIG_CRYPTO_DEV_FSL_CAAM_INTC_COUNT_THLD=8
+CONFIG_CRYPTO_DEV_FSL_CAAM_INTC_TIME_THLD=8192
+CONFIG_CRYPTO_DEV_FSL_CAAM_INTC=y
+CONFIG_CRYPTO_DEV_FSL_CAAM_JR=m
+CONFIG_CRYPTO_DEV_FSL_CAAM=m
+CONFIG_CRYPTO_DEV_FSL_CAAM_PKC_API=m
+CONFIG_CRYPTO_DEV_FSL_CAAM_RINGSIZE=3
+CONFIG_CRYPTO_DEV_FSL_CAAM_RNG_API=m
+CONFIG_CRYPTO_DEV_FSL_DPAA2_CAAM=m
 CONFIG_CRYPTO_DEV_HIFN_795X=m
 CONFIG_CRYPTO_DEV_HIFN_795X_RNG=y
 # CONFIG_CRYPTO_DEV_HISI_SEC is not set
@@ -1572,6 +1585,7 @@ CONFIG_ECRYPT_FS=m
 # CONFIG_ECRYPT_FS_MESSAGING is not set
 # CONFIG_EDAC_DEBUG is not set
 CONFIG_EDAC_GHES=y
+CONFIG_EDAC_LAYERSCAPE=m
 CONFIG_EDAC_LEGACY_SYSFS=y
 CONFIG_EDAC_QCOM=m
 CONFIG_EDAC_SYNOPSYS=m
@@ -1776,9 +1790,21 @@ CONFIG_FSI_MASTER_HUB=m
 # CONFIG_FSI_NEW_DEV_NODE is not set
 # CONFIG_FSI_SBEFIFO is not set
 CONFIG_FSI_SCOM=m
-# CONFIG_FSL_EDMA is not set
+# CONFIG_FSL_BMAN_TEST is not set
+CONFIG_FSL_DPAA2_ETH=m
+CONFIG_FSL_DPAA2_ETHSW=m
+CONFIG_FSL_DPAA2_PTP_CLOCK=m
+CONFIG_FSL_DPAA2=y
+# CONFIG_FSL_DPAA_CHECKING is not set
+CONFIG_FSL_DPAA_ETH=m
+CONFIG_FSL_DPAA=y
+CONFIG_FSL_EDMA=m
 CONFIG_FSL_ERRATUM_A008585=y
-# CONFIG_FSL_PQ_MDIO is not set
+CONFIG_FSL_FMAN=m
+CONFIG_FSL_MC_BUS=y
+CONFIG_FSL_MC_DPIO=m
+CONFIG_FSL_PQ_MDIO=m
+# CONFIG_FSL_QMAN_TEST is not set
 # CONFIG_FSL_XGMAC_MDIO is not set
 CONFIG_FS_MBCACHE=y
 CONFIG_FSNOTIFY=y
@@ -1830,6 +1856,7 @@ CONFIG_GENEVE=m
 # CONFIG_GENWQE is not set
 CONFIG_GFS2_FS_LOCKING_DLM=y
 CONFIG_GFS2_FS=m
+CONFIG_GIANFAR=m
 CONFIG_GIGASET_BASE=m
 CONFIG_GIGASET_CAPI=y
 # CONFIG_GIGASET_DEBUG is not set
@@ -1866,7 +1893,7 @@ CONFIG_GPIO_MAX77620=m
 CONFIG_GPIO_MB86S7X=m
 # CONFIG_GPIO_MC33880 is not set
 # CONFIG_GPIO_MOCKUP is not set
-# CONFIG_GPIO_MPC8XXX is not set
+CONFIG_GPIO_MPC8XXX=y
 CONFIG_GPIO_MVEBU=y
 CONFIG_GPIO_PCA953X_IRQ=y
 CONFIG_GPIO_PCA953X=y
@@ -2166,6 +2193,8 @@ CONFIG_I2C_HELPER_AUTO=y
 CONFIG_I2C_HID=m
 # CONFIG_I2C_HIX5HD2 is not set
 # CONFIG_I2C_I801 is not set
+CONFIG_I2C_IMX_LPI2C=m
+CONFIG_I2C_IMX=m
 # CONFIG_I2C_ISCH is not set
 CONFIG_I2C_MESON=m
 CONFIG_I2C_MLXCPLD=m
@@ -2301,6 +2330,7 @@ CONFIG_IMA_READ_POLICY=y
 CONFIG_IMA_WRITE_POLICY=y
 CONFIG_IMA=y
 # CONFIG_IMG_ASCII_LCD is not set
+CONFIG_IMX2_WDT=m
 # CONFIG_IMX_IPUV3_CORE is not set
 # CONFIG_IMX_IRQSTEER is not set
 CONFIG_IMX_SCU_PD=y
@@ -3315,7 +3345,7 @@ CONFIG_MMC_SDHCI_MSM=m
 CONFIG_MMC_SDHCI_OF_ARASAN=m
 # CONFIG_MMC_SDHCI_OF_AT91 is not set
 # CONFIG_MMC_SDHCI_OF_DWCMSHC is not set
-# CONFIG_MMC_SDHCI_OF_ESDHC is not set
+CONFIG_MMC_SDHCI_OF_ESDHC=m
 CONFIG_MMC_SDHCI_OMAP=m
 CONFIG_MMC_SDHCI_PCI=m
 CONFIG_MMC_SDHCI_PLTFM=m
@@ -3744,6 +3774,7 @@ CONFIG_NET_VENDOR_DLINK=y
 CONFIG_NET_VENDOR_EMULEX=y
 # CONFIG_NET_VENDOR_EZCHIP is not set
 # CONFIG_NET_VENDOR_FARADAY is not set
+CONFIG_NET_VENDOR_FREESCALE=y
 # CONFIG_NET_VENDOR_FUJITSU is not set
 # CONFIG_NET_VENDOR_HISILICON is not set
 # CONFIG_NET_VENDOR_HP is not set
@@ -4184,6 +4215,7 @@ CONFIG_PCI_HOST_GENERIC=y
 CONFIG_PCI_HOST_THUNDER_ECAM=y
 CONFIG_PCI_HOST_THUNDER_PEM=y
 CONFIG_PCI_IOV=y
+CONFIG_PCI_LAYERSCAPE=y
 CONFIG_PCI_MESON=y
 CONFIG_PCI_MSI_IRQ_DOMAIN=y
 CONFIG_PCI_MSI=y
@@ -4428,6 +4460,7 @@ CONFIG_PSTORE_RAM=m
 CONFIG_PSTORE=y
 # CONFIG_PSTORE_ZSTD_COMPRESS is not set
 CONFIG_PTP_1588_CLOCK_PCH=m
+CONFIG_PTP_1588_CLOCK_QORIQ=m
 CONFIG_PTP_1588_CLOCK=y
 CONFIG_PVPANIC=m
 CONFIG_PWM_BCM2835=m
@@ -4836,7 +4869,7 @@ CONFIG_RTC_DRV_RX8025=m
 CONFIG_RTC_DRV_RX8581=m
 CONFIG_RTC_DRV_S35390A=m
 # CONFIG_RTC_DRV_SA1100 is not set
-# CONFIG_RTC_DRV_SNVS is not set
+CONFIG_RTC_DRV_SNVS=m
 CONFIG_RTC_DRV_STK17TA8=m
 CONFIG_RTC_DRV_SUN6I=y
 CONFIG_RTC_DRV_TEGRA=m
@@ -5745,6 +5778,7 @@ CONFIG_SPI_DESIGNWARE=m
 # CONFIG_SPI_DW_MID_DMA is not set
 CONFIG_SPI_DW_MMIO=m
 CONFIG_SPI_DW_PCI=m
+CONFIG_SPI_FSL_DSPI=m
 CONFIG_SPI_FSL_LPSPI=m
 # CONFIG_SPI_FSL_SPI is not set
 CONFIG_SPI_GPIO=m
diff --git a/kernel-armv7hl-lpae-debug.config b/kernel-armv7hl-lpae-debug.config
index e4acad62e..6e512d097 100644
--- a/kernel-armv7hl-lpae-debug.config
+++ b/kernel-armv7hl-lpae-debug.config
@@ -1047,6 +1047,17 @@ CONFIG_CRYPTO_DEV_CCREE=m
 CONFIG_CRYPTO_DEV_CHELSIO=m
 CONFIG_CRYPTO_DEV_CHELSIO_TLS=m
 CONFIG_CRYPTO_DEV_EXYNOS_RNG=m
+CONFIG_CRYPTO_DEV_FSL_CAAM_AHASH_API=m
+CONFIG_CRYPTO_DEV_FSL_CAAM_CRYPTO_API=m
+# CONFIG_CRYPTO_DEV_FSL_CAAM_DEBUG is not set
+CONFIG_CRYPTO_DEV_FSL_CAAM_INTC_COUNT_THLD=8
+CONFIG_CRYPTO_DEV_FSL_CAAM_INTC_TIME_THLD=8192
+CONFIG_CRYPTO_DEV_FSL_CAAM_INTC=y
+CONFIG_CRYPTO_DEV_FSL_CAAM_JR=m
+CONFIG_CRYPTO_DEV_FSL_CAAM=m
+CONFIG_CRYPTO_DEV_FSL_CAAM_PKC_API=m
+CONFIG_CRYPTO_DEV_FSL_CAAM_RINGSIZE=3
+CONFIG_CRYPTO_DEV_FSL_CAAM_RNG_API=m
 CONFIG_CRYPTO_DEV_HIFN_795X=m
 CONFIG_CRYPTO_DEV_HIFN_795X_RNG=y
 # CONFIG_CRYPTO_DEV_HISI_SEC is not set
@@ -2157,6 +2168,8 @@ CONFIG_I2C_GPIO=m
 CONFIG_I2C_HELPER_AUTO=y
 CONFIG_I2C_HID=m
 # CONFIG_I2C_I801 is not set
+CONFIG_I2C_IMX_LPI2C=m
+CONFIG_I2C_IMX=m
 # CONFIG_I2C_ISCH is not set
 CONFIG_I2C_MESON=m
 CONFIG_I2C_MLXCPLD=m
@@ -2287,6 +2300,7 @@ CONFIG_IMA_READ_POLICY=y
 CONFIG_IMA_WRITE_POLICY=y
 CONFIG_IMA=y
 # CONFIG_IMG_ASCII_LCD is not set
+CONFIG_IMX2_WDT=m
 # CONFIG_IMX_IPUV3_CORE is not set
 # CONFIG_IMX_IRQSTEER is not set
 CONFIG_IMX_MBOX=m
@@ -3318,7 +3332,7 @@ CONFIG_MMC_SDHCI=m
 CONFIG_MMC_SDHCI_OF_ARASAN=m
 # CONFIG_MMC_SDHCI_OF_AT91 is not set
 # CONFIG_MMC_SDHCI_OF_DWCMSHC is not set
-# CONFIG_MMC_SDHCI_OF_ESDHC is not set
+CONFIG_MMC_SDHCI_OF_ESDHC=m
 CONFIG_MMC_SDHCI_OMAP=m
 CONFIG_MMC_SDHCI_PCI=m
 CONFIG_MMC_SDHCI_PLTFM=m
@@ -4801,7 +4815,7 @@ CONFIG_RTC_DRV_S35390A=m
 CONFIG_RTC_DRV_S3C=m
 CONFIG_RTC_DRV_S5M=m
 # CONFIG_RTC_DRV_SA1100 is not set
-# CONFIG_RTC_DRV_SNVS is not set
+CONFIG_RTC_DRV_SNVS=m
 CONFIG_RTC_DRV_STK17TA8=m
 CONFIG_RTC_DRV_SUN6I=y
 CONFIG_RTC_DRV_SUNXI=m
diff --git a/kernel-armv7hl-lpae.config b/kernel-armv7hl-lpae.config
index de3a65676..99943a74b 100644
--- a/kernel-armv7hl-lpae.config
+++ b/kernel-armv7hl-lpae.config
@@ -1047,6 +1047,17 @@ CONFIG_CRYPTO_DEV_CCREE=m
 CONFIG_CRYPTO_DEV_CHELSIO=m
 CONFIG_CRYPTO_DEV_CHELSIO_TLS=m
 CONFIG_CRYPTO_DEV_EXYNOS_RNG=m
+CONFIG_CRYPTO_DEV_FSL_CAAM_AHASH_API=m
+CONFIG_CRYPTO_DEV_FSL_CAAM_CRYPTO_API=m
+# CONFIG_CRYPTO_DEV_FSL_CAAM_DEBUG is not set
+CONFIG_CRYPTO_DEV_FSL_CAAM_INTC_COUNT_THLD=8
+CONFIG_CRYPTO_DEV_FSL_CAAM_INTC_TIME_THLD=8192
+CONFIG_CRYPTO_DEV_FSL_CAAM_INTC=y
+CONFIG_CRYPTO_DEV_FSL_CAAM_JR=m
+CONFIG_CRYPTO_DEV_FSL_CAAM=m
+CONFIG_CRYPTO_DEV_FSL_CAAM_PKC_API=m
+CONFIG_CRYPTO_DEV_FSL_CAAM_RINGSIZE=3
+CONFIG_CRYPTO_DEV_FSL_CAAM_RNG_API=m
 CONFIG_CRYPTO_DEV_HIFN_795X=m
 CONFIG_CRYPTO_DEV_HIFN_795X_RNG=y
 # CONFIG_CRYPTO_DEV_HISI_SEC is not set
@@ -2142,6 +2153,8 @@ CONFIG_I2C_GPIO=m
 CONFIG_I2C_HELPER_AUTO=y
 CONFIG_I2C_HID=m
 # CONFIG_I2C_I801 is not set
+CONFIG_I2C_IMX_LPI2C=m
+CONFIG_I2C_IMX=m
 # CONFIG_I2C_ISCH is not set
 CONFIG_I2C_MESON=m
 CONFIG_I2C_MLXCPLD=m
@@ -2272,6 +2285,7 @@ CONFIG_IMA_READ_POLICY=y
 CONFIG_IMA_WRITE_POLICY=y
 CONFIG_IMA=y
 # CONFIG_IMG_ASCII_LCD is not set
+CONFIG_IMX2_WDT=m
 # CONFIG_IMX_IPUV3_CORE is not set
 # CONFIG_IMX_IRQSTEER is not set
 CONFIG_IMX_MBOX=m
@@ -3300,7 +3314,7 @@ CONFIG_MMC_SDHCI=m
 CONFIG_MMC_SDHCI_OF_ARASAN=m
 # CONFIG_MMC_SDHCI_OF_AT91 is not set
 # CONFIG_MMC_SDHCI_OF_DWCMSHC is not set
-# CONFIG_MMC_SDHCI_OF_ESDHC is not set
+CONFIG_MMC_SDHCI_OF_ESDHC=m
 CONFIG_MMC_SDHCI_OMAP=m
 CONFIG_MMC_SDHCI_PCI=m
 CONFIG_MMC_SDHCI_PLTFM=m
@@ -4781,7 +4795,7 @@ CONFIG_RTC_DRV_S35390A=m
 CONFIG_RTC_DRV_S3C=m
 CONFIG_RTC_DRV_S5M=m
 # CONFIG_RTC_DRV_SA1100 is not set
-# CONFIG_RTC_DRV_SNVS is not set
+CONFIG_RTC_DRV_SNVS=m
 CONFIG_RTC_DRV_STK17TA8=m
 CONFIG_RTC_DRV_SUN6I=y
 CONFIG_RTC_DRV_SUNXI=m
diff --git a/kernel-i686-debug.config b/kernel-i686-debug.config
index d42ddab5f..b9b96d860 100644
--- a/kernel-i686-debug.config
+++ b/kernel-i686-debug.config
@@ -40,7 +40,7 @@ CONFIG_ACER_WMI=m
 # CONFIG_ACORN_PARTITION is not set
 CONFIG_ACPI_AC=y
 CONFIG_ACPI_ALS=m
-# CONFIG_ACPI_APEI_EINJ is not set
+CONFIG_ACPI_APEI_EINJ=m
 # CONFIG_ACPI_APEI_ERST_DEBUG is not set
 CONFIG_ACPI_APEI_GHES=y
 CONFIG_ACPI_APEI_MEMORY_FAILURE=y
diff --git a/kernel-i686.config b/kernel-i686.config
index c36cab57c..18990b101 100644
--- a/kernel-i686.config
+++ b/kernel-i686.config
@@ -40,7 +40,7 @@ CONFIG_ACER_WMI=m
 # CONFIG_ACORN_PARTITION is not set
 CONFIG_ACPI_AC=y
 CONFIG_ACPI_ALS=m
-# CONFIG_ACPI_APEI_EINJ is not set
+CONFIG_ACPI_APEI_EINJ=m
 # CONFIG_ACPI_APEI_ERST_DEBUG is not set
 CONFIG_ACPI_APEI_GHES=y
 CONFIG_ACPI_APEI_MEMORY_FAILURE=y
diff --git a/kernel-x86_64-debug.config b/kernel-x86_64-debug.config
index 7756fbd6a..03ee88827 100644
--- a/kernel-x86_64-debug.config
+++ b/kernel-x86_64-debug.config
@@ -41,7 +41,7 @@ CONFIG_ACER_WMI=m
 # CONFIG_ACORN_PARTITION is not set
 CONFIG_ACPI_AC=y
 CONFIG_ACPI_ALS=m
-# CONFIG_ACPI_APEI_EINJ is not set
+CONFIG_ACPI_APEI_EINJ=m
 # CONFIG_ACPI_APEI_ERST_DEBUG is not set
 CONFIG_ACPI_APEI_GHES=y
 CONFIG_ACPI_APEI_MEMORY_FAILURE=y
diff --git a/kernel-x86_64.config b/kernel-x86_64.config
index faab36b74..d1e12f32c 100644
--- a/kernel-x86_64.config
+++ b/kernel-x86_64.config
@@ -41,7 +41,7 @@ CONFIG_ACER_WMI=m
 # CONFIG_ACORN_PARTITION is not set
 CONFIG_ACPI_AC=y
 CONFIG_ACPI_ALS=m
-# CONFIG_ACPI_APEI_EINJ is not set
+CONFIG_ACPI_APEI_EINJ=m
 # CONFIG_ACPI_APEI_ERST_DEBUG is not set
 CONFIG_ACPI_APEI_GHES=y
 CONFIG_ACPI_APEI_MEMORY_FAILURE=y
diff --git a/kernel.spec b/kernel.spec
index 07f94d00d..086142d2f 100644
--- a/kernel.spec
+++ b/kernel.spec
@@ -79,7 +79,7 @@ Summary: The Linux kernel
 # The rc snapshot level
 %global rcrev 6
 # The git snapshot level
-%define gitrev 0
+%define gitrev 1
 # Set rpm version accordingly
 %define rpmversion 5.%{upstream_sublevel}.0
 %endif
@@ -1907,6 +1907,18 @@ fi
 #
 #
 %changelog
+* Wed Feb 13 2019 Laura Abbott <labbott@redhat.com> - 5.0.0-0.rc6.git1.1
+- Linux v5.0-rc6-42-g1f947a7a011f
+
+* Wed Feb 13 2019 Laura Abbott <labbott@redhat.com>
+- Reenable debugging options.
+
+* Wed Feb 13 2019 Laura Abbott <labbott@redhat.com>
+- Reenable debugging options.
+
+* Wed Feb 13 2019 Peter Robinson <pbrobinson@fedoraproject.org>
+- Enable NXP Freescale Layerscape platform
+
 * Mon Feb 11 2019 Laura Abbott <labbott@redhat.com> - 5.0.0-0.rc6.git0.1
 - Linux v5.0-rc6
 - Disable debugging options.
diff --git a/sources b/sources
index daf625a1d..a3a1b2a34 100644
--- a/sources
+++ b/sources
@@ -1,2 +1,2 @@
-SHA512 (linux-5.0-rc5.tar.gz) = 02959a943550dec91b2b9a036a000acb62025ac9b2fe5c04900bdf32a3f39bd7460c91d7da20b9bb2ac70bcdde7d003822a2a752d39eb4e290a7138d861f5d8d
 SHA512 (linux-5.0-rc6.tar.gz) = de3d6acf9282cfa831e87994df9c2cc855b43cd2638a6417888098e3ce54384780e67c8de0ca6a9163950808012bc4de28740e61c00d3337506d76da840d6ff5
+SHA512 (patch-5.0-rc6-git1.xz) = be4d6c6b19d529e93585750286d07e32a555db09fc481b4d39f2b59bf34ba1df504bdb6b89a67522a66741b099bd5a5d99742ec167d6e706f07963cefbc7cbbc