summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJustin M. Forbes <jforbes@fedoraproject.org>2021-07-21 14:21:01 -0500
committerJustin M. Forbes <jforbes@fedoraproject.org>2021-07-21 14:21:01 -0500
commitb6670052876b21ed6905a8eb2be5258291a0b38b (patch)
tree93a9ea9d129b31ba61029cae54e95a8fdceaabce
parent5f0e0f3c714a197de8d36ab1c984fc722e87c60d (diff)
downloadkernel-b6670052876b21ed6905a8eb2be5258291a0b38b.tar.gz
kernel-b6670052876b21ed6905a8eb2be5258291a0b38b.tar.xz
kernel-b6670052876b21ed6905a8eb2be5258291a0b38b.zip
kernel-5.14.0-0.rc2.20210721git8cae8cd89f05.24
* Wed Jul 21 2021 Fedora Kernel Team <kernel-team@fedoraproject.org> [5.14.0-0.rc2.20210721git8cae8cd89f05.24] - redhat/configs: Add CONFIG_INTEL_PMT_CRASHLOG (Michael Petlan) [1880486] - redhat/configs: Add CONFIG_INTEL_PMT_TELEMETRY (Michael Petlan) [1880486] - redhat/configs: Add CONFIG_MFD_INTEL_PMT (Michael Petlan) [1880486] - redhat/configs: enable CONFIG_BLK_DEV_ZONED (Ming Lei) [1638087] - Add --with clang_lto option to build the kernel with Link Time Optimizations (Tom Stellard) - common: disable DVB_AV7110 and associated pieces (Peter Robinson) - Fix fedora-only config updates (Don Zickus) - Fedor config update for new option (Justin M. Forbes) Resolves: rhbz#1638087, rhbz#1880486 Signed-off-by: Justin M. Forbes <jforbes@fedoraproject.org>
-rw-r--r--Makefile.rhelver2
-rw-r--r--kernel-aarch64-debug-fedora.config5
-rw-r--r--kernel-aarch64-debug-rhel.config9
-rw-r--r--kernel-aarch64-fedora.config5
-rw-r--r--kernel-aarch64-rhel.config9
-rw-r--r--kernel-armv7hl-debug-fedora.config5
-rw-r--r--kernel-armv7hl-fedora.config5
-rw-r--r--kernel-armv7hl-lpae-debug-fedora.config5
-rw-r--r--kernel-armv7hl-lpae-fedora.config5
-rw-r--r--kernel-i686-debug-fedora.config5
-rw-r--r--kernel-i686-fedora.config5
-rw-r--r--kernel-ppc64le-debug-fedora.config5
-rw-r--r--kernel-ppc64le-debug-rhel.config9
-rw-r--r--kernel-ppc64le-fedora.config5
-rw-r--r--kernel-ppc64le-rhel.config9
-rw-r--r--kernel-s390x-debug-fedora.config5
-rw-r--r--kernel-s390x-debug-rhel.config9
-rw-r--r--kernel-s390x-fedora.config5
-rw-r--r--kernel-s390x-rhel.config9
-rw-r--r--kernel-s390x-zfcpdump-rhel.config9
-rw-r--r--kernel-x86_64-debug-fedora.config5
-rw-r--r--kernel-x86_64-debug-rhel.config9
-rw-r--r--kernel-x86_64-fedora.config5
-rw-r--r--kernel-x86_64-rhel.config9
-rwxr-xr-xkernel.spec54
-rwxr-xr-xprocess_configs.sh27
-rw-r--r--sources6
27 files changed, 137 insertions, 103 deletions
diff --git a/Makefile.rhelver b/Makefile.rhelver
index e055331e5..bee55fb24 100644
--- a/Makefile.rhelver
+++ b/Makefile.rhelver
@@ -12,7 +12,7 @@ RHEL_MINOR = 99
#
# Use this spot to avoid future merge conflicts.
# Do not trim this comment.
-RHEL_RELEASE = 23
+RHEL_RELEASE = 24
#
# Early y+1 numbering
diff --git a/kernel-aarch64-debug-fedora.config b/kernel-aarch64-debug-fedora.config
index 99cae1350..1ff2206c9 100644
--- a/kernel-aarch64-debug-fedora.config
+++ b/kernel-aarch64-debug-fedora.config
@@ -1890,8 +1890,7 @@ CONFIG_DUMMY_CONSOLE=y
# CONFIG_DUMMY_IRQ is not set
CONFIG_DUMMY=m
CONFIG_DVB_AS102=m
-CONFIG_DVB_AV7110=m
-CONFIG_DVB_AV7110_OSD=y
+# CONFIG_DVB_AV7110 is not set
CONFIG_DVB_B2C2_FLEXCOP=m
# CONFIG_DVB_B2C2_FLEXCOP_PCI_DEBUG is not set
CONFIG_DVB_B2C2_FLEXCOP_PCI=m
@@ -1902,7 +1901,7 @@ CONFIG_DVB_BUDGET_AV=m
CONFIG_DVB_BUDGET_CI=m
CONFIG_DVB_BUDGET_CORE=m
CONFIG_DVB_BUDGET=m
-CONFIG_DVB_BUDGET_PATCH=m
+# CONFIG_DVB_BUDGET_PATCH is not set
CONFIG_DVB_CORE=m
CONFIG_DVB_CXD2099=m
CONFIG_DVB_DDBRIDGE=m
diff --git a/kernel-aarch64-debug-rhel.config b/kernel-aarch64-debug-rhel.config
index 04f244ae0..fb1fce904 100644
--- a/kernel-aarch64-debug-rhel.config
+++ b/kernel-aarch64-debug-rhel.config
@@ -512,7 +512,7 @@ CONFIG_BLK_DEV_SR_VENDOR=y
CONFIG_BLK_DEV_THROTTLING=y
# CONFIG_BLK_DEV_UMEM is not set
CONFIG_BLK_DEV=y
-# CONFIG_BLK_DEV_ZONED is not set
+CONFIG_BLK_DEV_ZONED=y
# CONFIG_BLK_INLINE_ENCRYPTION is not set
# CONFIG_BLK_SED_OPAL is not set
CONFIG_BLK_WBT_MQ=y
@@ -1434,9 +1434,7 @@ CONFIG_DUMMY_CONSOLE=y
# CONFIG_DUMMY_IRQ is not set
CONFIG_DUMMY=m
# CONFIG_DVB_AS102 is not set
-CONFIG_DVB_AV7110_IR=y
-CONFIG_DVB_AV7110=m
-CONFIG_DVB_AV7110_OSD=y
+# CONFIG_DVB_AV7110 is not set
CONFIG_DVB_B2C2_FLEXCOP=m
# CONFIG_DVB_B2C2_FLEXCOP_PCI_DEBUG is not set
CONFIG_DVB_B2C2_FLEXCOP_PCI=m
@@ -1447,7 +1445,7 @@ CONFIG_DVB_BUDGET_AV=m
CONFIG_DVB_BUDGET_CI=m
CONFIG_DVB_BUDGET_CORE=m
CONFIG_DVB_BUDGET=m
-CONFIG_DVB_BUDGET_PATCH=m
+# CONFIG_DVB_BUDGET_PATCH is not set
CONFIG_DVB_CORE=m
CONFIG_DVB_CX24117=m
CONFIG_DVB_CX24120=m
@@ -6737,6 +6735,7 @@ CONFIG_ZLIB_DEFLATE=y
CONFIG_ZLIB_DFLTCC=y
CONFIG_ZLIB_INFLATE=y
CONFIG_ZONE_DEVICE=y
+# CONFIG_ZONEFS_FS is not set
# CONFIG_ZOPT2201 is not set
# CONFIG_ZPA2326 is not set
CONFIG_ZPOOL=y
diff --git a/kernel-aarch64-fedora.config b/kernel-aarch64-fedora.config
index 4b744d34f..455742982 100644
--- a/kernel-aarch64-fedora.config
+++ b/kernel-aarch64-fedora.config
@@ -1882,8 +1882,7 @@ CONFIG_DUMMY_CONSOLE=y
# CONFIG_DUMMY_IRQ is not set
CONFIG_DUMMY=m
CONFIG_DVB_AS102=m
-CONFIG_DVB_AV7110=m
-CONFIG_DVB_AV7110_OSD=y
+# CONFIG_DVB_AV7110 is not set
CONFIG_DVB_B2C2_FLEXCOP=m
# CONFIG_DVB_B2C2_FLEXCOP_PCI_DEBUG is not set
CONFIG_DVB_B2C2_FLEXCOP_PCI=m
@@ -1894,7 +1893,7 @@ CONFIG_DVB_BUDGET_AV=m
CONFIG_DVB_BUDGET_CI=m
CONFIG_DVB_BUDGET_CORE=m
CONFIG_DVB_BUDGET=m
-CONFIG_DVB_BUDGET_PATCH=m
+# CONFIG_DVB_BUDGET_PATCH is not set
CONFIG_DVB_CORE=m
CONFIG_DVB_CXD2099=m
CONFIG_DVB_DDBRIDGE=m
diff --git a/kernel-aarch64-rhel.config b/kernel-aarch64-rhel.config
index c5ceb5369..2661e58dd 100644
--- a/kernel-aarch64-rhel.config
+++ b/kernel-aarch64-rhel.config
@@ -512,7 +512,7 @@ CONFIG_BLK_DEV_SR_VENDOR=y
CONFIG_BLK_DEV_THROTTLING=y
# CONFIG_BLK_DEV_UMEM is not set
CONFIG_BLK_DEV=y
-# CONFIG_BLK_DEV_ZONED is not set
+CONFIG_BLK_DEV_ZONED=y
# CONFIG_BLK_INLINE_ENCRYPTION is not set
# CONFIG_BLK_SED_OPAL is not set
CONFIG_BLK_WBT_MQ=y
@@ -1426,9 +1426,7 @@ CONFIG_DUMMY_CONSOLE=y
# CONFIG_DUMMY_IRQ is not set
CONFIG_DUMMY=m
# CONFIG_DVB_AS102 is not set
-CONFIG_DVB_AV7110_IR=y
-CONFIG_DVB_AV7110=m
-CONFIG_DVB_AV7110_OSD=y
+# CONFIG_DVB_AV7110 is not set
CONFIG_DVB_B2C2_FLEXCOP=m
# CONFIG_DVB_B2C2_FLEXCOP_PCI_DEBUG is not set
CONFIG_DVB_B2C2_FLEXCOP_PCI=m
@@ -1439,7 +1437,7 @@ CONFIG_DVB_BUDGET_AV=m
CONFIG_DVB_BUDGET_CI=m
CONFIG_DVB_BUDGET_CORE=m
CONFIG_DVB_BUDGET=m
-CONFIG_DVB_BUDGET_PATCH=m
+# CONFIG_DVB_BUDGET_PATCH is not set
CONFIG_DVB_CORE=m
CONFIG_DVB_CX24117=m
CONFIG_DVB_CX24120=m
@@ -6714,6 +6712,7 @@ CONFIG_ZLIB_DEFLATE=y
CONFIG_ZLIB_DFLTCC=y
CONFIG_ZLIB_INFLATE=y
CONFIG_ZONE_DEVICE=y
+# CONFIG_ZONEFS_FS is not set
# CONFIG_ZOPT2201 is not set
# CONFIG_ZPA2326 is not set
CONFIG_ZPOOL=y
diff --git a/kernel-armv7hl-debug-fedora.config b/kernel-armv7hl-debug-fedora.config
index 91e00acf9..0f20c81c2 100644
--- a/kernel-armv7hl-debug-fedora.config
+++ b/kernel-armv7hl-debug-fedora.config
@@ -1921,8 +1921,7 @@ CONFIG_DUMMY_CONSOLE=y
# CONFIG_DUMMY_IRQ is not set
CONFIG_DUMMY=m
CONFIG_DVB_AS102=m
-CONFIG_DVB_AV7110=m
-CONFIG_DVB_AV7110_OSD=y
+# CONFIG_DVB_AV7110 is not set
CONFIG_DVB_B2C2_FLEXCOP=m
# CONFIG_DVB_B2C2_FLEXCOP_PCI_DEBUG is not set
CONFIG_DVB_B2C2_FLEXCOP_PCI=m
@@ -1933,7 +1932,7 @@ CONFIG_DVB_BUDGET_AV=m
CONFIG_DVB_BUDGET_CI=m
CONFIG_DVB_BUDGET_CORE=m
CONFIG_DVB_BUDGET=m
-CONFIG_DVB_BUDGET_PATCH=m
+# CONFIG_DVB_BUDGET_PATCH is not set
CONFIG_DVB_CORE=m
CONFIG_DVB_CXD2099=m
CONFIG_DVB_DDBRIDGE=m
diff --git a/kernel-armv7hl-fedora.config b/kernel-armv7hl-fedora.config
index 1eff149bc..6bc5a6b68 100644
--- a/kernel-armv7hl-fedora.config
+++ b/kernel-armv7hl-fedora.config
@@ -1914,8 +1914,7 @@ CONFIG_DUMMY_CONSOLE=y
# CONFIG_DUMMY_IRQ is not set
CONFIG_DUMMY=m
CONFIG_DVB_AS102=m
-CONFIG_DVB_AV7110=m
-CONFIG_DVB_AV7110_OSD=y
+# CONFIG_DVB_AV7110 is not set
CONFIG_DVB_B2C2_FLEXCOP=m
# CONFIG_DVB_B2C2_FLEXCOP_PCI_DEBUG is not set
CONFIG_DVB_B2C2_FLEXCOP_PCI=m
@@ -1926,7 +1925,7 @@ CONFIG_DVB_BUDGET_AV=m
CONFIG_DVB_BUDGET_CI=m
CONFIG_DVB_BUDGET_CORE=m
CONFIG_DVB_BUDGET=m
-CONFIG_DVB_BUDGET_PATCH=m
+# CONFIG_DVB_BUDGET_PATCH is not set
CONFIG_DVB_CORE=m
CONFIG_DVB_CXD2099=m
CONFIG_DVB_DDBRIDGE=m
diff --git a/kernel-armv7hl-lpae-debug-fedora.config b/kernel-armv7hl-lpae-debug-fedora.config
index 59b6deba4..8799ed432 100644
--- a/kernel-armv7hl-lpae-debug-fedora.config
+++ b/kernel-armv7hl-lpae-debug-fedora.config
@@ -1876,8 +1876,7 @@ CONFIG_DUMMY_CONSOLE=y
# CONFIG_DUMMY_IRQ is not set
CONFIG_DUMMY=m
CONFIG_DVB_AS102=m
-CONFIG_DVB_AV7110=m
-CONFIG_DVB_AV7110_OSD=y
+# CONFIG_DVB_AV7110 is not set
CONFIG_DVB_B2C2_FLEXCOP=m
# CONFIG_DVB_B2C2_FLEXCOP_PCI_DEBUG is not set
CONFIG_DVB_B2C2_FLEXCOP_PCI=m
@@ -1888,7 +1887,7 @@ CONFIG_DVB_BUDGET_AV=m
CONFIG_DVB_BUDGET_CI=m
CONFIG_DVB_BUDGET_CORE=m
CONFIG_DVB_BUDGET=m
-CONFIG_DVB_BUDGET_PATCH=m
+# CONFIG_DVB_BUDGET_PATCH is not set
CONFIG_DVB_CORE=m
CONFIG_DVB_CXD2099=m
CONFIG_DVB_DDBRIDGE=m
diff --git a/kernel-armv7hl-lpae-fedora.config b/kernel-armv7hl-lpae-fedora.config
index aa29aa5f4..e37491aa3 100644
--- a/kernel-armv7hl-lpae-fedora.config
+++ b/kernel-armv7hl-lpae-fedora.config
@@ -1869,8 +1869,7 @@ CONFIG_DUMMY_CONSOLE=y
# CONFIG_DUMMY_IRQ is not set
CONFIG_DUMMY=m
CONFIG_DVB_AS102=m
-CONFIG_DVB_AV7110=m
-CONFIG_DVB_AV7110_OSD=y
+# CONFIG_DVB_AV7110 is not set
CONFIG_DVB_B2C2_FLEXCOP=m
# CONFIG_DVB_B2C2_FLEXCOP_PCI_DEBUG is not set
CONFIG_DVB_B2C2_FLEXCOP_PCI=m
@@ -1881,7 +1880,7 @@ CONFIG_DVB_BUDGET_AV=m
CONFIG_DVB_BUDGET_CI=m
CONFIG_DVB_BUDGET_CORE=m
CONFIG_DVB_BUDGET=m
-CONFIG_DVB_BUDGET_PATCH=m
+# CONFIG_DVB_BUDGET_PATCH is not set
CONFIG_DVB_CORE=m
CONFIG_DVB_CXD2099=m
CONFIG_DVB_DDBRIDGE=m
diff --git a/kernel-i686-debug-fedora.config b/kernel-i686-debug-fedora.config
index a2b662b90..0274278b6 100644
--- a/kernel-i686-debug-fedora.config
+++ b/kernel-i686-debug-fedora.config
@@ -1558,8 +1558,7 @@ CONFIG_DUMMY_CONSOLE=y
# CONFIG_DUMMY_IRQ is not set
CONFIG_DUMMY=m
CONFIG_DVB_AS102=m
-CONFIG_DVB_AV7110=m
-CONFIG_DVB_AV7110_OSD=y
+# CONFIG_DVB_AV7110 is not set
CONFIG_DVB_B2C2_FLEXCOP=m
# CONFIG_DVB_B2C2_FLEXCOP_PCI_DEBUG is not set
CONFIG_DVB_B2C2_FLEXCOP_PCI=m
@@ -1570,7 +1569,7 @@ CONFIG_DVB_BUDGET_AV=m
CONFIG_DVB_BUDGET_CI=m
CONFIG_DVB_BUDGET_CORE=m
CONFIG_DVB_BUDGET=m
-CONFIG_DVB_BUDGET_PATCH=m
+# CONFIG_DVB_BUDGET_PATCH is not set
CONFIG_DVB_CORE=m
CONFIG_DVB_CXD2099=m
CONFIG_DVB_DDBRIDGE=m
diff --git a/kernel-i686-fedora.config b/kernel-i686-fedora.config
index f5c509fc2..1a2483fad 100644
--- a/kernel-i686-fedora.config
+++ b/kernel-i686-fedora.config
@@ -1549,8 +1549,7 @@ CONFIG_DUMMY_CONSOLE=y
# CONFIG_DUMMY_IRQ is not set
CONFIG_DUMMY=m
CONFIG_DVB_AS102=m
-CONFIG_DVB_AV7110=m
-CONFIG_DVB_AV7110_OSD=y
+# CONFIG_DVB_AV7110 is not set
CONFIG_DVB_B2C2_FLEXCOP=m
# CONFIG_DVB_B2C2_FLEXCOP_PCI_DEBUG is not set
CONFIG_DVB_B2C2_FLEXCOP_PCI=m
@@ -1561,7 +1560,7 @@ CONFIG_DVB_BUDGET_AV=m
CONFIG_DVB_BUDGET_CI=m
CONFIG_DVB_BUDGET_CORE=m
CONFIG_DVB_BUDGET=m
-CONFIG_DVB_BUDGET_PATCH=m
+# CONFIG_DVB_BUDGET_PATCH is not set
CONFIG_DVB_CORE=m
CONFIG_DVB_CXD2099=m
CONFIG_DVB_DDBRIDGE=m
diff --git a/kernel-ppc64le-debug-fedora.config b/kernel-ppc64le-debug-fedora.config
index 364790b7a..aa9612b28 100644
--- a/kernel-ppc64le-debug-fedora.config
+++ b/kernel-ppc64le-debug-fedora.config
@@ -1473,8 +1473,7 @@ CONFIG_DUMMY_CONSOLE=y
# CONFIG_DUMMY_IRQ is not set
CONFIG_DUMMY=m
CONFIG_DVB_AS102=m
-CONFIG_DVB_AV7110=m
-CONFIG_DVB_AV7110_OSD=y
+# CONFIG_DVB_AV7110 is not set
CONFIG_DVB_B2C2_FLEXCOP=m
# CONFIG_DVB_B2C2_FLEXCOP_PCI_DEBUG is not set
CONFIG_DVB_B2C2_FLEXCOP_PCI=m
@@ -1485,7 +1484,7 @@ CONFIG_DVB_BUDGET_AV=m
CONFIG_DVB_BUDGET_CI=m
CONFIG_DVB_BUDGET_CORE=m
CONFIG_DVB_BUDGET=m
-CONFIG_DVB_BUDGET_PATCH=m
+# CONFIG_DVB_BUDGET_PATCH is not set
CONFIG_DVB_CORE=m
CONFIG_DVB_CXD2099=m
CONFIG_DVB_DDBRIDGE=m
diff --git a/kernel-ppc64le-debug-rhel.config b/kernel-ppc64le-debug-rhel.config
index ab00a0807..4fffbe648 100644
--- a/kernel-ppc64le-debug-rhel.config
+++ b/kernel-ppc64le-debug-rhel.config
@@ -394,7 +394,7 @@ CONFIG_BLK_DEV_SR_VENDOR=y
CONFIG_BLK_DEV_THROTTLING=y
# CONFIG_BLK_DEV_UMEM is not set
CONFIG_BLK_DEV=y
-# CONFIG_BLK_DEV_ZONED is not set
+CONFIG_BLK_DEV_ZONED=y
# CONFIG_BLK_INLINE_ENCRYPTION is not set
# CONFIG_BLK_SED_OPAL is not set
CONFIG_BLK_WBT_MQ=y
@@ -1282,9 +1282,7 @@ CONFIG_DUMMY_CONSOLE=y
# CONFIG_DUMMY_IRQ is not set
CONFIG_DUMMY=m
# CONFIG_DVB_AS102 is not set
-CONFIG_DVB_AV7110_IR=y
-CONFIG_DVB_AV7110=m
-CONFIG_DVB_AV7110_OSD=y
+# CONFIG_DVB_AV7110 is not set
CONFIG_DVB_B2C2_FLEXCOP=m
# CONFIG_DVB_B2C2_FLEXCOP_PCI_DEBUG is not set
CONFIG_DVB_B2C2_FLEXCOP_PCI=m
@@ -1295,7 +1293,7 @@ CONFIG_DVB_BUDGET_AV=m
CONFIG_DVB_BUDGET_CI=m
CONFIG_DVB_BUDGET_CORE=m
CONFIG_DVB_BUDGET=m
-CONFIG_DVB_BUDGET_PATCH=m
+# CONFIG_DVB_BUDGET_PATCH is not set
CONFIG_DVB_CORE=m
CONFIG_DVB_CX24117=m
CONFIG_DVB_CX24120=m
@@ -6502,6 +6500,7 @@ CONFIG_ZLIB_DEFLATE=y
CONFIG_ZLIB_DFLTCC=y
CONFIG_ZLIB_INFLATE=y
CONFIG_ZONE_DEVICE=y
+# CONFIG_ZONEFS_FS is not set
# CONFIG_ZOPT2201 is not set
# CONFIG_ZPA2326 is not set
CONFIG_ZPOOL=y
diff --git a/kernel-ppc64le-fedora.config b/kernel-ppc64le-fedora.config
index eae87d454..c15fbc9c9 100644
--- a/kernel-ppc64le-fedora.config
+++ b/kernel-ppc64le-fedora.config
@@ -1464,8 +1464,7 @@ CONFIG_DUMMY_CONSOLE=y
# CONFIG_DUMMY_IRQ is not set
CONFIG_DUMMY=m
CONFIG_DVB_AS102=m
-CONFIG_DVB_AV7110=m
-CONFIG_DVB_AV7110_OSD=y
+# CONFIG_DVB_AV7110 is not set
CONFIG_DVB_B2C2_FLEXCOP=m
# CONFIG_DVB_B2C2_FLEXCOP_PCI_DEBUG is not set
CONFIG_DVB_B2C2_FLEXCOP_PCI=m
@@ -1476,7 +1475,7 @@ CONFIG_DVB_BUDGET_AV=m
CONFIG_DVB_BUDGET_CI=m
CONFIG_DVB_BUDGET_CORE=m
CONFIG_DVB_BUDGET=m
-CONFIG_DVB_BUDGET_PATCH=m
+# CONFIG_DVB_BUDGET_PATCH is not set
CONFIG_DVB_CORE=m
CONFIG_DVB_CXD2099=m
CONFIG_DVB_DDBRIDGE=m
diff --git a/kernel-ppc64le-rhel.config b/kernel-ppc64le-rhel.config
index fe6dc8cb7..c18e243d2 100644
--- a/kernel-ppc64le-rhel.config
+++ b/kernel-ppc64le-rhel.config
@@ -394,7 +394,7 @@ CONFIG_BLK_DEV_SR_VENDOR=y
CONFIG_BLK_DEV_THROTTLING=y
# CONFIG_BLK_DEV_UMEM is not set
CONFIG_BLK_DEV=y
-# CONFIG_BLK_DEV_ZONED is not set
+CONFIG_BLK_DEV_ZONED=y
# CONFIG_BLK_INLINE_ENCRYPTION is not set
# CONFIG_BLK_SED_OPAL is not set
CONFIG_BLK_WBT_MQ=y
@@ -1274,9 +1274,7 @@ CONFIG_DUMMY_CONSOLE=y
# CONFIG_DUMMY_IRQ is not set
CONFIG_DUMMY=m
# CONFIG_DVB_AS102 is not set
-CONFIG_DVB_AV7110_IR=y
-CONFIG_DVB_AV7110=m
-CONFIG_DVB_AV7110_OSD=y
+# CONFIG_DVB_AV7110 is not set
CONFIG_DVB_B2C2_FLEXCOP=m
# CONFIG_DVB_B2C2_FLEXCOP_PCI_DEBUG is not set
CONFIG_DVB_B2C2_FLEXCOP_PCI=m
@@ -1287,7 +1285,7 @@ CONFIG_DVB_BUDGET_AV=m
CONFIG_DVB_BUDGET_CI=m
CONFIG_DVB_BUDGET_CORE=m
CONFIG_DVB_BUDGET=m
-CONFIG_DVB_BUDGET_PATCH=m
+# CONFIG_DVB_BUDGET_PATCH is not set
CONFIG_DVB_CORE=m
CONFIG_DVB_CX24117=m
CONFIG_DVB_CX24120=m
@@ -6483,6 +6481,7 @@ CONFIG_ZLIB_DEFLATE=y
CONFIG_ZLIB_DFLTCC=y
CONFIG_ZLIB_INFLATE=y
CONFIG_ZONE_DEVICE=y
+# CONFIG_ZONEFS_FS is not set
# CONFIG_ZOPT2201 is not set
# CONFIG_ZPA2326 is not set
CONFIG_ZPOOL=y
diff --git a/kernel-s390x-debug-fedora.config b/kernel-s390x-debug-fedora.config
index 2b413d33e..ba565df04 100644
--- a/kernel-s390x-debug-fedora.config
+++ b/kernel-s390x-debug-fedora.config
@@ -1480,8 +1480,7 @@ CONFIG_DUMMY_CONSOLE=y
# CONFIG_DUMMY_IRQ is not set
CONFIG_DUMMY=m
CONFIG_DVB_AS102=m
-CONFIG_DVB_AV7110=m
-CONFIG_DVB_AV7110_OSD=y
+# CONFIG_DVB_AV7110 is not set
CONFIG_DVB_B2C2_FLEXCOP=m
# CONFIG_DVB_B2C2_FLEXCOP_PCI_DEBUG is not set
CONFIG_DVB_B2C2_FLEXCOP_PCI=m
@@ -1492,7 +1491,7 @@ CONFIG_DVB_BUDGET_AV=m
CONFIG_DVB_BUDGET_CI=m
CONFIG_DVB_BUDGET_CORE=m
CONFIG_DVB_BUDGET=m
-CONFIG_DVB_BUDGET_PATCH=m
+# CONFIG_DVB_BUDGET_PATCH is not set
CONFIG_DVB_CORE=m
CONFIG_DVB_CXD2099=m
CONFIG_DVB_DDBRIDGE=m
diff --git a/kernel-s390x-debug-rhel.config b/kernel-s390x-debug-rhel.config
index 3b71e2835..13b262b00 100644
--- a/kernel-s390x-debug-rhel.config
+++ b/kernel-s390x-debug-rhel.config
@@ -395,7 +395,7 @@ CONFIG_BLK_DEV_THROTTLING=y
# CONFIG_BLK_DEV_UMEM is not set
# CONFIG_BLK_DEV_XPRAM is not set
CONFIG_BLK_DEV=y
-# CONFIG_BLK_DEV_ZONED is not set
+CONFIG_BLK_DEV_ZONED=y
# CONFIG_BLK_INLINE_ENCRYPTION is not set
# CONFIG_BLK_SED_OPAL is not set
CONFIG_BLK_WBT_MQ=y
@@ -1286,9 +1286,7 @@ CONFIG_DUMMY_CONSOLE=y
# CONFIG_DUMMY_IRQ is not set
CONFIG_DUMMY=m
# CONFIG_DVB_AS102 is not set
-CONFIG_DVB_AV7110_IR=y
-CONFIG_DVB_AV7110=m
-CONFIG_DVB_AV7110_OSD=y
+# CONFIG_DVB_AV7110 is not set
CONFIG_DVB_B2C2_FLEXCOP=m
# CONFIG_DVB_B2C2_FLEXCOP_PCI_DEBUG is not set
CONFIG_DVB_B2C2_FLEXCOP_PCI=m
@@ -1299,7 +1297,7 @@ CONFIG_DVB_BUDGET_AV=m
CONFIG_DVB_BUDGET_CI=m
CONFIG_DVB_BUDGET_CORE=m
CONFIG_DVB_BUDGET=m
-CONFIG_DVB_BUDGET_PATCH=m
+# CONFIG_DVB_BUDGET_PATCH is not set
CONFIG_DVB_CORE=m
CONFIG_DVB_CX24117=m
CONFIG_DVB_CX24120=m
@@ -6463,6 +6461,7 @@ CONFIG_ZLIB_DEFLATE=y
CONFIG_ZLIB_DFLTCC=y
CONFIG_ZLIB_INFLATE=y
CONFIG_ZONE_DEVICE=y
+# CONFIG_ZONEFS_FS is not set
# CONFIG_ZOPT2201 is not set
# CONFIG_ZPA2326 is not set
# CONFIG_ZPOOL is not set
diff --git a/kernel-s390x-fedora.config b/kernel-s390x-fedora.config
index b6cab9761..bda1931d4 100644
--- a/kernel-s390x-fedora.config
+++ b/kernel-s390x-fedora.config
@@ -1471,8 +1471,7 @@ CONFIG_DUMMY_CONSOLE=y
# CONFIG_DUMMY_IRQ is not set
CONFIG_DUMMY=m
CONFIG_DVB_AS102=m
-CONFIG_DVB_AV7110=m
-CONFIG_DVB_AV7110_OSD=y
+# CONFIG_DVB_AV7110 is not set
CONFIG_DVB_B2C2_FLEXCOP=m
# CONFIG_DVB_B2C2_FLEXCOP_PCI_DEBUG is not set
CONFIG_DVB_B2C2_FLEXCOP_PCI=m
@@ -1483,7 +1482,7 @@ CONFIG_DVB_BUDGET_AV=m
CONFIG_DVB_BUDGET_CI=m
CONFIG_DVB_BUDGET_CORE=m
CONFIG_DVB_BUDGET=m
-CONFIG_DVB_BUDGET_PATCH=m
+# CONFIG_DVB_BUDGET_PATCH is not set
CONFIG_DVB_CORE=m
CONFIG_DVB_CXD2099=m
CONFIG_DVB_DDBRIDGE=m
diff --git a/kernel-s390x-rhel.config b/kernel-s390x-rhel.config
index b4b612196..8821134e7 100644
--- a/kernel-s390x-rhel.config
+++ b/kernel-s390x-rhel.config
@@ -395,7 +395,7 @@ CONFIG_BLK_DEV_THROTTLING=y
# CONFIG_BLK_DEV_UMEM is not set
# CONFIG_BLK_DEV_XPRAM is not set
CONFIG_BLK_DEV=y
-# CONFIG_BLK_DEV_ZONED is not set
+CONFIG_BLK_DEV_ZONED=y
# CONFIG_BLK_INLINE_ENCRYPTION is not set
# CONFIG_BLK_SED_OPAL is not set
CONFIG_BLK_WBT_MQ=y
@@ -1278,9 +1278,7 @@ CONFIG_DUMMY_CONSOLE=y
# CONFIG_DUMMY_IRQ is not set
CONFIG_DUMMY=m
# CONFIG_DVB_AS102 is not set
-CONFIG_DVB_AV7110_IR=y
-CONFIG_DVB_AV7110=m
-CONFIG_DVB_AV7110_OSD=y
+# CONFIG_DVB_AV7110 is not set
CONFIG_DVB_B2C2_FLEXCOP=m
# CONFIG_DVB_B2C2_FLEXCOP_PCI_DEBUG is not set
CONFIG_DVB_B2C2_FLEXCOP_PCI=m
@@ -1291,7 +1289,7 @@ CONFIG_DVB_BUDGET_AV=m
CONFIG_DVB_BUDGET_CI=m
CONFIG_DVB_BUDGET_CORE=m
CONFIG_DVB_BUDGET=m
-CONFIG_DVB_BUDGET_PATCH=m
+# CONFIG_DVB_BUDGET_PATCH is not set
CONFIG_DVB_CORE=m
CONFIG_DVB_CX24117=m
CONFIG_DVB_CX24120=m
@@ -6444,6 +6442,7 @@ CONFIG_ZLIB_DEFLATE=y
CONFIG_ZLIB_DFLTCC=y
CONFIG_ZLIB_INFLATE=y
CONFIG_ZONE_DEVICE=y
+# CONFIG_ZONEFS_FS is not set
# CONFIG_ZOPT2201 is not set
# CONFIG_ZPA2326 is not set
# CONFIG_ZPOOL is not set
diff --git a/kernel-s390x-zfcpdump-rhel.config b/kernel-s390x-zfcpdump-rhel.config
index b383c0e15..2927eec63 100644
--- a/kernel-s390x-zfcpdump-rhel.config
+++ b/kernel-s390x-zfcpdump-rhel.config
@@ -399,7 +399,7 @@ CONFIG_BLK_DEV_THROTTLING=y
# CONFIG_BLK_DEV_UMEM is not set
# CONFIG_BLK_DEV_XPRAM is not set
CONFIG_BLK_DEV=y
-# CONFIG_BLK_DEV_ZONED is not set
+CONFIG_BLK_DEV_ZONED=y
# CONFIG_BLK_INLINE_ENCRYPTION is not set
# CONFIG_BLK_SED_OPAL is not set
CONFIG_BLK_WBT_MQ=y
@@ -1287,9 +1287,7 @@ CONFIG_DUMMY_CONSOLE=y
# CONFIG_DUMMY_IRQ is not set
# CONFIG_DUMMY is not set
# CONFIG_DVB_AS102 is not set
-CONFIG_DVB_AV7110_IR=y
-CONFIG_DVB_AV7110=m
-CONFIG_DVB_AV7110_OSD=y
+# CONFIG_DVB_AV7110 is not set
CONFIG_DVB_B2C2_FLEXCOP=m
# CONFIG_DVB_B2C2_FLEXCOP_PCI_DEBUG is not set
CONFIG_DVB_B2C2_FLEXCOP_PCI=m
@@ -1300,7 +1298,7 @@ CONFIG_DVB_BUDGET_AV=m
CONFIG_DVB_BUDGET_CI=m
CONFIG_DVB_BUDGET_CORE=m
CONFIG_DVB_BUDGET=m
-CONFIG_DVB_BUDGET_PATCH=m
+# CONFIG_DVB_BUDGET_PATCH is not set
CONFIG_DVB_CORE=m
CONFIG_DVB_CX24117=m
CONFIG_DVB_CX24120=m
@@ -6479,6 +6477,7 @@ CONFIG_ZLIB_DEFLATE=y
CONFIG_ZLIB_DFLTCC=y
CONFIG_ZLIB_INFLATE=y
CONFIG_ZONE_DEVICE=y
+# CONFIG_ZONEFS_FS is not set
# CONFIG_ZOPT2201 is not set
# CONFIG_ZPA2326 is not set
# CONFIG_ZPOOL is not set
diff --git a/kernel-x86_64-debug-fedora.config b/kernel-x86_64-debug-fedora.config
index 5159eee2e..9b8192958 100644
--- a/kernel-x86_64-debug-fedora.config
+++ b/kernel-x86_64-debug-fedora.config
@@ -1600,8 +1600,7 @@ CONFIG_DUMMY_CONSOLE=y
# CONFIG_DUMMY_IRQ is not set
CONFIG_DUMMY=m
CONFIG_DVB_AS102=m
-CONFIG_DVB_AV7110=m
-CONFIG_DVB_AV7110_OSD=y
+# CONFIG_DVB_AV7110 is not set
CONFIG_DVB_B2C2_FLEXCOP=m
# CONFIG_DVB_B2C2_FLEXCOP_PCI_DEBUG is not set
CONFIG_DVB_B2C2_FLEXCOP_PCI=m
@@ -1612,7 +1611,7 @@ CONFIG_DVB_BUDGET_AV=m
CONFIG_DVB_BUDGET_CI=m
CONFIG_DVB_BUDGET_CORE=m
CONFIG_DVB_BUDGET=m
-CONFIG_DVB_BUDGET_PATCH=m
+# CONFIG_DVB_BUDGET_PATCH is not set
CONFIG_DVB_CORE=m
CONFIG_DVB_CXD2099=m
CONFIG_DVB_DDBRIDGE=m
diff --git a/kernel-x86_64-debug-rhel.config b/kernel-x86_64-debug-rhel.config
index 5d4580baf..234e1f054 100644
--- a/kernel-x86_64-debug-rhel.config
+++ b/kernel-x86_64-debug-rhel.config
@@ -422,7 +422,7 @@ CONFIG_BLK_DEV_SR_VENDOR=y
CONFIG_BLK_DEV_THROTTLING=y
# CONFIG_BLK_DEV_UMEM is not set
CONFIG_BLK_DEV=y
-# CONFIG_BLK_DEV_ZONED is not set
+CONFIG_BLK_DEV_ZONED=y
# CONFIG_BLK_INLINE_ENCRYPTION is not set
# CONFIG_BLK_SED_OPAL is not set
CONFIG_BLK_WBT_MQ=y
@@ -1369,9 +1369,7 @@ CONFIG_DUMMY_CONSOLE=y
# CONFIG_DUMMY_IRQ is not set
CONFIG_DUMMY=m
# CONFIG_DVB_AS102 is not set
-CONFIG_DVB_AV7110_IR=y
-CONFIG_DVB_AV7110=m
-CONFIG_DVB_AV7110_OSD=y
+# CONFIG_DVB_AV7110 is not set
CONFIG_DVB_B2C2_FLEXCOP=m
# CONFIG_DVB_B2C2_FLEXCOP_PCI_DEBUG is not set
CONFIG_DVB_B2C2_FLEXCOP_PCI=m
@@ -1382,7 +1380,7 @@ CONFIG_DVB_BUDGET_AV=m
CONFIG_DVB_BUDGET_CI=m
CONFIG_DVB_BUDGET_CORE=m
CONFIG_DVB_BUDGET=m
-CONFIG_DVB_BUDGET_PATCH=m
+# CONFIG_DVB_BUDGET_PATCH is not set
CONFIG_DVB_CORE=m
CONFIG_DVB_CX24117=m
CONFIG_DVB_CX24120=m
@@ -6830,6 +6828,7 @@ CONFIG_ZLIB_DEFLATE=y
CONFIG_ZLIB_DFLTCC=y
CONFIG_ZLIB_INFLATE=y
CONFIG_ZONE_DEVICE=y
+# CONFIG_ZONEFS_FS is not set
# CONFIG_ZOPT2201 is not set
# CONFIG_ZPA2326 is not set
CONFIG_ZPOOL=y
diff --git a/kernel-x86_64-fedora.config b/kernel-x86_64-fedora.config
index 42bc69c25..eec92e7c5 100644
--- a/kernel-x86_64-fedora.config
+++ b/kernel-x86_64-fedora.config
@@ -1591,8 +1591,7 @@ CONFIG_DUMMY_CONSOLE=y
# CONFIG_DUMMY_IRQ is not set
CONFIG_DUMMY=m
CONFIG_DVB_AS102=m
-CONFIG_DVB_AV7110=m
-CONFIG_DVB_AV7110_OSD=y
+# CONFIG_DVB_AV7110 is not set
CONFIG_DVB_B2C2_FLEXCOP=m
# CONFIG_DVB_B2C2_FLEXCOP_PCI_DEBUG is not set
CONFIG_DVB_B2C2_FLEXCOP_PCI=m
@@ -1603,7 +1602,7 @@ CONFIG_DVB_BUDGET_AV=m
CONFIG_DVB_BUDGET_CI=m
CONFIG_DVB_BUDGET_CORE=m
CONFIG_DVB_BUDGET=m
-CONFIG_DVB_BUDGET_PATCH=m
+# CONFIG_DVB_BUDGET_PATCH is not set
CONFIG_DVB_CORE=m
CONFIG_DVB_CXD2099=m
CONFIG_DVB_DDBRIDGE=m
diff --git a/kernel-x86_64-rhel.config b/kernel-x86_64-rhel.config
index 76dcd3aa6..862ae0361 100644
--- a/kernel-x86_64-rhel.config
+++ b/kernel-x86_64-rhel.config
@@ -422,7 +422,7 @@ CONFIG_BLK_DEV_SR_VENDOR=y
CONFIG_BLK_DEV_THROTTLING=y
# CONFIG_BLK_DEV_UMEM is not set
CONFIG_BLK_DEV=y
-# CONFIG_BLK_DEV_ZONED is not set
+CONFIG_BLK_DEV_ZONED=y
# CONFIG_BLK_INLINE_ENCRYPTION is not set
# CONFIG_BLK_SED_OPAL is not set
CONFIG_BLK_WBT_MQ=y
@@ -1361,9 +1361,7 @@ CONFIG_DUMMY_CONSOLE=y
# CONFIG_DUMMY_IRQ is not set
CONFIG_DUMMY=m
# CONFIG_DVB_AS102 is not set
-CONFIG_DVB_AV7110_IR=y
-CONFIG_DVB_AV7110=m
-CONFIG_DVB_AV7110_OSD=y
+# CONFIG_DVB_AV7110 is not set
CONFIG_DVB_B2C2_FLEXCOP=m
# CONFIG_DVB_B2C2_FLEXCOP_PCI_DEBUG is not set
CONFIG_DVB_B2C2_FLEXCOP_PCI=m
@@ -1374,7 +1372,7 @@ CONFIG_DVB_BUDGET_AV=m
CONFIG_DVB_BUDGET_CI=m
CONFIG_DVB_BUDGET_CORE=m
CONFIG_DVB_BUDGET=m
-CONFIG_DVB_BUDGET_PATCH=m
+# CONFIG_DVB_BUDGET_PATCH is not set
CONFIG_DVB_CORE=m
CONFIG_DVB_CX24117=m
CONFIG_DVB_CX24120=m
@@ -6808,6 +6806,7 @@ CONFIG_ZLIB_DEFLATE=y
CONFIG_ZLIB_DFLTCC=y
CONFIG_ZLIB_INFLATE=y
CONFIG_ZONE_DEVICE=y
+# CONFIG_ZONEFS_FS is not set
# CONFIG_ZOPT2201 is not set
# CONFIG_ZPA2326 is not set
CONFIG_ZPOOL=y
diff --git a/kernel.spec b/kernel.spec
index 4dfdebac0..3d3684635 100755
--- a/kernel.spec
+++ b/kernel.spec
@@ -13,6 +13,13 @@
%global toolchain clang
%endif
+# Compile the kernel with LTO (only supported when building with clang).
+%bcond_with clang_lto
+
+%if %{with clang_lto} && %{without toolchain_clang}
+{error:clang_lto requires --with toolchain_clang}
+%endif
+
# Cross compile on copr for arm
# See https://bugzilla.redhat.com/1879599
%if 0%{?_with_cross_arm:1}
@@ -71,9 +78,9 @@ Summary: The Linux kernel
# Set debugbuildsenabled to 0 to not build a separate debug kernel, but
# to build the base kernel using the debug configuration. (Specifying
# the --with-release option overrides this setting.)
-%define debugbuildsenabled 1
+%define debugbuildsenabled 0
-%global distro_build 0.rc2.23
+%global distro_build 0.rc2.20210721git8cae8cd89f05.24
%if 0%{?fedora}
%define secure_boot_arch x86_64
@@ -117,13 +124,13 @@ Summary: The Linux kernel
%define kversion 5.14
%define rpmversion 5.14.0
-%define pkgrelease 0.rc2.23
+%define pkgrelease 0.rc2.20210721git8cae8cd89f05.24
# This is needed to do merge window version magic
%define patchlevel 14
# allow pkg_release to have configurable %%{?dist} tag
-%define specrelease 0.rc2.23%{?buildid}%{?dist}
+%define specrelease 0.rc2.20210721git8cae8cd89f05.24%{?buildid}%{?dist}
%define pkg_release %{specrelease}
@@ -234,7 +241,11 @@ Summary: The Linux kernel
%endif
%if %{with toolchain_clang}
-%global make_opts %{make_opts} HOSTCC=clang CC=clang
+%global clang_make_opts HOSTCC=clang CC=clang
+%if %{with clang_lto}
+%global clang_make_opts %{clang_make_opts} LD=ld.lld HOSTLD=ld.lld AR=llvm-ar NM=llvm-nm HOSTAR=llvm-ar HOSTNM=llvm-nm LLVM_IAS=1
+%endif
+%global make_opts %{make_opts} %{clang_make_opts}
# clang does not support the -fdump-ipa-clones option
%global with_ipaclones 0
%endif
@@ -649,13 +660,18 @@ BuildRequires: asciidoc
BuildRequires: clang
%endif
+%if %{with clang_lto}
+BuildRequires: llvm
+BuildRequires: lld
+%endif
+
# Because this is the kernel, it's hard to get a single upstream URL
# to represent the base without needing to do a bunch of patching. This
# tarball is generated from a src-git tree. If you want to see the
# exact git commit you can run
#
# xzcat -qq ${TARBALL} | git get-tar-commit-id
-Source0: linux-5.14-rc2.tar.xz
+Source0: linux-5.14-rc2-1-g8cae8cd89f05.tar.xz
Source1: Makefile.rhelver
@@ -1340,8 +1356,8 @@ ApplyOptionalPatch()
fi
}
-%setup -q -n kernel-5.14-rc2 -c
-mv linux-5.14-rc2 linux-%{KVERREL}
+%setup -q -n kernel-5.14-rc2-1-g8cae8cd89f05 -c
+mv linux-5.14-rc2-1-g8cae8cd89f05 linux-%{KVERREL}
cd linux-%{KVERREL}
cp -a %{SOURCE1} .
@@ -1417,6 +1433,13 @@ do
done
%endif
+%if %{with clang_lto}
+for i in *aarch64*.config *x86_64*.config; do
+ sed -i 's/# CONFIG_LTO_CLANG_THIN is not set/CONFIG_LTO_CLANG_THIN=y/' $i
+ sed -i 's/CONFIG_LTO_NONE=y/# CONFIG_LTO_NONE is not set/' $i
+done
+%endif
+
# Add DUP and kpatch certificates to system trusted keys for RHEL
%if 0%{?rhel}
%if %{signkernel}%{signmodules}
@@ -1438,6 +1461,11 @@ OPTS=""
%if %{with_configchecks}
OPTS="$OPTS -w -n -c"
%endif
+%if %{with clang_lto}
+for opt in %{clang_make_opts}; do
+ OPTS="$OPTS -m $opt"
+done
+%endif
./process_configs.sh $OPTS kernel %{rpmversion}
cp %{SOURCE56} .
@@ -2922,6 +2950,16 @@ fi
#
#
%changelog
+* Wed Jul 21 2021 Fedora Kernel Team <kernel-team@fedoraproject.org> [5.14.0-0.rc2.20210721git8cae8cd89f05.24]
+- redhat/configs: Add CONFIG_INTEL_PMT_CRASHLOG (Michael Petlan) [1880486]
+- redhat/configs: Add CONFIG_INTEL_PMT_TELEMETRY (Michael Petlan) [1880486]
+- redhat/configs: Add CONFIG_MFD_INTEL_PMT (Michael Petlan) [1880486]
+- redhat/configs: enable CONFIG_BLK_DEV_ZONED (Ming Lei) [1638087]
+- Add --with clang_lto option to build the kernel with Link Time Optimizations (Tom Stellard)
+- common: disable DVB_AV7110 and associated pieces (Peter Robinson)
+- Fix fedora-only config updates (Don Zickus)
+- Fedor config update for new option (Justin M. Forbes)
+
* Mon Jul 19 2021 Fedora Kernel Team <kernel-team@fedoraproject.org> [5.14.0-0.rc1.20210719git1d67c8d993ba.22]
- Revert "scsi: smartpqi: add inspur advantech ids" (Herton R. Krzesinski)
- redhat/configs: Enable stmmac NIC for x86_64 (Mark Salter)
diff --git a/process_configs.sh b/process_configs.sh
index b1e1f4338..1709e6dc3 100755
--- a/process_configs.sh
+++ b/process_configs.sh
@@ -31,6 +31,16 @@ die()
exit 1
}
+get_cross_compile()
+{
+ arch=$1
+ if [[ "$CC_IS_CLANG" -eq 1 ]]; then
+ echo "$arch"
+ else
+ echo "scripts/dummy-tools/"
+ fi
+}
+
# stupid function to find top of tree to do kernel make configs
switch_to_toplevel()
{
@@ -193,11 +203,11 @@ function commit_new_configs()
fi
echo -n "Checking for new configs in $cfg ... "
- make ARCH="$arch" CROSS_COMPILE=scripts/dummy-tools/ KCONFIG_CONFIG="$cfgorig" listnewconfig >& .listnewconfig
+ make ${MAKEOPTS} ARCH="$arch" CROSS_COMPILE=$(get_cross_compile $arch) KCONFIG_CONFIG="$cfgorig" listnewconfig >& .listnewconfig
grep -E 'CONFIG_' .listnewconfig > .newoptions
if test -s .newoptions
then
- make ARCH="$arch" CROSS_COMPILE=scripts/dummy-tools/ KCONFIG_CONFIG="$cfgorig" helpnewconfig >& .helpnewconfig
+ make ${MAKEOPTS} ARCH="$arch" CROSS_COMPILE=$(get_cross_compile $arch) KCONFIG_CONFIG="$cfgorig" helpnewconfig >& .helpnewconfig
parsenewconfigs
fi
rm .newoptions
@@ -227,7 +237,7 @@ function process_configs()
fi
echo -n "Processing $cfg ... "
- make ARCH="$arch" CROSS_COMPILE=scripts/dummy-tools/ KCONFIG_CONFIG="$cfgorig" listnewconfig >& .listnewconfig
+ make ${MAKEOPTS} ARCH="$arch" CROSS_COMPILE=$(get_cross_compile $arch) KCONFIG_CONFIG="$cfgorig" listnewconfig >& .listnewconfig
grep -E 'CONFIG_' .listnewconfig > .newoptions
if test -n "$NEWOPTIONS" && test -s .newoptions
then
@@ -252,7 +262,7 @@ function process_configs()
rm .listnewconfig
- make ARCH="$arch" CROSS_COMPILE=scripts/dummy-tools/ KCONFIG_CONFIG="$cfgorig" olddefconfig > /dev/null || exit 1
+ make ${MAKEOPTS} ARCH="$arch" CROSS_COMPILE=$(get_cross_compile $arch) KCONFIG_CONFIG="$cfgorig" olddefconfig > /dev/null || exit 1
echo "# $arch" > "$cfgtmp"
cat "$cfgorig" >> "$cfgtmp"
if test -n "$CHECKOPTIONS"
@@ -280,6 +290,8 @@ CONTINUEONERROR=""
NEWOPTIONS=""
TESTRUN=""
CHECKWARNINGS=""
+MAKEOPTS=""
+CC_IS_CLANG=0
RETURNCODE=0
@@ -314,6 +326,13 @@ do
-z)
COMMITNEWCONFIGS="x"
;;
+ -m)
+ shift
+ if [ "$1" = "CC=clang" -o "$1" = "LLVM=1" ]; then
+ CC_IS_CLANG=1
+ fi
+ MAKEOPTS="$MAKEOPTS $1"
+ ;;
*)
break;;
esac
diff --git a/sources b/sources
index d6a11fa56..fcc15d9b5 100644
--- a/sources
+++ b/sources
@@ -1,4 +1,4 @@
SHA512 (kernel-abi-whitelists-5.14.0-0.rc0.20210707git77d34a4683b0.12.tar.bz2) = 411f2a75d47633c61eb416d270a293d6965cf69b05fdada93480765da88185cea0378820f53b66fd405549374a5094868530f2451d1d2e6eda970afdc2d4bbb8
-SHA512 (linux-5.14-rc2.tar.xz) = eedea34a3b41454d9585779928f4a77850739cfa6d38eaa2004fb3cdb5e81d5ed483e8b71ffe469425a468477201700d1584251a0fc250099dd75da18c721fc5
-SHA512 (kernel-abi-stablelists-5.14.0-0.rc2.23.tar.bz2) = 506fe31ba1e1b44850848d88e144860337d20baac0e04856362320ec0d5dd40c5a7543c5fbb101e8d1d258cd654d4fb13af77b9da70223e3cfd7645e05cdc8ab
-SHA512 (kernel-kabi-dw-5.14.0-0.rc2.23.tar.bz2) = bc9b0cb52145999b407e18a457dfe7c91fe9305b12e03472ab9a4d2bf1b6fe9f1f9c93328a4b052c9744ca3652b97298975d854c23f59e0f98bbb1d35db73dfa
+SHA512 (linux-5.14-rc2-1-g8cae8cd89f05.tar.xz) = 974892a21f5ca8dfd64820dc7791ae15add8ba4dfa9c7974551ac694512435975975e26d5c85e5dc3ecbaf05a6b562639637ccd073163e4d99a0b6b8fac885da
+SHA512 (kernel-abi-stablelists-5.14.0-0.rc2.20210721git8cae8cd89f05.24.tar.bz2) = e8128ee63b21e317b36a57f1c9f9a92efd3a6e5476b3fc0e3ba9b49023c32e24e4bf9581d71e203e955afc1fe16c7c411acfa377de9e1228ee502254d45a3b32
+SHA512 (kernel-kabi-dw-5.14.0-0.rc2.20210721git8cae8cd89f05.24.tar.bz2) = 91d65622db134adee50dde355cf91c2ee5bd62753a6f6c5d5ec853efa643580bf707dd0f5fa9fabbd26026ae970dbc9b8d3f34f9cfaf803700639107a34b5028