summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorThorsten Leemhuis <fedora@leemhuis.info>2022-06-02 07:25:40 +0200
committerThorsten Leemhuis <fedora@leemhuis.info>2022-06-02 07:25:40 +0200
commite45a30216c5a9a61f10e01045b082d5648ededff (patch)
tree9a8e03bd10f3fe07b3331aaebdbcb036aa0f7b18
parent3128fa360d993319a5ca64be31f11c3cd8762585 (diff)
parentfe79015965ecdb71f9afb4535d8099954229e279 (diff)
downloadkernel-e45a30216c5a9a61f10e01045b082d5648ededff.tar.gz
kernel-e45a30216c5a9a61f10e01045b082d5648ededff.tar.xz
kernel-e45a30216c5a9a61f10e01045b082d5648ededff.zip
-rw-r--r--Makefile.rhelver2
-rw-r--r--kernel-aarch64-debug-fedora.config2
-rw-r--r--kernel-aarch64-fedora.config2
-rw-r--r--kernel-armv7hl-debug-fedora.config2
-rw-r--r--kernel-armv7hl-fedora.config2
-rw-r--r--kernel-armv7hl-lpae-debug-fedora.config2
-rw-r--r--kernel-armv7hl-lpae-fedora.config2
-rw-r--r--kernel-ppc64le-debug-fedora.config2
-rw-r--r--kernel-ppc64le-debug-rhel.config2
-rw-r--r--kernel-ppc64le-fedora.config2
-rw-r--r--kernel-s390x-debug-fedora.config2
-rw-r--r--kernel-s390x-fedora.config2
-rw-r--r--kernel-x86_64-debug-fedora.config2
-rw-r--r--kernel-x86_64-fedora.config2
-rwxr-xr-xkernel.spec9
-rw-r--r--patch-5.19-redhat.patch20
-rw-r--r--sources6
17 files changed, 45 insertions, 18 deletions
diff --git a/Makefile.rhelver b/Makefile.rhelver
index d30523e7a..3b2ab7716 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 = 8
+RHEL_RELEASE = 9
#
# ZSTREAM
diff --git a/kernel-aarch64-debug-fedora.config b/kernel-aarch64-debug-fedora.config
index 3bbe90b89..8c3be7a31 100644
--- a/kernel-aarch64-debug-fedora.config
+++ b/kernel-aarch64-debug-fedora.config
@@ -3611,6 +3611,8 @@ CONFIG_LEDS_PCA9532=m
# CONFIG_LEDS_PCA955X is not set
CONFIG_LEDS_PCA963X=m
CONFIG_LEDS_PWM=m
+# CONFIG_LEDS_PWM_MULTICOLOR is not set
+# CONFIG_LEDS_QCOM_LPG is not set
CONFIG_LEDS_REGULATOR=m
# CONFIG_LEDS_RT4505 is not set
# CONFIG_LEDS_RT8515 is not set
diff --git a/kernel-aarch64-fedora.config b/kernel-aarch64-fedora.config
index 46d82b425..692dee1c2 100644
--- a/kernel-aarch64-fedora.config
+++ b/kernel-aarch64-fedora.config
@@ -3592,6 +3592,8 @@ CONFIG_LEDS_PCA9532=m
# CONFIG_LEDS_PCA955X is not set
CONFIG_LEDS_PCA963X=m
CONFIG_LEDS_PWM=m
+# CONFIG_LEDS_PWM_MULTICOLOR is not set
+# CONFIG_LEDS_QCOM_LPG is not set
CONFIG_LEDS_REGULATOR=m
# CONFIG_LEDS_RT4505 is not set
# CONFIG_LEDS_RT8515 is not set
diff --git a/kernel-armv7hl-debug-fedora.config b/kernel-armv7hl-debug-fedora.config
index 8d98d81f8..4e925b374 100644
--- a/kernel-armv7hl-debug-fedora.config
+++ b/kernel-armv7hl-debug-fedora.config
@@ -3625,6 +3625,8 @@ CONFIG_LEDS_PCA9532=m
CONFIG_LEDS_PCA963X=m
CONFIG_LEDS_PM8058=m
CONFIG_LEDS_PWM=m
+# CONFIG_LEDS_PWM_MULTICOLOR is not set
+# CONFIG_LEDS_QCOM_LPG is not set
CONFIG_LEDS_REGULATOR=m
# CONFIG_LEDS_RT4505 is not set
# CONFIG_LEDS_RT8515 is not set
diff --git a/kernel-armv7hl-fedora.config b/kernel-armv7hl-fedora.config
index 75f1c2b63..4955d9af8 100644
--- a/kernel-armv7hl-fedora.config
+++ b/kernel-armv7hl-fedora.config
@@ -3608,6 +3608,8 @@ CONFIG_LEDS_PCA9532=m
CONFIG_LEDS_PCA963X=m
CONFIG_LEDS_PM8058=m
CONFIG_LEDS_PWM=m
+# CONFIG_LEDS_PWM_MULTICOLOR is not set
+# CONFIG_LEDS_QCOM_LPG is not set
CONFIG_LEDS_REGULATOR=m
# CONFIG_LEDS_RT4505 is not set
# CONFIG_LEDS_RT8515 is not set
diff --git a/kernel-armv7hl-lpae-debug-fedora.config b/kernel-armv7hl-lpae-debug-fedora.config
index 3d87c5b10..88e83f7cb 100644
--- a/kernel-armv7hl-lpae-debug-fedora.config
+++ b/kernel-armv7hl-lpae-debug-fedora.config
@@ -3554,6 +3554,8 @@ CONFIG_LEDS_PCA9532=m
# CONFIG_LEDS_PCA955X is not set
CONFIG_LEDS_PCA963X=m
CONFIG_LEDS_PWM=m
+# CONFIG_LEDS_PWM_MULTICOLOR is not set
+# CONFIG_LEDS_QCOM_LPG is not set
CONFIG_LEDS_REGULATOR=m
# CONFIG_LEDS_RT4505 is not set
# CONFIG_LEDS_RT8515 is not set
diff --git a/kernel-armv7hl-lpae-fedora.config b/kernel-armv7hl-lpae-fedora.config
index a5e7f06f7..cfa5fe510 100644
--- a/kernel-armv7hl-lpae-fedora.config
+++ b/kernel-armv7hl-lpae-fedora.config
@@ -3537,6 +3537,8 @@ CONFIG_LEDS_PCA9532=m
# CONFIG_LEDS_PCA955X is not set
CONFIG_LEDS_PCA963X=m
CONFIG_LEDS_PWM=m
+# CONFIG_LEDS_PWM_MULTICOLOR is not set
+# CONFIG_LEDS_QCOM_LPG is not set
CONFIG_LEDS_REGULATOR=m
# CONFIG_LEDS_RT4505 is not set
# CONFIG_LEDS_RT8515 is not set
diff --git a/kernel-ppc64le-debug-fedora.config b/kernel-ppc64le-debug-fedora.config
index 215dccec7..b91c4f403 100644
--- a/kernel-ppc64le-debug-fedora.config
+++ b/kernel-ppc64le-debug-fedora.config
@@ -3018,6 +3018,8 @@ CONFIG_LEDS_PCA9532=m
# CONFIG_LEDS_PCA963X is not set
CONFIG_LEDS_POWERNV=m
# CONFIG_LEDS_PWM is not set
+# CONFIG_LEDS_PWM_MULTICOLOR is not set
+# CONFIG_LEDS_QCOM_LPG is not set
CONFIG_LEDS_REGULATOR=m
# CONFIG_LEDS_RT4505 is not set
# CONFIG_LEDS_RT8515 is not set
diff --git a/kernel-ppc64le-debug-rhel.config b/kernel-ppc64le-debug-rhel.config
index 2ebf086e7..504ca89ef 100644
--- a/kernel-ppc64le-debug-rhel.config
+++ b/kernel-ppc64le-debug-rhel.config
@@ -2525,7 +2525,7 @@ CONFIG_KALLSYMS_BASE_RELATIVE=y
CONFIG_KALLSYMS=y
# CONFIG_KARMA_PARTITION is not set
CONFIG_KASAN_GENERIC=y
-CONFIG_KASAN_INLINE=y
+# CONFIG_KASAN_INLINE is not set
CONFIG_KASAN_KUNIT_TEST=m
# CONFIG_KASAN_MODULE_TEST is not set
CONFIG_KASAN_OUTLINE=y
diff --git a/kernel-ppc64le-fedora.config b/kernel-ppc64le-fedora.config
index 5fb0d695e..e4c6c12f9 100644
--- a/kernel-ppc64le-fedora.config
+++ b/kernel-ppc64le-fedora.config
@@ -2999,6 +2999,8 @@ CONFIG_LEDS_PCA9532=m
# CONFIG_LEDS_PCA963X is not set
CONFIG_LEDS_POWERNV=m
# CONFIG_LEDS_PWM is not set
+# CONFIG_LEDS_PWM_MULTICOLOR is not set
+# CONFIG_LEDS_QCOM_LPG is not set
CONFIG_LEDS_REGULATOR=m
# CONFIG_LEDS_RT4505 is not set
# CONFIG_LEDS_RT8515 is not set
diff --git a/kernel-s390x-debug-fedora.config b/kernel-s390x-debug-fedora.config
index 8d465085a..e8fffaba0 100644
--- a/kernel-s390x-debug-fedora.config
+++ b/kernel-s390x-debug-fedora.config
@@ -2992,6 +2992,8 @@ CONFIG_LEDS_PCA9532=m
# CONFIG_LEDS_PCA955X is not set
# CONFIG_LEDS_PCA963X is not set
# CONFIG_LEDS_PWM is not set
+# CONFIG_LEDS_PWM_MULTICOLOR is not set
+# CONFIG_LEDS_QCOM_LPG is not set
CONFIG_LEDS_REGULATOR=m
# CONFIG_LEDS_RT4505 is not set
# CONFIG_LEDS_RT8515 is not set
diff --git a/kernel-s390x-fedora.config b/kernel-s390x-fedora.config
index 126f20e42..92fc55d05 100644
--- a/kernel-s390x-fedora.config
+++ b/kernel-s390x-fedora.config
@@ -2973,6 +2973,8 @@ CONFIG_LEDS_PCA9532=m
# CONFIG_LEDS_PCA955X is not set
# CONFIG_LEDS_PCA963X is not set
# CONFIG_LEDS_PWM is not set
+# CONFIG_LEDS_PWM_MULTICOLOR is not set
+# CONFIG_LEDS_QCOM_LPG is not set
CONFIG_LEDS_REGULATOR=m
# CONFIG_LEDS_RT4505 is not set
# CONFIG_LEDS_RT8515 is not set
diff --git a/kernel-x86_64-debug-fedora.config b/kernel-x86_64-debug-fedora.config
index 6ec37cc9c..f2b05d371 100644
--- a/kernel-x86_64-debug-fedora.config
+++ b/kernel-x86_64-debug-fedora.config
@@ -3294,6 +3294,8 @@ CONFIG_LEDS_PCA9532=m
# CONFIG_LEDS_PCA955X is not set
# CONFIG_LEDS_PCA963X is not set
# CONFIG_LEDS_PWM is not set
+# CONFIG_LEDS_PWM_MULTICOLOR is not set
+# CONFIG_LEDS_QCOM_LPG is not set
# CONFIG_LEDS_REGULATOR is not set
# CONFIG_LEDS_RT4505 is not set
# CONFIG_LEDS_RT8515 is not set
diff --git a/kernel-x86_64-fedora.config b/kernel-x86_64-fedora.config
index c9a25799b..c788c1739 100644
--- a/kernel-x86_64-fedora.config
+++ b/kernel-x86_64-fedora.config
@@ -3275,6 +3275,8 @@ CONFIG_LEDS_PCA9532=m
# CONFIG_LEDS_PCA955X is not set
# CONFIG_LEDS_PCA963X is not set
# CONFIG_LEDS_PWM is not set
+# CONFIG_LEDS_PWM_MULTICOLOR is not set
+# CONFIG_LEDS_QCOM_LPG is not set
# CONFIG_LEDS_REGULATOR is not set
# CONFIG_LEDS_RT4505 is not set
# CONFIG_LEDS_RT8515 is not set
diff --git a/kernel.spec b/kernel.spec
index 939d04562..3c5bfea87 100755
--- a/kernel.spec
+++ b/kernel.spec
@@ -128,13 +128,13 @@ Summary: The Linux kernel
# define buildid .local
%define specversion 5.19.0
%define patchversion 5.19
-%define pkgrelease 0.rc0.20220531git8ab2afa23bd1.8
+%define pkgrelease 0.rc0.20220601git700170bf6b4d.9
%define kversion 5
-%define tarfile_release 5.18-11439-g8ab2afa23bd1
+%define tarfile_release 5.18-11712-g700170bf6b4d
# This is needed to do merge window version magic
%define patchlevel 19
# allow pkg_release to have configurable %%{?dist} tag
-%define specrelease 0.rc0.20220531git8ab2afa23bd1.8%{?buildid}%{?dist}
+%define specrelease 0.rc0.20220601git700170bf6b4d.9%{?buildid}%{?dist}
#
# End of genspec.sh variables
@@ -3048,6 +3048,9 @@ fi
#
#
%changelog
+* Wed Jun 01 2022 Fedora Kernel Team <kernel-team@fedoraproject.org> [5.19.0-0.rc0.700170bf6b4d.8]
+- Turn off KASAN_INLINE for RHEL ppc in pending (Justin M. Forbes)
+
* Tue May 31 2022 Fedora Kernel Team <kernel-team@fedoraproject.org> [5.19.0-0.rc0.8ab2afa23bd1.7]
- redhat/kernel.spec.template: update selftest data via "make dist-self-test-data" (Denys Vlasenko)
- redhat/kernel.spec.template: remove stray *.hardlink-temporary files, if any (Denys Vlasenko)
diff --git a/patch-5.19-redhat.patch b/patch-5.19-redhat.patch
index 1ea4f7006..fcd403f77 100644
--- a/patch-5.19-redhat.patch
+++ b/patch-5.19-redhat.patch
@@ -166,7 +166,7 @@ index 903165a400a7..578894315318 100644
The VM uses one page of physical memory for each page table.
For systems with a lot of processes, this can use a lot of
diff --git a/arch/arm64/Kconfig b/arch/arm64/Kconfig
-index a4968845e67f..9f2f98c2ce25 100644
+index 1652a9800ebe..834d178f6c70 100644
--- a/arch/arm64/Kconfig
+++ b/arch/arm64/Kconfig
@@ -1128,7 +1128,7 @@ endchoice
@@ -1092,7 +1092,7 @@ index 258d5fe3d395..f7298e3dc8f3 100644
if (data->f01_container->dev.driver) {
/* Driver already bound, so enable ATTN now. */
diff --git a/drivers/iommu/iommu.c b/drivers/iommu/iommu.c
-index 857d4c2fd1a2..9353941f3a97 100644
+index 847ad47a2dfd..e5e545c80de7 100644
--- a/drivers/iommu/iommu.c
+++ b/drivers/iommu/iommu.c
@@ -7,6 +7,7 @@
@@ -1103,7 +1103,7 @@ index 857d4c2fd1a2..9353941f3a97 100644
#include <linux/dma-iommu.h>
#include <linux/kernel.h>
#include <linux/bits.h>
-@@ -2870,6 +2871,27 @@ u32 iommu_sva_get_pasid(struct iommu_sva *handle)
+@@ -2856,6 +2857,27 @@ u32 iommu_sva_get_pasid(struct iommu_sva *handle)
}
EXPORT_SYMBOL_GPL(iommu_sva_get_pasid);
@@ -1362,7 +1362,7 @@ index 9b72b6ecf33c..d2717a44074e 100644
{
}
diff --git a/drivers/pci/pci-driver.c b/drivers/pci/pci-driver.c
-index 2f3b69adfc9e..3fb99a86882f 100644
+index 49238ddd39ee..7c32d338542f 100644
--- a/drivers/pci/pci-driver.c
+++ b/drivers/pci/pci-driver.c
@@ -19,6 +19,7 @@
@@ -1371,9 +1371,9 @@ index 2f3b69adfc9e..3fb99a86882f 100644
#include <linux/acpi.h>
+#include <linux/kernel.h>
#include <linux/dma-map-ops.h>
+ #include <linux/iommu.h>
#include "pci.h"
- #include "pcie/portdrv.h"
-@@ -295,6 +296,83 @@ static struct attribute *pci_drv_attrs[] = {
+@@ -296,6 +297,83 @@ static struct attribute *pci_drv_attrs[] = {
};
ATTRIBUTE_GROUPS(pci_drv);
@@ -1955,10 +1955,10 @@ index e71161da69c4..25d187e0a84c 100644
struct taint_flag {
diff --git a/include/linux/pci.h b/include/linux/pci.h
-index 3266ac08f8ec..675ee177e936 100644
+index 993674b32717..667a9aa908e6 100644
--- a/include/linux/pci.h
+++ b/include/linux/pci.h
-@@ -1487,6 +1487,22 @@ int pci_add_dynid(struct pci_driver *drv,
+@@ -1495,6 +1495,22 @@ int pci_add_dynid(struct pci_driver *drv,
unsigned long driver_data);
const struct pci_device_id *pci_match_id(const struct pci_device_id *ids,
struct pci_dev *dev);
@@ -2538,10 +2538,10 @@ index 7fc4e9f49f54..6f0b0b2dc73d 100644
#if defined(CONFIG_SECURITY) && defined(CONFIG_WATCH_QUEUE)
diff --git a/init/Kconfig b/init/Kconfig
-index 251aac1c0ccd..6cd2533ee581 100644
+index c984afc489de..7f2dd88b6090 100644
--- a/init/Kconfig
+++ b/init/Kconfig
-@@ -1665,7 +1665,7 @@ config AIO
+@@ -1669,7 +1669,7 @@ config AIO
this option saves about 7k.
config IO_URING
diff --git a/sources b/sources
index 50609f66f..10ba5bcfc 100644
--- a/sources
+++ b/sources
@@ -1,3 +1,3 @@
-SHA512 (linux-5.18-11439-g8ab2afa23bd1.tar.xz) = 5ca46bc0b4c4f2edd33877a99a81bf05ef3c3330b2c5ca128ca467cd6e856136237936edf8780acb7aa06a46d872dbf05d7d411bfaf07ca685c199584dffe4d2
-SHA512 (kernel-abi-stablelists-5.19.0-0.rc0.20220531git8ab2afa23bd1.8.tar.bz2) = 44ae24d954a85c34464d7154bb14a337d9c1efca84ce1b4c5fee0352cfa11b93e21fe1ed9bbe9f75915d31e208b709d440098e866008ce71edf96233a52c3b6d
-SHA512 (kernel-kabi-dw-5.19.0-0.rc0.20220531git8ab2afa23bd1.8.tar.bz2) = 57b183fcce6fb9679367bd637522c253480ba28cc0e7e5e8ad4f20991468714d7818219b755e0cdc081334256d9a4792a5077edc9c0894de9fdd6efec5c84931
+SHA512 (linux-5.18-11712-g700170bf6b4d.tar.xz) = 33207eb89779499baf4b9a2c2cc0358b0c966c570c19cef5d226fa0fca5c1962786b00ffdd413fe341b29d92f5b7ad2658a0a4bab358ac4fb7ffa61cda23b17a
+SHA512 (kernel-abi-stablelists-5.19.0-0.rc0.20220601git700170bf6b4d.9.tar.bz2) = 0d1590606251821988aa4d854bdac246109995c79fc70c64878f9ea051b1f1ca6bdb24050aa6bc9057d31d74ad6c25e62ccde06f83cc35ed4cf8f427c287d358
+SHA512 (kernel-kabi-dw-5.19.0-0.rc0.20220601git700170bf6b4d.9.tar.bz2) = ea04960999f4bbc1db55422896293eb2442bc608227155ea631cb3be298b690904fa05d22ab66fd76927a47b8263e8c9498a71ef62ff99080550fa49946d5dc8