summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--SOURCES/patch-6.4-redhat.patch8
-rw-r--r--SPECS/kernel.spec16
2 files changed, 14 insertions, 10 deletions
diff --git a/SOURCES/patch-6.4-redhat.patch b/SOURCES/patch-6.4-redhat.patch
index 3fcfa59..9e19eff 100644
--- a/SOURCES/patch-6.4-redhat.patch
+++ b/SOURCES/patch-6.4-redhat.patch
@@ -40,7 +40,7 @@
39 files changed, 518 insertions(+), 191 deletions(-)
diff --git a/Makefile b/Makefile
-index 0ff13b943f99..a0066c563e57 100644
+index 900e515b87cf..5da008e699ef 100644
--- a/Makefile
+++ b/Makefile
@@ -22,6 +22,18 @@ $(if $(filter __%, $(MAKECMDGOALS)), \
@@ -263,7 +263,7 @@ index c2c786eb95ab..4e3aa80cd5cf 100644
return ctx.rc;
}
diff --git a/drivers/acpi/resource.c b/drivers/acpi/resource.c
-index a4d9f149b48d..5c48b981758c 100644
+index 32cfa3f4efd3..596edf4068b7 100644
--- a/drivers/acpi/resource.c
+++ b/drivers/acpi/resource.c
@@ -470,6 +470,24 @@ static const struct dmi_system_id asus_laptop[] = {
@@ -291,7 +291,7 @@ index a4d9f149b48d..5c48b981758c 100644
static const struct dmi_system_id tongfang_gm_rg[] = {
{
.ident = "TongFang GMxRGxx/XMG CORE 15 (M22)/TUXEDO Stellaris 15 Gen4 AMD",
-@@ -532,6 +550,8 @@ struct irq_override_cmp {
+@@ -536,6 +554,8 @@ struct irq_override_cmp {
static const struct irq_override_cmp override_table[] = {
{ medion_laptop, 1, ACPI_LEVEL_SENSITIVE, ACPI_ACTIVE_LOW, 0, false },
{ asus_laptop, 1, ACPI_LEVEL_SENSITIVE, ACPI_ACTIVE_LOW, 0, false },
@@ -300,7 +300,7 @@ index a4d9f149b48d..5c48b981758c 100644
{ tongfang_gm_rg, 1, ACPI_EDGE_SENSITIVE, ACPI_ACTIVE_LOW, 1, true },
{ maingear_laptop, 1, ACPI_EDGE_SENSITIVE, ACPI_ACTIVE_LOW, 1, true },
{ pcspecialist_laptop, 1, ACPI_EDGE_SENSITIVE, ACPI_ACTIVE_LOW, 1, true },
-@@ -555,18 +575,6 @@ static bool acpi_dev_irq_override(u32 gsi, u8 triggering, u8 polarity,
+@@ -559,18 +579,6 @@ static bool acpi_dev_irq_override(u32 gsi, u8 triggering, u8 polarity,
}
#ifdef CONFIG_X86
diff --git a/SPECS/kernel.spec b/SPECS/kernel.spec
index 0b7637d..5fad918 100644
--- a/SPECS/kernel.spec
+++ b/SPECS/kernel.spec
@@ -171,18 +171,18 @@ Summary: The Linux kernel
# the --with-release option overrides this setting.)
%define debugbuildsenabled 1
%define buildid .fsync
-%define specrpmversion 6.4.12
-%define specversion 6.4.12
+%define specrpmversion 6.4.13
+%define specversion 6.4.13
%define patchversion 6.4
%define pkgrelease 200
%define kversion 6
-%define tarfile_release 6.4.12
+%define tarfile_release 6.4.13
# This is needed to do merge window version magic
%define patchlevel 4
# This allows pkg_release to have configurable %%{?dist} tag
%define specrelease 201%{?buildid}%{?dist}
# This defines the kabi tarball version
-%define kabiversion 6.4.12
+%define kabiversion 6.4.13
# If this variable is set to 1, a bpf selftests build failure will cause a
# fatal kernel package build error
@@ -3893,8 +3893,12 @@ fi\
#
#
%changelog
-* Thu Aug 24 2023 Jan Drögehoff <sentrycraft123@gmail.com> - 6.4.12-201.fsync
-- kernel-fsync v6.4.12
+* Sat Sep 02 2023 Jan Drögehoff <sentrycraft123@gmail.com> - 6.4.13-201.fsync
+- kernel-fsync v6.4.13
+
+* Wed Aug 30 2023 Justin M. Forbes <jforbes@fedoraproject.org> [6.4.13-0]
+- Add CVE-2023-4563 bugs to BugsFixed (Justin M. Forbes)
+- Linux v6.4.13
* Wed Aug 23 2023 Justin M. Forbes <jforbes@fedoraproject.org> [6.4.12-0]
- ASoC: SOF: intel: hda: Clean up link DMA for IPC3 during stop (Ranjani Sridharan)