aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--SOURCES/kernel.changelog6
-rw-r--r--SOURCES/patch-6.7-redhat.patch93
-rw-r--r--SOURCES/rog-ally-audio-fix.patch4
-rw-r--r--SPECS/kernel.spec34
4 files changed, 42 insertions, 95 deletions
diff --git a/SOURCES/kernel.changelog b/SOURCES/kernel.changelog
index c40dbe9..db610ce 100644
--- a/SOURCES/kernel.changelog
+++ b/SOURCES/kernel.changelog
@@ -1,3 +1,9 @@
+* Fri Mar 01 2024 Augusto Caringi <acaringi@redhat.com> [6.7.7-0]
+- Add rhbz 2266309 to BugsFixed (Justin M. Forbes)
+- Add libperf-debuginfo subpackage (Justin M. Forbes)
+- Linux v6.7.7
+Resolves:
+
* Fri Feb 23 2024 Justin M. Forbes <jforbes@fedoraproject.org> [6.7.6-0]
- Add CVE fix for 6.7.6 (Justin M. Forbes)
- Linux v6.7.6
diff --git a/SOURCES/patch-6.7-redhat.patch b/SOURCES/patch-6.7-redhat.patch
index 0a7703b..112914f 100644
--- a/SOURCES/patch-6.7-redhat.patch
+++ b/SOURCES/patch-6.7-redhat.patch
@@ -14,9 +14,6 @@
drivers/firmware/efi/efi.c | 124 +++++++++++----
drivers/firmware/efi/secureboot.c | 38 +++++
drivers/firmware/sysfb.c | 18 ++-
- drivers/gpu/drm/amd/amdgpu/amdgpu.h | 2 +
- drivers/gpu/drm/amd/amdgpu/amdgpu_acpi.c | 15 ++
- drivers/gpu/drm/amd/amdgpu/amdgpu_device.c | 11 +-
drivers/hid/hid-rmi.c | 66 --------
drivers/hwtracing/coresight/coresight-etm4x-core.c | 19 +++
drivers/input/keyboard/atkbd.c | 3 +-
@@ -44,7 +41,7 @@
tools/power/cpupower/Makefile | 2 +-
.../selftests/net/openvswitch/openvswitch.sh | 13 ++
.../testing/selftests/net/openvswitch/ovs-dpctl.py | 71 +++++++--
- 46 files changed, 796 insertions(+), 196 deletions(-)
+ 43 files changed, 770 insertions(+), 194 deletions(-)
diff --git a/Documentation/admin-guide/laptops/thinkpad-acpi.rst b/Documentation/admin-guide/laptops/thinkpad-acpi.rst
index 98d304010170..7f674a6cfa8a 100644
@@ -72,7 +69,7 @@ index 98d304010170..7f674a6cfa8a 100644
0x1020 0x1F unknown
diff --git a/Makefile b/Makefile
-index d07a8e0179ac..5779c09825d9 100644
+index 72ee3609aae3..824a28d7c706 100644
--- a/Makefile
+++ b/Makefile
@@ -22,6 +22,18 @@ $(if $(filter __%, $(MAKECMDGOALS)), \
@@ -612,84 +609,6 @@ index 3c197db42c9d..16e4a2e90fae 100644
pd = sysfb_create_simplefb(si, &mode);
if (!IS_ERR(pd))
goto unlock_mutex;
-diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu.h b/drivers/gpu/drm/amd/amdgpu/amdgpu.h
-index 50f57d4dfd8f..f65a1518546e 100644
---- a/drivers/gpu/drm/amd/amdgpu/amdgpu.h
-+++ b/drivers/gpu/drm/amd/amdgpu/amdgpu.h
-@@ -1509,9 +1509,11 @@ static inline int amdgpu_acpi_smart_shift_update(struct drm_device *dev,
- #if defined(CONFIG_ACPI) && defined(CONFIG_SUSPEND)
- bool amdgpu_acpi_is_s3_active(struct amdgpu_device *adev);
- bool amdgpu_acpi_is_s0ix_active(struct amdgpu_device *adev);
-+void amdgpu_choose_low_power_state(struct amdgpu_device *adev);
- #else
- static inline bool amdgpu_acpi_is_s0ix_active(struct amdgpu_device *adev) { return false; }
- static inline bool amdgpu_acpi_is_s3_active(struct amdgpu_device *adev) { return false; }
-+static void amdgpu_choose_low_power_state(struct amdgpu_device *adev) { }
- #endif
-
- #if defined(CONFIG_DRM_AMD_DC)
-diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_acpi.c b/drivers/gpu/drm/amd/amdgpu/amdgpu_acpi.c
-index 2deebece810e..cc21ed67a330 100644
---- a/drivers/gpu/drm/amd/amdgpu/amdgpu_acpi.c
-+++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_acpi.c
-@@ -1519,4 +1519,19 @@ bool amdgpu_acpi_is_s0ix_active(struct amdgpu_device *adev)
- #endif /* CONFIG_AMD_PMC */
- }
-
-+/**
-+ * amdgpu_choose_low_power_state
-+ *
-+ * @adev: amdgpu_device_pointer
-+ *
-+ * Choose the target low power state for the GPU
-+ */
-+void amdgpu_choose_low_power_state(struct amdgpu_device *adev)
-+{
-+ if (amdgpu_acpi_is_s0ix_active(adev))
-+ adev->in_s0ix = true;
-+ else if (amdgpu_acpi_is_s3_active(adev))
-+ adev->in_s3 = true;
-+}
-+
- #endif /* CONFIG_SUSPEND */
-diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_device.c b/drivers/gpu/drm/amd/amdgpu/amdgpu_device.c
-index 19bc8d47317b..7f48c7ec4136 100644
---- a/drivers/gpu/drm/amd/amdgpu/amdgpu_device.c
-+++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_device.c
-@@ -4441,13 +4441,15 @@ int amdgpu_device_prepare(struct drm_device *dev)
- struct amdgpu_device *adev = drm_to_adev(dev);
- int i, r;
-
-+ amdgpu_choose_low_power_state(adev);
-+
- if (dev->switch_power_state == DRM_SWITCH_POWER_OFF)
- return 0;
-
- /* Evict the majority of BOs before starting suspend sequence */
- r = amdgpu_device_evict_resources(adev);
- if (r)
-- return r;
-+ goto unprepare;
-
- for (i = 0; i < adev->num_ip_blocks; i++) {
- if (!adev->ip_blocks[i].status.valid)
-@@ -4456,10 +4458,15 @@ int amdgpu_device_prepare(struct drm_device *dev)
- continue;
- r = adev->ip_blocks[i].version->funcs->prepare_suspend((void *)adev);
- if (r)
-- return r;
-+ goto unprepare;
- }
-
- return 0;
-+
-+unprepare:
-+ adev->in_s0ix = adev->in_s3 = false;
-+
-+ return r;
- }
-
- /**
diff --git a/drivers/hid/hid-rmi.c b/drivers/hid/hid-rmi.c
index d4af17fdba46..154f0403cbf4 100644
--- a/drivers/hid/hid-rmi.c
@@ -1147,7 +1066,7 @@ index a2bf6de11462..692a9e777d72 100644
* Intersil/Techwell TW686[4589]-based video capture cards have an empty (zero)
* class code. Fix it.
diff --git a/drivers/platform/x86/thinkpad_acpi.c b/drivers/platform/x86/thinkpad_acpi.c
-index c4895e9bc714..ceb22f8d8442 100644
+index 5ecd9d33250d..66be6eedb4ae 100644
--- a/drivers/platform/x86/thinkpad_acpi.c
+++ b/drivers/platform/x86/thinkpad_acpi.c
@@ -166,6 +166,7 @@ enum tpacpi_hkey_event_t {
@@ -1166,7 +1085,7 @@ index c4895e9bc714..ceb22f8d8442 100644
tpacpi_driver_event(hkey);
return true;
}
-@@ -11118,7 +11120,23 @@ static void tpacpi_driver_event(const unsigned int hkey_event)
+@@ -11119,7 +11121,23 @@ static void tpacpi_driver_event(const unsigned int hkey_event)
else
dytc_control_amt(!dytc_amt_active);
}
@@ -1192,7 +1111,7 @@ index c4895e9bc714..ceb22f8d8442 100644
static void hotkey_driver_event(const unsigned int scancode)
diff --git a/drivers/scsi/sd.c b/drivers/scsi/sd.c
-index 542a4bbb21bc..62161ceed2e2 100644
+index a12ff43ac8fd..4940d18fd72d 100644
--- a/drivers/scsi/sd.c
+++ b/drivers/scsi/sd.c
@@ -118,6 +118,14 @@ static const char *sd_cache_types[] = {
@@ -1210,7 +1129,7 @@ index 542a4bbb21bc..62161ceed2e2 100644
static void sd_set_flush_flag(struct scsi_disk *sdkp)
{
bool wc = false, fua = false;
-@@ -4048,6 +4056,8 @@ static int __init init_sd(void)
+@@ -4072,6 +4080,8 @@ static int __init init_sd(void)
goto err_out_class;
}
diff --git a/SOURCES/rog-ally-audio-fix.patch b/SOURCES/rog-ally-audio-fix.patch
index 07fb3bf..6951535 100644
--- a/SOURCES/rog-ally-audio-fix.patch
+++ b/SOURCES/rog-ally-audio-fix.patch
@@ -54,8 +54,8 @@ index 2b8f8fd52..f4933be4c 100644
struct cs35l41_prop_model {
const char *hid;
const char *ssid;
-@@ -413,7 +413,7 @@
- { "CSC3551", "10431663", generic_dsd_config },
+@@ -417,7 +417,7 @@
+ { "CSC3551", "104316A3", generic_dsd_config },
{ "CSC3551", "104316D3", generic_dsd_config },
{ "CSC3551", "104316F3", generic_dsd_config },
- { "CSC3551", "104317F3", generic_dsd_config },
diff --git a/SPECS/kernel.spec b/SPECS/kernel.spec
index c5a369c..a90a3f9 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.7.6
-%define specversion 6.7.6
+%define specrpmversion 6.7.7
+%define specversion 6.7.7
%define patchversion 6.7
%define pkgrelease 200
%define kversion 6
-%define tarfile_release 6.7.6
+%define tarfile_release 6.7.7
# This is needed to do merge window version magic
%define patchlevel 7
# This allows pkg_release to have configurable %%{?dist} tag
%define specrelease 201%{?buildid}%{?dist}
# This defines the kabi tarball version
-%define kabiversion 6.7.6
+%define kabiversion 6.7.7
# If this variable is set to 1, a bpf selftests build failure will cause a
# fatal kernel package build error
@@ -1219,6 +1219,19 @@ License: GPL-2.0-only AND (LGPL-2.1-only OR BSD-2-Clause)
This package includes libraries and header files needed for development
of applications which use perf library from kernel source.
+%package -n libperf-debuginfo
+Summary: Debug information for package libperf
+Group: Development/Debug
+Requires: %{name}-debuginfo-common-%{_target_cpu} = %{version}-%{release}
+AutoReqProv: no
+%description -n libperf-debuginfo
+This package provides debug information for the libperf package.
+
+# Note that this pattern only works right to match the .build-id
+# symlinks because of the trailing nonmatching alternation and
+# the leading .*, because of find-debuginfo.sh's buggy handling
+# of matching the pattern against the symlinks file.
+%{expand:%%global _find_debuginfo_opts %{?_find_debuginfo_opts} -p '.*%%{_libdir}/libperf.so(\.debug)?|XXX' -o libperf-debuginfo.list}
# with_libperf
%endif
@@ -3697,6 +3710,10 @@ fi\
%{_docdir}/libperf/html/libperf-counting.html
%{_docdir}/libperf/html/libperf-sampling.html
+%if %{with_debuginfo}
+%files -f libperf-debuginfo.list -n libperf-debuginfo
+%endif
+
# with_libperf
%endif
@@ -3977,8 +3994,13 @@ fi\
#
#
%changelog
-* Fri Mar 01 2024 Jan Drögehoff <sentrycraft123@gmail.com> - 6.7.6-201.fsync
-- kernel-fsync v6.7.6
+* Wed Mar 06 2024 Jan200101 <sentrycraft123@gmail.com> - 6.7.7-201.fsync
+- kernel-fsync v6.7.7
+
+* Fri Mar 01 2024 Augusto Caringi <acaringi@redhat.com> [6.7.7-0]
+- Add rhbz 2266309 to BugsFixed (Justin M. Forbes)
+- Add libperf-debuginfo subpackage (Justin M. Forbes)
+- Linux v6.7.7
* Fri Feb 23 2024 Justin M. Forbes <jforbes@fedoraproject.org> [6.7.6-0]
- Add CVE fix for 6.7.6 (Justin M. Forbes)
generated by cgit v1.2.3 (git 2.39.1) at 2024-12-27 06:45:24 +0000