kernel 6.6.4

2 files changed, 19 insertions, 66 deletions

diff --git a/SOURCES/patch-6.6-redhat.patch b/SOURCES/patch-6.6-redhat.patch
index 7889222..229bd54 100644
--- a/SOURCES/patch-6.6-redhat.patch
+++ b/SOURCES/patch-6.6-redhat.patch
@@ -3,9 +3,7 @@
  arch/s390/kernel/ipl.c                             |   5 +
  arch/s390/kernel/setup.c                           |   4 +
  arch/x86/kernel/setup.c                            |  22 ++-
- drivers/acpi/acpi_video.c                          |   2 +-
  drivers/acpi/apei/hest.c                           |   8 +
- drivers/acpi/device_pm.c                           |  13 ++
  drivers/acpi/irq.c                                 |  17 +-
  drivers/acpi/scan.c                                |   9 ++
  drivers/ata/libahci.c                              |  18 +++
@@ -23,7 +21,6 @@
  drivers/rtc/rtc-cmos.c                             |  18 ++-
  drivers/scsi/sd.c                                  |  10 ++
  drivers/usb/core/hub.c                             |   7 +
- include/acpi/acpi_bus.h                            |   1 +
  include/linux/efi.h                                |  22 ++-
  include/linux/lsm_hook_defs.h                      |   2 +
  include/linux/module.h                             |   1 +
@@ -38,10 +35,10 @@
  security/lockdown/Kconfig                          |  13 ++
  security/lockdown/lockdown.c                       |   1 +
  security/security.c                                |  12 ++
- 40 files changed, 696 insertions(+), 182 deletions(-)
+ 37 files changed, 681 insertions(+), 181 deletions(-)
 
 diff --git a/Makefile b/Makefile
