aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--SOURCES/Patchlist.changelog3
-rw-r--r--SOURCES/patch-5.14-redhat.patch74
-rw-r--r--SOURCES/zen.patch9
-rwxr-xr-xSPECS/kernel.spec21
4 files changed, 64 insertions, 43 deletions
diff --git a/SOURCES/Patchlist.changelog b/SOURCES/Patchlist.changelog
index f10af9e..1a739b4 100644
--- a/SOURCES/Patchlist.changelog
+++ b/SOURCES/Patchlist.changelog
@@ -1,3 +1,6 @@
+https://gitlab.com/cki-project/kernel-ark/-/commit/be4d6e21716592aa0230e5ae6ecaedce6f36d9a5
+ be4d6e21716592aa0230e5ae6ecaedce6f36d9a5 Revert "block, bfq: honor already-setup queue merges"
+
https://gitlab.com/cki-project/kernel-ark/-/commit/b404ad1e47af572e35ac407260103356c961c627
b404ad1e47af572e35ac407260103356c961c627 thermal/drivers/int340x: Do not set a wrong tcc offset on resume
diff --git a/SOURCES/patch-5.14-redhat.patch b/SOURCES/patch-5.14-redhat.patch
index f0f2577..eb00458 100644
--- a/SOURCES/patch-5.14-redhat.patch
+++ b/SOURCES/patch-5.14-redhat.patch
@@ -6,6 +6,7 @@
arch/s390/kernel/ipl.c | 5 +
arch/s390/kernel/setup.c | 4 +
arch/x86/kernel/setup.c | 22 +-
+ block/bfq-iosched.c | 16 +-
crypto/rng.c | 73 ++-
drivers/acpi/apei/hest.c | 8 +
drivers/acpi/irq.c | 17 +-
@@ -23,7 +24,6 @@
drivers/iommu/iommu.c | 22 +
drivers/net/wireguard/main.c | 6 +
drivers/pci/quirks.c | 24 +
- .../int340x_thermal/processor_thermal_device.c | 5 +-
drivers/usb/core/hub.c | 7 +
fs/xfs/xfs_super.c | 8 -
include/linux/efi.h | 22 +-
@@ -52,7 +52,7 @@
tools/testing/selftests/bpf/progs/linked_maps2.c | 76 ---
tools/testing/selftests/bpf/progs/linked_vars1.c | 54 --
tools/testing/selftests/bpf/progs/linked_vars2.c | 55 ---
- 54 files changed, 658 insertions(+), 1497 deletions(-)
+ 54 files changed, 658 insertions(+), 1508 deletions(-)
diff --git a/arch/arm/Kconfig b/arch/arm/Kconfig
index 2fb7012c3246..47718b4f2f75 100644
@@ -176,7 +176,7 @@ index 6f0d2d4dea74..2f4d60b24155 100644
/* boot_command_line has been already set up in early.c */
*cmdline_p = boot_command_line;
diff --git a/arch/x86/kernel/setup.c b/arch/x86/kernel/setup.c
-index bff3a784aec5..4e13c3ee5723 100644
+index d103e8489ec1..16ef6bcceed2 100644
--- a/arch/x86/kernel/setup.c
+++ b/arch/x86/kernel/setup.c
@@ -19,6 +19,7 @@
@@ -187,7 +187,7 @@ index bff3a784aec5..4e13c3ee5723 100644
#include <linux/usb/xhci-dbgp.h>
#include <linux/static_call.h>
#include <linux/swiotlb.h>
-@@ -936,6 +937,13 @@ void __init setup_arch(char **cmdline_p)
+@@ -938,6 +939,13 @@ void __init setup_arch(char **cmdline_p)
if (efi_enabled(EFI_BOOT))
efi_init();
@@ -201,7 +201,7 @@ index bff3a784aec5..4e13c3ee5723 100644
dmi_setup();
/*
-@@ -1101,19 +1109,7 @@ void __init setup_arch(char **cmdline_p)
+@@ -1103,19 +1111,7 @@ void __init setup_arch(char **cmdline_p)
/* Allocate bigger log buffer */
setup_log_buf(1);
@@ -222,6 +222,47 @@ index bff3a784aec5..4e13c3ee5723 100644
reserve_initrd();
+diff --git a/block/bfq-iosched.c b/block/bfq-iosched.c
+index 3a1038b6eeb3..9360c65169ff 100644
+--- a/block/bfq-iosched.c
++++ b/block/bfq-iosched.c
+@@ -2662,15 +2662,6 @@ bfq_setup_merge(struct bfq_queue *bfqq, struct bfq_queue *new_bfqq)
+ * are likely to increase the throughput.
+ */
+ bfqq->new_bfqq = new_bfqq;
+- /*
+- * The above assignment schedules the following redirections:
+- * each time some I/O for bfqq arrives, the process that
+- * generated that I/O is disassociated from bfqq and
+- * associated with new_bfqq. Here we increases new_bfqq->ref
+- * in advance, adding the number of processes that are
+- * expected to be associated with new_bfqq as they happen to
+- * issue I/O.
+- */
+ new_bfqq->ref += process_refs;
+ return new_bfqq;
+ }
+@@ -2733,10 +2724,6 @@ bfq_setup_cooperator(struct bfq_data *bfqd, struct bfq_queue *bfqq,
+ {
+ struct bfq_queue *in_service_bfqq, *new_bfqq;
+
+- /* if a merge has already been setup, then proceed with that first */
+- if (bfqq->new_bfqq)
+- return bfqq->new_bfqq;
+-
+ /*
+ * Check delayed stable merge for rotational or non-queueing
+ * devs. For this branch to be executed, bfqq must not be
+@@ -2838,6 +2825,9 @@ bfq_setup_cooperator(struct bfq_data *bfqd, struct bfq_queue *bfqq,
+ if (bfq_too_late_for_merging(bfqq))
+ return NULL;
+
++ if (bfqq->new_bfqq)
++ return bfqq->new_bfqq;
++
+ if (!io_struct || unlikely(bfqq == &bfqd->oom_bfqq))
+ return NULL;
+
diff --git a/crypto/rng.c b/crypto/rng.c
index fea082b25fe4..50a9d040bed1 100644
--- a/crypto/rng.c
@@ -1317,29 +1358,6 @@ index 8c3c1ef92171..18431236ab9f 100644
/*
* Intersil/Techwell TW686[4589]-based video capture cards have an empty (zero)
* class code. Fix it.
-diff --git a/drivers/thermal/intel/int340x_thermal/processor_thermal_device.c b/drivers/thermal/intel/int340x_thermal/processor_thermal_device.c
-index 0f0038af2ad4..fb64acfd5e07 100644
---- a/drivers/thermal/intel/int340x_thermal/processor_thermal_device.c
-+++ b/drivers/thermal/intel/int340x_thermal/processor_thermal_device.c
-@@ -107,7 +107,7 @@ static int tcc_offset_update(unsigned int tcc)
- return 0;
- }
-
--static unsigned int tcc_offset_save;
-+static int tcc_offset_save = -1;
-
- static ssize_t tcc_offset_degree_celsius_store(struct device *dev,
- struct device_attribute *attr, const char *buf,
-@@ -352,7 +352,8 @@ int proc_thermal_resume(struct device *dev)
- proc_dev = dev_get_drvdata(dev);
- proc_thermal_read_ppcc(proc_dev);
-
-- tcc_offset_update(tcc_offset_save);
-+ if (tcc_offset_save >= 0)
-+ tcc_offset_update(tcc_offset_save);
-
- return 0;
- }
diff --git a/drivers/usb/core/hub.c b/drivers/usb/core/hub.c
index 86658a81d284..5647f4756e97 100644
--- a/drivers/usb/core/hub.c
diff --git a/SOURCES/zen.patch b/SOURCES/zen.patch
index a6f87d4..f110b7a 100644
--- a/SOURCES/zen.patch
+++ b/SOURCES/zen.patch
@@ -553,15 +553,12 @@ diff --git a/drivers/cpufreq/intel_pstate.c b/drivers/cpufreq/intel_pstate.c
index cb95da6..a422e3f 100644
--- a/drivers/cpufreq/intel_pstate.c
+++ b/drivers/cpufreq/intel_pstate.c
-@@ -3129,6 +3129,8 @@ static int __init intel_pstate_setup(char *str)
- pr_info("HWP disabled\n");
+@@ -3367,6 +3367,8 @@
+ if (!strcmp(str, "no_hwp"))
no_hwp = 1;
- }
+
+ if (!strcmp(str, "enable"))
+ no_load = 0;
if (!strcmp(str, "force"))
force_load = 1;
if (!strcmp(str, "hwp_only"))
---
-2.28.0
-
diff --git a/SPECS/kernel.spec b/SPECS/kernel.spec
index 9be0756..958efc4 100755
--- a/SPECS/kernel.spec
+++ b/SPECS/kernel.spec
@@ -80,7 +80,7 @@ Summary: The Linux kernel
# the --with-release option overrides this setting.)
%define debugbuildsenabled 1
-%global distro_build 200
+%global distro_build 300
%if 0%{?fedora}
%define secure_boot_arch x86_64
@@ -123,15 +123,15 @@ Summary: The Linux kernel
# The kernel tarball/base version
%define kversion 5.14
-%define rpmversion 5.14.8
+%define rpmversion 5.14.9
%define patchversion 5.14
-%define pkgrelease 201
+%define pkgrelease 301
# This is needed to do merge window version magic
%define patchlevel 14
# allow pkg_release to have configurable %%{?dist} tag
-%define specrelease 201%{?buildid}%{?dist}
+%define specrelease 301%{?buildid}%{?dist}
%define pkg_release %{specrelease}
@@ -672,7 +672,7 @@ BuildRequires: lld
# exact git commit you can run
#
# xzcat -qq ${TARBALL} | git get-tar-commit-id
-Source0: linux-5.14.8.tar.xz
+Source0: linux-5.14.9.tar.xz
Source1: Makefile.rhelver
@@ -1366,8 +1366,8 @@ ApplyOptionalPatch()
fi
}
-%setup -q -n kernel-5.14.8 -c
-mv linux-5.14.8 linux-%{KVERREL}
+%setup -q -n kernel-5.14.9 -c
+mv linux-5.14.9 linux-%{KVERREL}
cd linux-%{KVERREL}
cp -a %{SOURCE1} .
@@ -2974,8 +2974,11 @@ fi
#
#
%changelog
-* Sun Oct 03 2021 Jan Drögehoff <sentrycraft123@gmail.com> - 5.14.8-201.fsync
-- Linux v5.14.8 futex2 zen openrgb
+* Wed Oct 06 2021 Jan Drögehoff <sentrycraft123@gmail.com> - 5.14.9-301.fsync
+- Linux v5.14.9 futex2 zen openrgb
+
+* Thu Sep 30 2021 Justin M. Forbes <jforbes@fedoraproject.org> [5.14.9-0]
+- Revert "block, bfq: honor already-setup queue merges" (Jens Axboe)
* Mon Sep 27 2021 Justin M. Forbes <jforbes@fedoraproject.org> [5.14.8-0]
- thermal/drivers/int340x: Do not set a wrong tcc offset on resume (Antoine Tenart)
generated by cgit v1.2.3 (git 2.39.1) at 2024-12-30 19:56:20 +0000