summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
Diffstat
-rw-r--r--Makefile.rhelver2
-rw-r--r--kernel-aarch64-debug-rhel.config1
-rw-r--r--kernel-aarch64-rhel.config1
-rw-r--r--kernel-ppc64le-debug-rhel.config1
-rw-r--r--kernel-ppc64le-rhel.config1
-rw-r--r--kernel-s390x-debug-rhel.config1
-rw-r--r--kernel-s390x-rhel.config1
-rw-r--r--kernel-s390x-zfcpdump-rhel.config1
-rwxr-xr-xkernel.spec19
-rw-r--r--patch-6.1-redhat.patch12
-rw-r--r--sources6
11 files changed, 25 insertions, 21 deletions
diff --git a/Makefile.rhelver b/Makefile.rhelver
index 2d7ebf11e..a985bc34f 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 = 24
+RHEL_RELEASE = 27
#
# ZSTREAM
diff --git a/kernel-aarch64-debug-rhel.config b/kernel-aarch64-debug-rhel.config
index 1fda09061..27c6cff00 100644
--- a/kernel-aarch64-debug-rhel.config
+++ b/kernel-aarch64-debug-rhel.config
@@ -2538,7 +2538,6 @@ CONFIG_INTEL_SDSI=m
# CONFIG_INTEL_SOC_PMIC_CHTWC is not set
# CONFIG_INTEL_SOC_PMIC is not set
# CONFIG_INTEL_TCC_COOLING is not set
-CONFIG_INTEL_TDX_GUEST=y
# CONFIG_INTEL_TH is not set
CONFIG_INTEL_TURBO_MAX_3=y
CONFIG_INTEL_UNCORE_FREQ_CONTROL=m
diff --git a/kernel-aarch64-rhel.config b/kernel-aarch64-rhel.config
index 3befc9333..c439761a2 100644
--- a/kernel-aarch64-rhel.config
+++ b/kernel-aarch64-rhel.config
@@ -2522,7 +2522,6 @@ CONFIG_INTEL_SDSI=m
# CONFIG_INTEL_SOC_PMIC_CHTWC is not set
# CONFIG_INTEL_SOC_PMIC is not set
# CONFIG_INTEL_TCC_COOLING is not set
-CONFIG_INTEL_TDX_GUEST=y
# CONFIG_INTEL_TH is not set
CONFIG_INTEL_TURBO_MAX_3=y
CONFIG_INTEL_UNCORE_FREQ_CONTROL=m
diff --git a/kernel-ppc64le-debug-rhel.config b/kernel-ppc64le-debug-rhel.config
index 7fd9645ff..7ebf98f1c 100644
--- a/kernel-ppc64le-debug-rhel.config
+++ b/kernel-ppc64le-debug-rhel.config
@@ -2351,7 +2351,6 @@ CONFIG_INTEL_SDSI=m
# CONFIG_INTEL_SOC_PMIC_CHTWC is not set
# CONFIG_INTEL_SOC_PMIC is not set
# CONFIG_INTEL_TCC_COOLING is not set
-CONFIG_INTEL_TDX_GUEST=y
# CONFIG_INTEL_TH is not set
CONFIG_INTEL_TURBO_MAX_3=y
CONFIG_INTEL_UNCORE_FREQ_CONTROL=m
diff --git a/kernel-ppc64le-rhel.config b/kernel-ppc64le-rhel.config
index 9e33d9ac6..0ff6f23df 100644
--- a/kernel-ppc64le-rhel.config
+++ b/kernel-ppc64le-rhel.config
@@ -2335,7 +2335,6 @@ CONFIG_INTEL_SDSI=m
# CONFIG_INTEL_SOC_PMIC_CHTWC is not set
# CONFIG_INTEL_SOC_PMIC is not set
# CONFIG_INTEL_TCC_COOLING is not set
-CONFIG_INTEL_TDX_GUEST=y
# CONFIG_INTEL_TH is not set
CONFIG_INTEL_TURBO_MAX_3=y
CONFIG_INTEL_UNCORE_FREQ_CONTROL=m
diff --git a/kernel-s390x-debug-rhel.config b/kernel-s390x-debug-rhel.config
index 39a77c7a6..a0d6bbaab 100644
--- a/kernel-s390x-debug-rhel.config
+++ b/kernel-s390x-debug-rhel.config
@@ -2336,7 +2336,6 @@ CONFIG_INTEL_SDSI=m
# CONFIG_INTEL_SOC_PMIC_CHTWC is not set
# CONFIG_INTEL_SOC_PMIC is not set
# CONFIG_INTEL_TCC_COOLING is not set
-CONFIG_INTEL_TDX_GUEST=y
# CONFIG_INTEL_TH is not set
CONFIG_INTEL_TURBO_MAX_3=y
CONFIG_INTEL_UNCORE_FREQ_CONTROL=m
diff --git a/kernel-s390x-rhel.config b/kernel-s390x-rhel.config
index 6b5244b48..5fc4ebc75 100644
--- a/kernel-s390x-rhel.config
+++ b/kernel-s390x-rhel.config
@@ -2320,7 +2320,6 @@ CONFIG_INTEL_SDSI=m
# CONFIG_INTEL_SOC_PMIC_CHTWC is not set
# CONFIG_INTEL_SOC_PMIC is not set
# CONFIG_INTEL_TCC_COOLING is not set
-CONFIG_INTEL_TDX_GUEST=y
# CONFIG_INTEL_TH is not set
CONFIG_INTEL_TURBO_MAX_3=y
CONFIG_INTEL_UNCORE_FREQ_CONTROL=m
diff --git a/kernel-s390x-zfcpdump-rhel.config b/kernel-s390x-zfcpdump-rhel.config
index a863f22c9..e0114d16b 100644
--- a/kernel-s390x-zfcpdump-rhel.config
+++ b/kernel-s390x-zfcpdump-rhel.config
@@ -2331,7 +2331,6 @@ CONFIG_INTEL_SDSI=m
# CONFIG_INTEL_SOC_PMIC_CHTWC is not set
# CONFIG_INTEL_SOC_PMIC is not set
# CONFIG_INTEL_TCC_COOLING is not set
-CONFIG_INTEL_TDX_GUEST=y
# CONFIG_INTEL_TH is not set
CONFIG_INTEL_TURBO_MAX_3=y
CONFIG_INTEL_UNCORE_FREQ_CONTROL=m
diff --git a/kernel.spec b/kernel.spec
index 1cdd00afe..c766f7abf 100755
--- a/kernel.spec
+++ b/kernel.spec
@@ -119,17 +119,17 @@ 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 0
+%define debugbuildsenabled 1
# define buildid .local
%define specversion 6.1.0
%define patchversion 6.1
-%define pkgrelease 0.rc2.20221028git23758867219c.24
+%define pkgrelease 0.rc3.27
%define kversion 6
-%define tarfile_release 6.1-rc2-189-g23758867219c
+%define tarfile_release 6.1-rc3
# This is needed to do merge window version magic
%define patchlevel 1
# This allows pkg_release to have configurable %%{?dist} tag
-%define specrelease 0.rc2.20221028git23758867219c.24%{?buildid}%{?dist}
+%define specrelease 0.rc3.27%{?buildid}%{?dist}
# This defines the kabi tarball version
%define kabiversion 6.1.0
@@ -3190,6 +3190,17 @@ fi
#
#
%changelog
+* Mon Oct 31 2022 Fedora Kernel Team <kernel-team@fedoraproject.org> [6.1.0-0.rc3.27]
+- Linux v6.1.0-0.rc3
+
+* Sun Oct 30 2022 Fedora Kernel Team <kernel-team@fedoraproject.org> [6.1.0-0.rc2.882ad2a2a8ff.26]
+- Linux v6.1.0-0.rc2.882ad2a2a8ff
+
+* Sat Oct 29 2022 Fedora Kernel Team <kernel-team@fedoraproject.org> [6.1.0-0.rc2.576e61cea1e4.25]
+- configs: move CONFIG_INTEL_TDX_GUEST to common directory (Wander Lairson Costa)
+- redhat/Makefile: Use new BUILD_TARGET for RHEL dist[g]-brew target (Prarit Bhargava)
+- Linux v6.1.0-0.rc2.576e61cea1e4
+
* Fri Oct 28 2022 Fedora Kernel Team <kernel-team@fedoraproject.org> [6.1.0-0.rc2.23758867219c.24]
- redhat: method.py: change the output loop to use 'values' method (Patrick Talbert)
- redhat: use 'update' method in merge.py (Patrick Talbert)
diff --git a/patch-6.1-redhat.patch b/patch-6.1-redhat.patch
index caadd41cd..d0ccbad83 100644
--- a/patch-6.1-redhat.patch
+++ b/patch-6.1-redhat.patch
@@ -120,7 +120,7 @@ index 000000000000..effb81d04bfd
+
+endmenu
diff --git a/Makefile b/Makefile
-index d148a55bfd0f..35f9d1dfa080 100644
+index 28026d1ebb9d..4d20d9a9e840 100644
--- a/Makefile
+++ b/Makefile
@@ -18,6 +18,10 @@ $(if $(filter __%, $(MAKECMDGOALS)), \
@@ -438,10 +438,10 @@ index 1cc4647f78b8..016d488cabc3 100644
return ctx.rc;
}
diff --git a/drivers/acpi/scan.c b/drivers/acpi/scan.c
-index 024cc373a197..99369d9cac17 100644
+index b47e93a24a9a..9d172e177a75 100644
--- a/drivers/acpi/scan.c
+++ b/drivers/acpi/scan.c
-@@ -1742,6 +1742,15 @@ static bool acpi_device_enumeration_by_parent(struct acpi_device *device)
+@@ -1743,6 +1743,15 @@ static bool acpi_device_enumeration_by_parent(struct acpi_device *device)
if (!acpi_match_device_ids(device, ignore_serial_bus_ids))
return false;
@@ -1293,7 +1293,7 @@ index dc4220600585..758d2239af64 100644
#ifdef CONFIG_NVME_AUTH
queue_work(nvme_wq, &ctrl->dhchap_auth_work);
diff --git a/drivers/nvme/host/multipath.c b/drivers/nvme/host/multipath.c
-index 0ea7e441e080..bbd4ee0cbf05 100644
+index 93e2138a8b42..e5025519475f 100644
--- a/drivers/nvme/host/multipath.c
+++ b/drivers/nvme/host/multipath.c
@@ -80,14 +80,10 @@ void nvme_mpath_start_freeze(struct nvme_subsystem *subsys)
@@ -1329,7 +1329,7 @@ index 0ea7e441e080..bbd4ee0cbf05 100644
spin_lock_irqsave(&ns->head->requeue_lock, flags);
for (bio = req->bio; bio; bio = bio->bi_next) {
-@@ -873,8 +879,7 @@ int nvme_mpath_init_identify(struct nvme_ctrl *ctrl, struct nvme_id_ctrl *id)
+@@ -874,8 +880,7 @@ int nvme_mpath_init_identify(struct nvme_ctrl *ctrl, struct nvme_id_ctrl *id)
int error = 0;
/* check if multipath is enabled and we have the capability */
@@ -1632,7 +1632,7 @@ index 0b1616e93cf4..85fc52038a82 100644
PCI_ANY_ID, PCI_ANY_ID, },
{PCI_VENDOR_ID_EMULEX, PCI_DEVICE_ID_LANCER_G7_FC,
diff --git a/drivers/scsi/megaraid/megaraid_sas_base.c b/drivers/scsi/megaraid/megaraid_sas_base.c
-index 9be4ba61a076..7db5112a062f 100644
+index d265a2d9d082..75b50de1cce7 100644
--- a/drivers/scsi/megaraid/megaraid_sas_base.c
+++ b/drivers/scsi/megaraid/megaraid_sas_base.c
@@ -149,6 +149,7 @@ megasas_set_ld_removed_by_fw(struct megasas_instance *instance);
diff --git a/sources b/sources
index cc6403d49..2d86cc3be 100644
--- a/sources
+++ b/sources
@@ -1,3 +1,3 @@
-SHA512 (linux-6.1-rc2-189-g23758867219c.tar.xz) = cee133e6371b7351893ab174a8bbd4c2e63b2bf48a38b0e8518696c9d02272a988d6d3768e7f31b0e60a6e00e882f72d134d779d5c1b91c6837cfe4ea3f30b0c
-SHA512 (kernel-abi-stablelists-6.1.0.tar.bz2) = 2971ba64e1bbaa6cee47215e3956f83b82a137252aec3cfc63457cd3fee90a11d4df4091a33b1d7a2d2ed38ae6aa8dbd6d5a118f035d4d1c38a459a533193c2a
-SHA512 (kernel-kabi-dw-6.1.0.tar.bz2) = c9830a85b3ae7231bc6629210e02ee28566f01d3233359fa21cfe24ca0b9c8a1f5a1f74a29dc5d3e4d02902016ebd003f6e2aa0228800a82582d33aa16397c1e
+SHA512 (linux-6.1-rc3.tar.xz) = a91a81fba837f1f6bdaf27e5d17dfe350eb31556abd5a1a763e0bc6513203ae8813c563e5733952bdc95c8cee537dab2233065bb33cf14fa8d6d127ff0bab305
+SHA512 (kernel-abi-stablelists-6.1.0.tar.bz2) = 7b5070e1f95ce0bb8652bce2aa99d77eb19cfda2059709723a1e83fc6df85e45cd81b87a166ed129e5bb2528af50a922b1eb10a6dcf26d4f044922eb17e0f780
+SHA512 (kernel-kabi-dw-6.1.0.tar.bz2) = 5a3c76bc07b52d70e14707efa1b54b6614c1dcf4915238cc08c3d186b65bce9955699a45f8ffb6c9b844344d525d584c658b790a75a073ca0358b6947469a627
generated by cgit (git 2.34.1) at 2024-05-04 08:11:25 +0000