-index 8ecebeb5642c..d2ae44a64210 100644
+index cbe63ba9126e..07635f242c3d 100644
 --- a/Makefile
 +++ b/Makefile
 @@ -22,6 +22,18 @@ $(if $(filter __%, $(MAKECMDGOALS)), \
@@ -91,10 +88,10 @@ index b0d00032479d..afb9544fb007 100644
  /*
   * DIAG 308 support
 diff --git a/arch/s390/kernel/ipl.c b/arch/s390/kernel/ipl.c
-index 05e51666db03..454a33b77878 100644
+index 8d0b95c17312..118ae555a179 100644
 --- a/arch/s390/kernel/ipl.c
 +++ b/arch/s390/kernel/ipl.c
-@@ -2519,3 +2519,8 @@ int ipl_report_free(struct ipl_report *report)
+@@ -2520,3 +2520,8 @@ int ipl_report_free(struct ipl_report *report)
  }
  
  #endif
@@ -172,19 +169,6 @@ index b098b1fa2470..a159419e60df 100644
  
  	reserve_initrd();
  
-diff --git a/drivers/acpi/acpi_video.c b/drivers/acpi/acpi_video.c
-index b411948594ff..4e868454b38d 100644
---- a/drivers/acpi/acpi_video.c
-+++ b/drivers/acpi/acpi_video.c
-@@ -2031,7 +2031,7 @@ static int acpi_video_bus_add(struct acpi_device *device)
- 	 * HP ZBook Fury 16 G10 requires ACPI video's child devices have _PS0
- 	 * evaluated to have functional panel brightness control.
- 	 */
--	acpi_device_fix_up_power_extended(device);
-+	acpi_device_fix_up_power_children(device);
- 
- 	pr_info("%s [%s] (multi-head: %s  rom: %s  post: %s)\n",
- 	       ACPI_VIDEO_DEVICE_NAME, acpi_device_bid(device),
 diff --git a/drivers/acpi/apei/hest.c b/drivers/acpi/apei/hest.c
 index 6aef1ee5e1bd..8f146b1b4972 100644
 --- a/drivers/acpi/apei/hest.c
@@ -204,30 +188,6 @@ index 6aef1ee5e1bd..8f146b1b4972 100644
  	hest_hdr = (struct acpi_hest_header *)(hest_tab + 1);
  	for (i = 0; i < hest_tab->error_source_count; i++) {
  		len = hest_esrc_len(hest_hdr);
-diff --git a/drivers/acpi/device_pm.c b/drivers/acpi/device_pm.c
-index f007116a8427..3b4d048c4941 100644
---- a/drivers/acpi/device_pm.c
-+++ b/drivers/acpi/device_pm.c
-@@ -397,6 +397,19 @@ void acpi_device_fix_up_power_extended(struct acpi_device *adev)
- }
- EXPORT_SYMBOL_GPL(acpi_device_fix_up_power_extended);
- 
-+/**
-+ * acpi_device_fix_up_power_children - Force a device's children into D0.
-+ * @adev: Parent device object whose children's power state is to be fixed up.
-+ *
-+ * Call acpi_device_fix_up_power() for @adev's children so long as they
-+ * are reported as present and enabled.
-+ */
-+void acpi_device_fix_up_power_children(struct acpi_device *adev)
-+{
-+	acpi_dev_for_each_child(adev, fix_up_power_if_applicable, NULL);
-+}
-+EXPORT_SYMBOL_GPL(acpi_device_fix_up_power_children);
-+
- int acpi_device_update_power(struct acpi_device *device, int *state_p)
- {
- 	int state;
 diff --git a/drivers/acpi/irq.c b/drivers/acpi/irq.c
 index 1687483ff319..390b67f19181 100644
 --- a/drivers/acpi/irq.c
@@ -1102,10 +1062,10 @@ index 6effa13039f3..fbfbd542b858 100644
  	if (err)
  		goto err_out_driver;
 diff --git a/drivers/usb/core/hub.c b/drivers/usb/core/hub.c
-index 0ff47eeffb49..005b8c595c60 100644
+index dfc30cebd4c4..ce1e2cf26478 100644
 --- a/drivers/usb/core/hub.c
 +++ b/drivers/usb/core/hub.c
-@@ -5782,6 +5782,13 @@ static void hub_event(struct work_struct *work)
+@@ -5759,6 +5759,13 @@ static void hub_event(struct work_struct *work)
  			(u16) hub->change_bits[0],
  			(u16) hub->event_bits[0]);
  
@@ -1119,18 +1079,6 @@ index 0ff47eeffb49..005b8c595c60 100644
  	/* Lock the device, then check to see if we were
  	 * disconnected while waiting for the lock to succeed. */
  	usb_lock_device(hdev);
-diff --git a/include/acpi/acpi_bus.h b/include/acpi/acpi_bus.h
-index 254685085c82..0b7eab0ef7d7 100644
---- a/include/acpi/acpi_bus.h
-+++ b/include/acpi/acpi_bus.h
-@@ -539,6 +539,7 @@ int acpi_device_set_power(struct acpi_device *device, int state);
- int acpi_bus_init_power(struct acpi_device *device);
- int acpi_device_fix_up_power(struct acpi_device *device);
- void acpi_device_fix_up_power_extended(struct acpi_device *adev);
-+void acpi_device_fix_up_power_children(struct acpi_device *adev);
- int acpi_bus_update_power(acpi_handle handle, int *state_p);
- int acpi_device_update_power(struct acpi_device *device, int *state_p);
- bool acpi_bus_power_manageable(acpi_handle handle);
 diff --git a/include/linux/efi.h b/include/linux/efi.h
 index 80b21d1c6eaf..b66c0683f2fc 100644
 --- a/include/linux/efi.h
diff --git a/SPECS/kernel.spec b/SPECS/kernel.spec
index 14dedaa..797f850 100644
--- a/SPECS/kernel.spec
+++ b/SPECS/kernel.spec
@@ -160,18 +160,18 @@ Summary: The Linux kernel
 #  the --with-release option overrides this setting.)
 %define debugbuildsenabled 1
 %define buildid .fsync
-%define specrpmversion 6.6.3
-%define specversion 6.6.3
+%define specrpmversion 6.6.4
+%define specversion 6.6.4
 %define patchversion 6.6
 %define pkgrelease 200
 %define kversion 6
-%define tarfile_release 6.6.3
+%define tarfile_release 6.6.4
 # This is needed to do merge window version magic
 %define patchlevel 6
 # This allows pkg_release to have configurable %%{?dist} tag
 %define specrelease 201%{?buildid}%{?dist}
 # This defines the kabi tarball version
-%define kabiversion 6.6.3
+%define kabiversion 6.6.4
 
 # If this variable is set to 1, a bpf selftests build failure will cause a
 # fatal kernel package build error
@@ -785,7 +785,7 @@ BuildRequires: binutils
 BuildRequires: lvm2
 BuildRequires: systemd-boot-unsigned
 # For systemd-stub and systemd-pcrphase
-BuildRequires: systemd-udev >= 252-1
+BuildRequires: systemd-udev
 # For TPM operations in UKI initramfs
 BuildRequires: tpm2-tools
 %endif
@@ -1570,7 +1570,7 @@ Provides: installonlypkg(kernel)\
 Provides: kernel-%{?1:%{1}-}uname-r = %{KVERREL}%{uname_suffix %{?1:+%{1}}}\
 Requires: kernel%{?1:-%{1}}-modules-core-uname-r = %{KVERREL}%{uname_suffix %{?1:+%{1}}}\
 Requires(pre): %{kernel_prereq}\
-Requires(pre): systemd >= 254-1\
+Requires(pre): systemd\
 %endif\
 %endif\
 %if %{with_gcov}\
@@ -3831,8 +3831,13 @@ fi\
 #
 #
 %changelog
-* Fri Dec 01 2023 Jan Drögehoff <sentrycraft123@gmail.com> - 6.6.3-201.fsync
-- kernel-fsync v6.6.3
+* Wed Dec 06 2023 Jan Drögehoff <sentrycraft123@gmail.com> - 6.6.4-201.fsync
+- kernel-fsync v6.6.4
+
+* Sun Dec 03 2023 Justin M. Forbes <jforbes@fedoraproject.org> [6.6.4-0]
+- redhat: Fix macro for kernel-uki-virt flavor (Neal Gompa)
+- Change the uki reqs for Fedora (Justin M. Forbes)
+- Linux v6.6.4
 
 * Tue Nov 28 2023 Justin M. Forbes <jforbes@fedoraproject.org> [6.6.3-0]
 - Add BugsFixed for 6.6.3 (Justin M. Forbes)