From 609388a78e1b48317a62ae5871c2c1840cdeb357 Mon Sep 17 00:00:00 2001
From: CentOS Sources <bugs@centos.org>
Date: Fri, 12 Nov 2021 04:23:56 +0000
Subject: [PATCH] import tuna-0.16-4.el8

---
 ...hat-include-and-isolate-affects-IRQs.patch | 55 +++++++++++++++++++
 SPECS/tuna.spec                               |  9 ++-
 2 files changed, 63 insertions(+), 1 deletion(-)
 create mode 100644 SOURCES/tuna-Make-it-clear-that-include-and-isolate-affects-IRQs.patch

diff --git a/SOURCES/tuna-Make-it-clear-that-include-and-isolate-affects-IRQs.patch b/SOURCES/tuna-Make-it-clear-that-include-and-isolate-affects-IRQs.patch
new file mode 100644
index 0000000..e983ecc
--- /dev/null
+++ b/SOURCES/tuna-Make-it-clear-that-include-and-isolate-affects-IRQs.patch
@@ -0,0 +1,55 @@
+From 532739e58bc36df820a1742489c744e7589221d0 Mon Sep 17 00:00:00 2001
+From: John Kacur <jkacur@redhat.com>
+Date: Wed, 10 Nov 2021 15:58:44 -0500
+Subject: [PATCH] tuna: Make it clear that include and isolate affects IRQs in
+ help
+
+Make it clear in the online help (-h) and in the manpage
+that
+-i --isolate
+-I --include
+
+affects IRQs as well as threads
+
+Signed-off-by: John Kacur <jkacur@redhat.com>
+---
+ docs/tuna.8 | 4 ++--
+ tuna-cmd.py | 4 ++--
+ 2 files changed, 4 insertions(+), 4 deletions(-)
+
+diff --git a/docs/tuna.8 b/docs/tuna.8
+index b6431be5e117..bd6299b5a771 100644
+--- a/docs/tuna.8
++++ b/docs/tuna.8
+@@ -26,10 +26,10 @@ Apply changes described in profile
+ List preloaded profiles
+ .TP
+ \fB\-i\fR, \fB\-\-isolate\fR
+-Move all threads away from CPU\-LIST. Requires \fB\-c\fR or \fB-S\fR.
++Move all allowed threads and IRQs away from CPU\-LIST. Requires \fB\-c\fR or \fB-S\fR.
+ .TP
+ \fB\-I\fR, \fB\-\-include\fR
+-Allow all threads to run on CPU\-LIST. Requires \fB\-c\fR or \fB-S\fR.
++Allow all allowed threads and IRQs to run on CPU\-LIST. Requires \fB\-c\fR or \fB-S\fR.
+ .TP
+ \fB\-m\fR, \fB\-\-move\fR
+ Move selected entities to CPU\-LIST. Requires \fB\-c\fR and either \fB-t\fR or \fB-q\fR.
+diff --git a/tuna-cmd.py b/tuna-cmd.py
+index 46ce86efa036..d209a2e89493 100755
+--- a/tuna-cmd.py
++++ b/tuna-cmd.py
+@@ -63,9 +63,9 @@ def usage():
+                  _('Explicitly disable usage of perf in GUI for process view')))
+     print(fmt % ('-f, --filter',
+                  _('Display filter the selected entities')))
+-    print(fmt % ('-i, --isolate',               _('Move all threads away from %(cpulist)s') %
++    print(fmt % ('-i, --isolate',               _('Move all allowed threads and IRQs away from %(cpulist)s') %
+                  {"cpulist": _('CPU-LIST')}))
+-    print(fmt % ('-I, --include',               _('Allow all threads to run on %(cpulist)s') %
++    print(fmt % ('-I, --include',               _('Allow all allowed threads and IRQs to run on %(cpulist)s') %
+                  {"cpulist": _('CPU-LIST')}))
+     print(fmt % ('-K, --no_kthreads',
+                  _('Operations will not affect kernel threads')))
+-- 
+2.31.1
+
diff --git a/SPECS/tuna.spec b/SPECS/tuna.spec
index 23ddb46..4b522d6 100644
--- a/SPECS/tuna.spec
+++ b/SPECS/tuna.spec
@@ -1,6 +1,6 @@
 Name: tuna
 Version: 0.16
-Release: 3%{?dist}
+Release: 4%{?dist}
 License: GPLv2
 Summary: Application tuning GUI & command line utility
 Group: Applications/System
@@ -18,6 +18,7 @@ BuildRoot: %(mktemp -ud %{_tmppath}/%{name}-%{version}-%{release}-XXXXXX)
 # PATCHES
 Patch1: tuna-Add-distinction-between-spread-and-move-to-erro.patch
 Patch2: tuna-Print-warning-if-setting-affinity-results-in-EBUSY.patch
+Patch3: tuna-Make-it-clear-that-include-and-isolate-affects-IRQs.patch
 
 %description
 Provides interface for changing scheduler and IRQ tunables, at whole CPU and at
@@ -32,6 +33,7 @@ installed.
 %setup -q
 %patch1 -p1
 %patch2 -p1
+%patch3 -p1
 
 %build
 %{__python3} setup.py build
@@ -78,6 +80,11 @@ rm -rf %{buildroot}
 %{_datadir}/polkit-1/actions/org.tuna.policy
 
 %changelog
+* Wed Nov 10 2021 John Kacur <jkacur@redhat.com> - 0.16-4
+- Make it clear in online help and man pages that --include and --isolate
+  affect IRQs as well as threads
+Resolves: rhbz#1886804
+
 * Thu Oct 28 2021 John Kacur <jkacur@redhat.com> - 0.16-3
 - Print warning if setaffinity causes EBUSY and continue
 Resolves: rhbz#2018285