summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorThorsten Leemhuis <fedora@leemhuis.info>2019-03-05 21:48:35 +0100
committerThorsten Leemhuis <fedora@leemhuis.info>2019-03-05 21:48:35 +0100
commit9cbf0c9d5e75f130888f99fc0a8be902d9bb96fd (patch)
tree24c795f1e25c223ea0d301d4b8b75d5ceda2b72d
parent0f2ece3e3cde7faf83d54ed6879c79d1aae64d65 (diff)
parent3d243755183fabf052de7e407783dc272cdbf258 (diff)
downloadkernel-9cbf0c9d5e75f130888f99fc0a8be902d9bb96fd.tar.gz
kernel-9cbf0c9d5e75f130888f99fc0a8be902d9bb96fd.tar.xz
kernel-9cbf0c9d5e75f130888f99fc0a8be902d9bb96fd.zip
Merge remote-tracking branch 'origin/master' into rawhide-user-thl-vanilla-fedora
-rw-r--r--configs/fedora/generic/CONFIG_MTD_NAND_MESON1
-rw-r--r--configs/fedora/generic/CONFIG_SPI_FSL_QUADSPI1
-rw-r--r--configs/fedora/generic/CONFIG_SPI_MTK_QUADSPI1
-rw-r--r--configs/fedora/generic/CONFIG_SPI_NXP_FLEXSPI1
-rw-r--r--configs/fedora/generic/CONFIG_SPI_SIFIVE1
-rw-r--r--gitrev2
-rw-r--r--kernel-aarch64-debug.config5
-rw-r--r--kernel-aarch64.config5
-rw-r--r--kernel-armv7hl-debug.config4
-rw-r--r--kernel-armv7hl-lpae-debug.config5
-rw-r--r--kernel-armv7hl-lpae.config5
-rw-r--r--kernel-armv7hl.config4
-rw-r--r--kernel-i686-debug.config5
-rw-r--r--kernel-i686.config5
-rw-r--r--kernel-ppc64le-debug.config5
-rw-r--r--kernel-ppc64le.config5
-rw-r--r--kernel-s390x-debug.config5
-rw-r--r--kernel-s390x.config5
-rw-r--r--kernel-x86_64-debug.config5
-rw-r--r--kernel-x86_64.config5
-rw-r--r--kernel.spec14
-rw-r--r--sources1
22 files changed, 84 insertions, 6 deletions
diff --git a/configs/fedora/generic/CONFIG_MTD_NAND_MESON b/configs/fedora/generic/CONFIG_MTD_NAND_MESON
new file mode 100644
index 000000000..3781cbd69
--- /dev/null
+++ b/configs/fedora/generic/CONFIG_MTD_NAND_MESON
@@ -0,0 +1 @@
+# CONFIG_MTD_NAND_MESON is not set
diff --git a/configs/fedora/generic/CONFIG_SPI_FSL_QUADSPI b/configs/fedora/generic/CONFIG_SPI_FSL_QUADSPI
new file mode 100644
index 000000000..96dbf0e34
--- /dev/null
+++ b/configs/fedora/generic/CONFIG_SPI_FSL_QUADSPI
@@ -0,0 +1 @@
+# CONFIG_SPI_FSL_QUADSPI is not set
diff --git a/configs/fedora/generic/CONFIG_SPI_MTK_QUADSPI b/configs/fedora/generic/CONFIG_SPI_MTK_QUADSPI
new file mode 100644
index 000000000..8a2b462b5
--- /dev/null
+++ b/configs/fedora/generic/CONFIG_SPI_MTK_QUADSPI
@@ -0,0 +1 @@
+# CONFIG_SPI_MTK_QUADSPI is not set
diff --git a/configs/fedora/generic/CONFIG_SPI_NXP_FLEXSPI b/configs/fedora/generic/CONFIG_SPI_NXP_FLEXSPI
new file mode 100644
index 000000000..0dce858dc
--- /dev/null
+++ b/configs/fedora/generic/CONFIG_SPI_NXP_FLEXSPI
@@ -0,0 +1 @@
+# CONFIG_SPI_NXP_FLEXSPI is not set
diff --git a/configs/fedora/generic/CONFIG_SPI_SIFIVE b/configs/fedora/generic/CONFIG_SPI_SIFIVE
new file mode 100644
index 000000000..f24362cbf
--- /dev/null
+++ b/configs/fedora/generic/CONFIG_SPI_SIFIVE
@@ -0,0 +1 @@
+# CONFIG_SPI_SIFIVE is not set
diff --git a/gitrev b/gitrev
index e3c90f070..a2d8f0965 100644
--- a/gitrev
+++ b/gitrev
@@ -1 +1 @@
-7d762d69145a54d169f58e56d6dac57a5508debc
+cd2a3bf02625ffad02a6b9f7df758ee36cf12769
diff --git a/kernel-aarch64-debug.config b/kernel-aarch64-debug.config
index f4dc5bf67..32dce8954 100644
--- a/kernel-aarch64-debug.config
+++ b/kernel-aarch64-debug.config
@@ -3484,6 +3484,7 @@ CONFIG_MTD_MAP_BANK_WIDTH_4=y
# CONFIG_MTD_NAND_ECC_BCH is not set
# CONFIG_MTD_NAND is not set
CONFIG_MTD_NAND_MARVELL=m
+# CONFIG_MTD_NAND_MESON is not set
# CONFIG_MTD_NAND_OMAP2 is not set
CONFIG_MTD_NAND_TEGRA=m
CONFIG_MTD_OF_PARTS=m
@@ -5802,6 +5803,7 @@ CONFIG_SPI_DW_MMIO=m
CONFIG_SPI_DW_PCI=m
CONFIG_SPI_FSL_DSPI=m
CONFIG_SPI_FSL_LPSPI=m
+# CONFIG_SPI_FSL_QUADSPI is not set
# CONFIG_SPI_FSL_SPI is not set
CONFIG_SPI_GPIO=m
# CONFIG_SPI_LM70_LLP is not set
@@ -5810,7 +5812,9 @@ CONFIG_SPI_MASTER=y
CONFIG_SPI_MEM=y
CONFIG_SPI_MESON_SPICC=m
CONFIG_SPI_MESON_SPIFC=m
+# CONFIG_SPI_MTK_QUADSPI is not set
# CONFIG_SPI_MXIC is not set
+# CONFIG_SPI_NXP_FLEXSPI is not set
# CONFIG_SPI_OC_TINY is not set
CONFIG_SPI_ORION=m
CONFIG_SPI_PL022=m
@@ -5820,6 +5824,7 @@ CONFIG_SPI_QCOM_QSPI=m
CONFIG_SPI_QUP=m
CONFIG_SPI_ROCKCHIP=m
# CONFIG_SPI_SC18IS602 is not set
+# CONFIG_SPI_SIFIVE is not set
# CONFIG_SPI_SLAVE is not set
CONFIG_SPI_SPIDEV=m
# CONFIG_SPI_SUN4I is not set
diff --git a/kernel-aarch64.config b/kernel-aarch64.config
index bc8369859..0272ba576 100644
--- a/kernel-aarch64.config
+++ b/kernel-aarch64.config
@@ -3464,6 +3464,7 @@ CONFIG_MTD_MAP_BANK_WIDTH_4=y
# CONFIG_MTD_NAND_ECC_BCH is not set
# CONFIG_MTD_NAND is not set
CONFIG_MTD_NAND_MARVELL=m
+# CONFIG_MTD_NAND_MESON is not set
# CONFIG_MTD_NAND_OMAP2 is not set
CONFIG_MTD_NAND_TEGRA=m
CONFIG_MTD_OF_PARTS=m
@@ -5780,6 +5781,7 @@ CONFIG_SPI_DW_MMIO=m
CONFIG_SPI_DW_PCI=m
CONFIG_SPI_FSL_DSPI=m
CONFIG_SPI_FSL_LPSPI=m
+# CONFIG_SPI_FSL_QUADSPI is not set
# CONFIG_SPI_FSL_SPI is not set
CONFIG_SPI_GPIO=m
# CONFIG_SPI_LM70_LLP is not set
@@ -5788,7 +5790,9 @@ CONFIG_SPI_MASTER=y
CONFIG_SPI_MEM=y
CONFIG_SPI_MESON_SPICC=m
CONFIG_SPI_MESON_SPIFC=m
+# CONFIG_SPI_MTK_QUADSPI is not set
# CONFIG_SPI_MXIC is not set
+# CONFIG_SPI_NXP_FLEXSPI is not set
# CONFIG_SPI_OC_TINY is not set
CONFIG_SPI_ORION=m
CONFIG_SPI_PL022=m
@@ -5798,6 +5802,7 @@ CONFIG_SPI_QCOM_QSPI=m
CONFIG_SPI_QUP=m
CONFIG_SPI_ROCKCHIP=m
# CONFIG_SPI_SC18IS602 is not set
+# CONFIG_SPI_SIFIVE is not set
# CONFIG_SPI_SLAVE is not set
CONFIG_SPI_SPIDEV=m
# CONFIG_SPI_SUN4I is not set
diff --git a/kernel-armv7hl-debug.config b/kernel-armv7hl-debug.config
index 8c225ae8f..adeeb1c4c 100644
--- a/kernel-armv7hl-debug.config
+++ b/kernel-armv7hl-debug.config
@@ -3605,6 +3605,7 @@ CONFIG_MTD_NAND_GPIO=m
CONFIG_MTD_NAND_GPMI_NAND=m
CONFIG_MTD_NAND=m
CONFIG_MTD_NAND_MARVELL=m
+# CONFIG_MTD_NAND_MESON is not set
CONFIG_MTD_NAND_MXC=m
CONFIG_MTD_NAND_NANDSIM=m
CONFIG_MTD_NAND_OMAP2=m
@@ -6100,7 +6101,9 @@ CONFIG_SPI_MASTER=y
CONFIG_SPI_MEM=y
CONFIG_SPI_MESON_SPICC=m
CONFIG_SPI_MESON_SPIFC=m
+# CONFIG_SPI_MTK_QUADSPI is not set
# CONFIG_SPI_MXIC is not set
+# CONFIG_SPI_NXP_FLEXSPI is not set
# CONFIG_SPI_OC_TINY is not set
CONFIG_SPI_OMAP24XX=m
CONFIG_SPI_ORION=m
@@ -6111,6 +6114,7 @@ CONFIG_SPI_QUP=m
CONFIG_SPI_ROCKCHIP=m
CONFIG_SPI_S3C64XX=m
# CONFIG_SPI_SC18IS602 is not set
+# CONFIG_SPI_SIFIVE is not set
# CONFIG_SPI_SLAVE is not set
CONFIG_SPI_SPIDEV=m
CONFIG_SPI_ST_SSC4=m
diff --git a/kernel-armv7hl-lpae-debug.config b/kernel-armv7hl-lpae-debug.config
index 6e512d097..c50703939 100644
--- a/kernel-armv7hl-lpae-debug.config
+++ b/kernel-armv7hl-lpae-debug.config
@@ -3455,6 +3455,7 @@ CONFIG_MTD_NAND_ECC_SMC=y
CONFIG_MTD_NAND_GPIO=m
CONFIG_MTD_NAND=m
CONFIG_MTD_NAND_MARVELL=m
+# CONFIG_MTD_NAND_MESON is not set
CONFIG_MTD_NAND_MXC=m
CONFIG_MTD_NAND_NANDSIM=m
# CONFIG_MTD_NAND_OMAP2 is not set
@@ -5742,6 +5743,7 @@ CONFIG_SPI_DESIGNWARE=m
CONFIG_SPI_DW_MMIO=m
CONFIG_SPI_DW_PCI=m
CONFIG_SPI_FSL_LPSPI=m
+# CONFIG_SPI_FSL_QUADSPI is not set
# CONFIG_SPI_FSL_SPI is not set
CONFIG_SPI_GPIO=m
# CONFIG_SPI_LM70_LLP is not set
@@ -5750,7 +5752,9 @@ CONFIG_SPI_MASTER=y
CONFIG_SPI_MEM=y
CONFIG_SPI_MESON_SPICC=m
CONFIG_SPI_MESON_SPIFC=m
+# CONFIG_SPI_MTK_QUADSPI is not set
# CONFIG_SPI_MXIC is not set
+# CONFIG_SPI_NXP_FLEXSPI is not set
# CONFIG_SPI_OC_TINY is not set
CONFIG_SPI_ORION=m
CONFIG_SPI_PL022=m
@@ -5758,6 +5762,7 @@ CONFIG_SPI_PL022=m
CONFIG_SPI_ROCKCHIP=m
CONFIG_SPI_S3C64XX=m
# CONFIG_SPI_SC18IS602 is not set
+# CONFIG_SPI_SIFIVE is not set
# CONFIG_SPI_SLAVE is not set
CONFIG_SPI_SPIDEV=m
CONFIG_SPI_SUN4I=m
diff --git a/kernel-armv7hl-lpae.config b/kernel-armv7hl-lpae.config
index 99943a74b..45c88811e 100644
--- a/kernel-armv7hl-lpae.config
+++ b/kernel-armv7hl-lpae.config
@@ -3436,6 +3436,7 @@ CONFIG_MTD_NAND_ECC_SMC=y
CONFIG_MTD_NAND_GPIO=m
CONFIG_MTD_NAND=m
CONFIG_MTD_NAND_MARVELL=m
+# CONFIG_MTD_NAND_MESON is not set
CONFIG_MTD_NAND_MXC=m
CONFIG_MTD_NAND_NANDSIM=m
# CONFIG_MTD_NAND_OMAP2 is not set
@@ -5721,6 +5722,7 @@ CONFIG_SPI_DESIGNWARE=m
CONFIG_SPI_DW_MMIO=m
CONFIG_SPI_DW_PCI=m
CONFIG_SPI_FSL_LPSPI=m
+# CONFIG_SPI_FSL_QUADSPI is not set
# CONFIG_SPI_FSL_SPI is not set
CONFIG_SPI_GPIO=m
# CONFIG_SPI_LM70_LLP is not set
@@ -5729,7 +5731,9 @@ CONFIG_SPI_MASTER=y
CONFIG_SPI_MEM=y
CONFIG_SPI_MESON_SPICC=m
CONFIG_SPI_MESON_SPIFC=m
+# CONFIG_SPI_MTK_QUADSPI is not set
# CONFIG_SPI_MXIC is not set
+# CONFIG_SPI_NXP_FLEXSPI is not set
# CONFIG_SPI_OC_TINY is not set
CONFIG_SPI_ORION=m
CONFIG_SPI_PL022=m
@@ -5737,6 +5741,7 @@ CONFIG_SPI_PL022=m
CONFIG_SPI_ROCKCHIP=m
CONFIG_SPI_S3C64XX=m
# CONFIG_SPI_SC18IS602 is not set
+# CONFIG_SPI_SIFIVE is not set
# CONFIG_SPI_SLAVE is not set
CONFIG_SPI_SPIDEV=m
CONFIG_SPI_SUN4I=m
diff --git a/kernel-armv7hl.config b/kernel-armv7hl.config
index 10a7cbc7a..36c54402b 100644
--- a/kernel-armv7hl.config
+++ b/kernel-armv7hl.config
@@ -3586,6 +3586,7 @@ CONFIG_MTD_NAND_GPIO=m
CONFIG_MTD_NAND_GPMI_NAND=m
CONFIG_MTD_NAND=m
CONFIG_MTD_NAND_MARVELL=m
+# CONFIG_MTD_NAND_MESON is not set
CONFIG_MTD_NAND_MXC=m
CONFIG_MTD_NAND_NANDSIM=m
CONFIG_MTD_NAND_OMAP2=m
@@ -6079,7 +6080,9 @@ CONFIG_SPI_MASTER=y
CONFIG_SPI_MEM=y
CONFIG_SPI_MESON_SPICC=m
CONFIG_SPI_MESON_SPIFC=m
+# CONFIG_SPI_MTK_QUADSPI is not set
# CONFIG_SPI_MXIC is not set
+# CONFIG_SPI_NXP_FLEXSPI is not set
# CONFIG_SPI_OC_TINY is not set
CONFIG_SPI_OMAP24XX=m
CONFIG_SPI_ORION=m
@@ -6090,6 +6093,7 @@ CONFIG_SPI_QUP=m
CONFIG_SPI_ROCKCHIP=m
CONFIG_SPI_S3C64XX=m
# CONFIG_SPI_SC18IS602 is not set
+# CONFIG_SPI_SIFIVE is not set
# CONFIG_SPI_SLAVE is not set
CONFIG_SPI_SPIDEV=m
CONFIG_SPI_ST_SSC4=m
diff --git a/kernel-i686-debug.config b/kernel-i686-debug.config
index b9b96d860..2e99bcfb1 100644
--- a/kernel-i686-debug.config
+++ b/kernel-i686-debug.config
@@ -3268,6 +3268,7 @@ CONFIG_MTD_NAND_CAFE=m
# CONFIG_MTD_NAND_DISKONCHIP is not set
# CONFIG_MTD_NAND_ECC_BCH is not set
# CONFIG_MTD_NAND is not set
+# CONFIG_MTD_NAND_MESON is not set
# CONFIG_MTD_NAND_OMAP2 is not set
CONFIG_MTD_OF_PARTS=m
# CONFIG_MTD_ONENAND is not set
@@ -5371,17 +5372,21 @@ CONFIG_SPARSEMEM_MANUAL=y
# CONFIG_SPI_DEBUG is not set
# CONFIG_SPI_DESIGNWARE is not set
CONFIG_SPI_FSL_LPSPI=m
+# CONFIG_SPI_FSL_QUADSPI is not set
# CONFIG_SPI_FSL_SPI is not set
# CONFIG_SPI_GPIO is not set
# CONFIG_SPI_LM70_LLP is not set
# CONFIG_SPI_LOOPBACK_TEST is not set
CONFIG_SPI_MASTER=y
# CONFIG_SPI_MEM is not set
+# CONFIG_SPI_MTK_QUADSPI is not set
# CONFIG_SPI_MXIC is not set
+# CONFIG_SPI_NXP_FLEXSPI is not set
# CONFIG_SPI_OC_TINY is not set
CONFIG_SPI_PXA2XX=m
# CONFIG_SPI_ROCKCHIP is not set
# CONFIG_SPI_SC18IS602 is not set
+# CONFIG_SPI_SIFIVE is not set
# CONFIG_SPI_SLAVE is not set
# CONFIG_SPI_SPIDEV is not set
# CONFIG_SPI_TLE62X0 is not set
diff --git a/kernel-i686.config b/kernel-i686.config
index 18990b101..64662e8a6 100644
--- a/kernel-i686.config
+++ b/kernel-i686.config
@@ -3249,6 +3249,7 @@ CONFIG_MTD_NAND_CAFE=m
# CONFIG_MTD_NAND_DISKONCHIP is not set
# CONFIG_MTD_NAND_ECC_BCH is not set
# CONFIG_MTD_NAND is not set
+# CONFIG_MTD_NAND_MESON is not set
# CONFIG_MTD_NAND_OMAP2 is not set
CONFIG_MTD_OF_PARTS=m
# CONFIG_MTD_ONENAND is not set
@@ -5350,17 +5351,21 @@ CONFIG_SPARSEMEM_MANUAL=y
# CONFIG_SPI_DEBUG is not set
# CONFIG_SPI_DESIGNWARE is not set
CONFIG_SPI_FSL_LPSPI=m
+# CONFIG_SPI_FSL_QUADSPI is not set
# CONFIG_SPI_FSL_SPI is not set
# CONFIG_SPI_GPIO is not set
# CONFIG_SPI_LM70_LLP is not set
# CONFIG_SPI_LOOPBACK_TEST is not set
CONFIG_SPI_MASTER=y
# CONFIG_SPI_MEM is not set
+# CONFIG_SPI_MTK_QUADSPI is not set
# CONFIG_SPI_MXIC is not set
+# CONFIG_SPI_NXP_FLEXSPI is not set
# CONFIG_SPI_OC_TINY is not set
CONFIG_SPI_PXA2XX=m
# CONFIG_SPI_ROCKCHIP is not set
# CONFIG_SPI_SC18IS602 is not set
+# CONFIG_SPI_SIFIVE is not set
# CONFIG_SPI_SLAVE is not set
# CONFIG_SPI_SPIDEV is not set
# CONFIG_SPI_TLE62X0 is not set
diff --git a/kernel-ppc64le-debug.config b/kernel-ppc64le-debug.config
index 6a743e51a..031876519 100644
--- a/kernel-ppc64le-debug.config
+++ b/kernel-ppc64le-debug.config
@@ -3005,6 +3005,7 @@ CONFIG_MTD_MAP_BANK_WIDTH_4=y
# CONFIG_MTD_NAND_DISKONCHIP is not set
# CONFIG_MTD_NAND_ECC_BCH is not set
# CONFIG_MTD_NAND is not set
+# CONFIG_MTD_NAND_MESON is not set
# CONFIG_MTD_NAND_OMAP2 is not set
CONFIG_MTD_OF_PARTS=m
# CONFIG_MTD_ONENAND is not set
@@ -5022,17 +5023,21 @@ CONFIG_SPARSEMEM_VMEMMAP=y
# CONFIG_SPI_DEBUG is not set
# CONFIG_SPI_DESIGNWARE is not set
CONFIG_SPI_FSL_LPSPI=m
+# CONFIG_SPI_FSL_QUADSPI is not set
# CONFIG_SPI_FSL_SPI is not set
# CONFIG_SPI_GPIO is not set
# CONFIG_SPI is not set
# CONFIG_SPI_LM70_LLP is not set
# CONFIG_SPI_LOOPBACK_TEST is not set
# CONFIG_SPI_MEM is not set
+# CONFIG_SPI_MTK_QUADSPI is not set
# CONFIG_SPI_MXIC is not set
+# CONFIG_SPI_NXP_FLEXSPI is not set
# CONFIG_SPI_OC_TINY is not set
# CONFIG_SPI_PXA2XX is not set
# CONFIG_SPI_ROCKCHIP is not set
# CONFIG_SPI_SC18IS602 is not set
+# CONFIG_SPI_SIFIVE is not set
# CONFIG_SPI_SLAVE is not set
# CONFIG_SPI_SPIDEV is not set
# CONFIG_SPI_TLE62X0 is not set
diff --git a/kernel-ppc64le.config b/kernel-ppc64le.config
index 7f1396772..b37166c43 100644
--- a/kernel-ppc64le.config
+++ b/kernel-ppc64le.config
@@ -2984,6 +2984,7 @@ CONFIG_MTD_MAP_BANK_WIDTH_4=y
# CONFIG_MTD_NAND_DISKONCHIP is not set
# CONFIG_MTD_NAND_ECC_BCH is not set
# CONFIG_MTD_NAND is not set
+# CONFIG_MTD_NAND_MESON is not set
# CONFIG_MTD_NAND_OMAP2 is not set
CONFIG_MTD_OF_PARTS=m
# CONFIG_MTD_ONENAND is not set
@@ -4999,17 +5000,21 @@ CONFIG_SPARSEMEM_VMEMMAP=y
# CONFIG_SPI_DEBUG is not set
# CONFIG_SPI_DESIGNWARE is not set
CONFIG_SPI_FSL_LPSPI=m
+# CONFIG_SPI_FSL_QUADSPI is not set
# CONFIG_SPI_FSL_SPI is not set
# CONFIG_SPI_GPIO is not set
# CONFIG_SPI is not set
# CONFIG_SPI_LM70_LLP is not set
# CONFIG_SPI_LOOPBACK_TEST is not set
# CONFIG_SPI_MEM is not set
+# CONFIG_SPI_MTK_QUADSPI is not set
# CONFIG_SPI_MXIC is not set
+# CONFIG_SPI_NXP_FLEXSPI is not set
# CONFIG_SPI_OC_TINY is not set
# CONFIG_SPI_PXA2XX is not set
# CONFIG_SPI_ROCKCHIP is not set
# CONFIG_SPI_SC18IS602 is not set
+# CONFIG_SPI_SIFIVE is not set
# CONFIG_SPI_SLAVE is not set
# CONFIG_SPI_SPIDEV is not set
# CONFIG_SPI_TLE62X0 is not set
diff --git a/kernel-s390x-debug.config b/kernel-s390x-debug.config
index 36bcd8012..3e3c82f81 100644
--- a/kernel-s390x-debug.config
+++ b/kernel-s390x-debug.config
@@ -2978,6 +2978,7 @@ CONFIG_MTD_MAP_BANK_WIDTH_4=y
# CONFIG_MTD_NAND_DISKONCHIP is not set
# CONFIG_MTD_NAND_ECC_BCH is not set
# CONFIG_MTD_NAND is not set
+# CONFIG_MTD_NAND_MESON is not set
# CONFIG_MTD_NAND_OMAP2 is not set
# CONFIG_MTD_ONENAND is not set
# CONFIG_MTD_OOPS is not set
@@ -4962,17 +4963,21 @@ CONFIG_SPARSEMEM_MANUAL=y
# CONFIG_SPI_DEBUG is not set
# CONFIG_SPI_DESIGNWARE is not set
CONFIG_SPI_FSL_LPSPI=m
+# CONFIG_SPI_FSL_QUADSPI is not set
# CONFIG_SPI_FSL_SPI is not set
# CONFIG_SPI_GPIO is not set
# CONFIG_SPI is not set
# CONFIG_SPI_LM70_LLP is not set
# CONFIG_SPI_LOOPBACK_TEST is not set
# CONFIG_SPI_MEM is not set
+# CONFIG_SPI_MTK_QUADSPI is not set
# CONFIG_SPI_MXIC is not set
+# CONFIG_SPI_NXP_FLEXSPI is not set
# CONFIG_SPI_OC_TINY is not set
# CONFIG_SPI_PXA2XX is not set
# CONFIG_SPI_ROCKCHIP is not set
# CONFIG_SPI_SC18IS602 is not set
+# CONFIG_SPI_SIFIVE is not set
# CONFIG_SPI_SLAVE is not set
# CONFIG_SPI_SPIDEV is not set
# CONFIG_SPI_TLE62X0 is not set
diff --git a/kernel-s390x.config b/kernel-s390x.config
index e5415f0f1..be3e28d6b 100644
--- a/kernel-s390x.config
+++ b/kernel-s390x.config
@@ -2957,6 +2957,7 @@ CONFIG_MTD_MAP_BANK_WIDTH_4=y
# CONFIG_MTD_NAND_DISKONCHIP is not set
# CONFIG_MTD_NAND_ECC_BCH is not set
# CONFIG_MTD_NAND is not set
+# CONFIG_MTD_NAND_MESON is not set
# CONFIG_MTD_NAND_OMAP2 is not set
# CONFIG_MTD_ONENAND is not set
# CONFIG_MTD_OOPS is not set
@@ -4939,17 +4940,21 @@ CONFIG_SPARSEMEM_MANUAL=y
# CONFIG_SPI_DEBUG is not set
# CONFIG_SPI_DESIGNWARE is not set
CONFIG_SPI_FSL_LPSPI=m
+# CONFIG_SPI_FSL_QUADSPI is not set
# CONFIG_SPI_FSL_SPI is not set
# CONFIG_SPI_GPIO is not set
# CONFIG_SPI is not set
# CONFIG_SPI_LM70_LLP is not set
# CONFIG_SPI_LOOPBACK_TEST is not set
# CONFIG_SPI_MEM is not set
+# CONFIG_SPI_MTK_QUADSPI is not set
# CONFIG_SPI_MXIC is not set
+# CONFIG_SPI_NXP_FLEXSPI is not set
# CONFIG_SPI_OC_TINY is not set
# CONFIG_SPI_PXA2XX is not set
# CONFIG_SPI_ROCKCHIP is not set
# CONFIG_SPI_SC18IS602 is not set
+# CONFIG_SPI_SIFIVE is not set
# CONFIG_SPI_SLAVE is not set
# CONFIG_SPI_SPIDEV is not set
# CONFIG_SPI_TLE62X0 is not set
diff --git a/kernel-x86_64-debug.config b/kernel-x86_64-debug.config
index 03ee88827..1db050abe 100644
--- a/kernel-x86_64-debug.config
+++ b/kernel-x86_64-debug.config
@@ -3303,6 +3303,7 @@ CONFIG_MTD_MAP_BANK_WIDTH_4=y
# CONFIG_MTD_NAND_DISKONCHIP is not set
# CONFIG_MTD_NAND_ECC_BCH is not set
# CONFIG_MTD_NAND is not set
+# CONFIG_MTD_NAND_MESON is not set
# CONFIG_MTD_NAND_OMAP2 is not set
# CONFIG_MTD_ONENAND is not set
# CONFIG_MTD_OOPS is not set
@@ -5411,17 +5412,21 @@ CONFIG_SPARSEMEM=y
# CONFIG_SPI_DEBUG is not set
# CONFIG_SPI_DESIGNWARE is not set
CONFIG_SPI_FSL_LPSPI=m
+# CONFIG_SPI_FSL_QUADSPI is not set
# CONFIG_SPI_FSL_SPI is not set
# CONFIG_SPI_GPIO is not set
# CONFIG_SPI_LM70_LLP is not set
# CONFIG_SPI_LOOPBACK_TEST is not set
CONFIG_SPI_MASTER=y
# CONFIG_SPI_MEM is not set
+# CONFIG_SPI_MTK_QUADSPI is not set
# CONFIG_SPI_MXIC is not set
+# CONFIG_SPI_NXP_FLEXSPI is not set
# CONFIG_SPI_OC_TINY is not set
CONFIG_SPI_PXA2XX=m
# CONFIG_SPI_ROCKCHIP is not set
# CONFIG_SPI_SC18IS602 is not set
+# CONFIG_SPI_SIFIVE is not set
# CONFIG_SPI_SLAVE is not set
# CONFIG_SPI_SPIDEV is not set
# CONFIG_SPI_TLE62X0 is not set
diff --git a/kernel-x86_64.config b/kernel-x86_64.config
index d1e12f32c..42ba73784 100644
--- a/kernel-x86_64.config
+++ b/kernel-x86_64.config
@@ -3284,6 +3284,7 @@ CONFIG_MTD_MAP_BANK_WIDTH_4=y
# CONFIG_MTD_NAND_DISKONCHIP is not set
# CONFIG_MTD_NAND_ECC_BCH is not set
# CONFIG_MTD_NAND is not set
+# CONFIG_MTD_NAND_MESON is not set
# CONFIG_MTD_NAND_OMAP2 is not set
# CONFIG_MTD_ONENAND is not set
# CONFIG_MTD_OOPS is not set
@@ -5390,17 +5391,21 @@ CONFIG_SPARSEMEM=y
# CONFIG_SPI_DEBUG is not set
# CONFIG_SPI_DESIGNWARE is not set
CONFIG_SPI_FSL_LPSPI=m
+# CONFIG_SPI_FSL_QUADSPI is not set
# CONFIG_SPI_FSL_SPI is not set
# CONFIG_SPI_GPIO is not set
# CONFIG_SPI_LM70_LLP is not set
# CONFIG_SPI_LOOPBACK_TEST is not set
CONFIG_SPI_MASTER=y
# CONFIG_SPI_MEM is not set
+# CONFIG_SPI_MTK_QUADSPI is not set
# CONFIG_SPI_MXIC is not set
+# CONFIG_SPI_NXP_FLEXSPI is not set
# CONFIG_SPI_OC_TINY is not set
CONFIG_SPI_PXA2XX=m
# CONFIG_SPI_ROCKCHIP is not set
# CONFIG_SPI_SC18IS602 is not set
+# CONFIG_SPI_SIFIVE is not set
# CONFIG_SPI_SLAVE is not set
# CONFIG_SPI_SPIDEV is not set
# CONFIG_SPI_TLE62X0 is not set
diff --git a/kernel.spec b/kernel.spec
index 0ebd02eba..3b5b8f7f3 100644
--- a/kernel.spec
+++ b/kernel.spec
@@ -6,7 +6,7 @@ Summary: The Linux kernel
# For a stable, released kernel, released_kernel should be 1. For rawhide
# and/or a kernel built from an rc or git snapshot, released_kernel should
# be 0.
-%global released_kernel 1
+%global released_kernel 0
# Sign modules on x86. Make sure the config files match this setting if more
# architectures are added.
@@ -74,12 +74,10 @@ Summary: The Linux kernel
%else
# The next upstream release sublevel (base_sublevel+1)
%define upstream_sublevel %(echo $((%{base_sublevel} + 1)))
-# Work around for major version bump
-%define upstream_sublevel 0
# The rc snapshot level
%global rcrev 0
# The git snapshot level
-%define gitrev 0
+%define gitrev 1
# Set rpm version accordingly
%define rpmversion 5.%{upstream_sublevel}.0
%endif
@@ -132,7 +130,7 @@ Summary: The Linux kernel
# Set debugbuildsenabled to 1 for production (build separate debug kernels)
# and 0 for rawhide (all kernels are debug kernels).
# See also 'make debug' and 'make release'.
-%define debugbuildsenabled 1
+%define debugbuildsenabled 0
# Kernel headers are being split out into a separate package
%if 0%{?fedora}
@@ -1907,6 +1905,12 @@ fi
#
#
%changelog
+* Tue Mar 05 2019 Jeremy Cline <jcline@redhat.com> - 5.1.0-0.rc0.git1.1
+- Linux v5.0-510-gcd2a3bf02625
+
+* Tue Mar 05 2019 Jeremy Cline <jcline@redhat.com>
+- Reenable debugging options.
+
* Mon Mar 04 2019 Laura Abbott <labbott@redhat.com> - 5.0.0-1
- Linux v5.0.0
diff --git a/sources b/sources
index 1eb341ce6..1b4af5040 100644
--- a/sources
+++ b/sources
@@ -1 +1,2 @@
SHA512 (linux-5.0.tar.xz) = 3fbab70c7b03b1a10e9fa14d1e2e1f550faba4f5792b7699ca006951da74ab86e7d7f19c6a67849ab99343186e7d6f2752cd910d76222213b93c1eab90abf1b0
+SHA512 (patch-5.0-git1.xz) = 1c415781370137e68fe38d5f2435e291587b8d0444e5d59da0f0e38a084bd142a02f61b19155b62127a704652866f43f00930c05574443133468d85cf25fb981