kernel release 5.17.6

6 files changed, 115 insertions, 14 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 52dd2061742e..64218e9c5c64 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,6 +1,6 @@
 pkgbase = linux-acs-manjaro
-	pkgver = 5.17.5
-	pkgrel = 2
+	pkgver = 5.17.6
+	pkgrel = 1
 	url = https://www.kernel.org/
 	arch = x86_64
 	license = GPL2
@@ -18,14 +18,15 @@ pkgbase = linux-acs-manjaro
 	makedepends = xz
 	options = !strip
 	source = https://www.kernel.org/pub/linux/kernel/v5.x/linux-5.17.tar.xz
-	source = https://www.kernel.org/pub/linux/kernel/v5.x/patch-5.17.5.xz
+	source = https://www.kernel.org/pub/linux/kernel/v5.x/patch-5.17.6.xz
 	source = config
 	source = 0101-ZEN_Add_sysctl_and_CONFIG_to_disallow_unprivileged_CLONE_NEWUSER.patch
 	source = 0102-random-treat_bootloader_trust_toggle_the_same_way_as_cpu_trust_toggle.patch
 	source = 0103-tick-Detect_and_fix_jiffies_update_stall.patch
-	source = 0104-tick-rcu-Stop_allowing_RCU_SOFTIRQ_in_idle.patch
-	source = 0105-lib-irq_poll-Declare_IRQ_POLL_softirq_vector_as_ksoftirqd-parking_safe.patch
-	source = 0106-NFSv4.1_provide_mount_option_to_toggle_trunking_discovery.patch
+	source = 0104-tick-rcu-Remove_obsolete_parameters.patch
+	source = 0105-tick-rcu-Stop_allowing_RCU_SOFTIRQ_in_idle.patch
+	source = 0106-lib-irq_poll-Declare_IRQ_POLL_softirq_vector_as_ksoftirqd-parking_safe.patch
+	source = 0107-NFSv4.1_provide_mount_option_to_toggle_trunking_discovery.patch
 	source = 0201-rtl_bt_fix_load_firmware.patch
 	source = 0301-revert-fbcon-remove-now-unusued-softback_lines-cursor-argument.patch
 	source = 0302-revert-fbcon-remove-no-op-fbcon_set_origin.patch
@@ -45,11 +46,12 @@ pkgbase = linux-acs-manjaro
 	source = 0413-bootsplash.gitpatch
 	source = 0999-acs.gitpatch
 	sha256sums = 555fef61dddb591a83d62dd04e252792f9af4ba9ef14683f64840e46fa20b1b1
-	sha256sums = 486bf7ca199a9b2ed1acbe47a0e000404e27228d4df14fb67ecbb229c9f7b965
+	sha256sums = 59d429643f4874cd24ed71c7d32881e3b337264b8d486c866703b3e96f9ae4cc
 	sha256sums = 84ca995ed4dc942643474b2730533f6815d03f817829d988c31f66e3c723fc24
 	sha256sums = f85b07d73b2f4ad8bb6b59ee6624b2dd06a03824fc7b00131a01df36c8d899fe
 	sha256sums = fc9223bf2d430ab1c122daada4f51d835a74f56c007c82842eeca3acd2d788be
 	sha256sums = f7eb15d563cdbb2c5d780559a1c9564ca8d2dd1ea79fc73a5cc8545278605dad
+	sha256sums = e17f4175131fd5224b438be00b55ac6496ec6c25ac2c6fcc3ec6f9a94e6b3221
 	sha256sums = ca5bb1ba3cb70020d712fa7f684de7d20d2bd6ad2efe6d92b578ab3b12749b04
 	sha256sums = 6a7cd911548f2b6618ce667f8b88cf1159e6b455e64b74d802710b4fe83ef0a2
 	sha256sums = 305e5f1844c5f919f8de1873e11b88dec305dfa8cc2245e75e7c157e01bc1443
diff --git a/0104-tick-rcu-Remove_obsolete_parameters.patch b/0104-tick-rcu-Remove_obsolete_parameters.patch
new file mode 100644
index 000000000000..4ea7c8a23234
--- /dev/null
+++ b/0104-tick-rcu-Remove_obsolete_parameters.patch
@@ -0,0 +1,98 @@
+From 77443af6c7ded4e8db85c76915086acbac29708b Mon Sep 17 00:00:00 2001
+From: Frederic Weisbecker <frederic@kernel.org>
+Date: Tue, 8 Feb 2022 17:16:33 +0100
+Subject: [PATCH] tick/rcu: Remove obsolete rcu_needs_cpu() parameters
+
+With the removal of CONFIG_RCU_FAST_NO_HZ, the parameters in
+rcu_needs_cpu() are not necessary anymore. Simply remove them.
+
+Signed-off-by: Frederic Weisbecker <frederic@kernel.org>
+Cc: Thomas Gleixner <tglx@linutronix.de>
+Cc: Peter Zijlstra <peterz@infradead.org>
+Cc: Paul E. McKenney <paulmck@kernel.org>
+Cc: Paul Menzel <pmenzel@molgen.mpg.de>
+---
+ include/linux/rcutiny.h  |  3 +--
+ include/linux/rcutree.h  |  2 +-
+ kernel/rcu/tree.c        |  3 +--
+ kernel/time/tick-sched.c | 10 ++++------
+ 4 files changed, 7 insertions(+), 11 deletions(-)
+
+diff --git a/include/linux/rcutiny.h b/include/linux/rcutiny.h
+index 858f4d429946d3..5fed476f977f63 100644
+--- a/include/linux/rcutiny.h
++++ b/include/linux/rcutiny.h
+@@ -64,9 +64,8 @@ static inline void rcu_softirq_qs(void)
+ 		rcu_tasks_qs(current, (preempt)); \
+ 	} while (0)
+
+-static inline int rcu_needs_cpu(u64 basemono, u64 *nextevt)
++static inline int rcu_needs_cpu(void)
+ {
+-	*nextevt = KTIME_MAX;
+ 	return 0;
+ }
+
+diff --git a/include/linux/rcutree.h b/include/linux/rcutree.h
+index 53209d66940010..6cc91291d07829 100644
+--- a/include/linux/rcutree.h
++++ b/include/linux/rcutree.h
+@@ -19,7 +19,7 @@
+
+ void rcu_softirq_qs(void);
+ void rcu_note_context_switch(bool preempt);
+-int rcu_needs_cpu(u64 basem, u64 *nextevt);
++int rcu_needs_cpu(void);
+ void rcu_cpu_stall_reset(void);
+
+ /*
+diff --git a/kernel/rcu/tree.c b/kernel/rcu/tree.c
+index 73a4c9d07b8651..5dae0da879ae29 100644
+--- a/kernel/rcu/tree.c
++++ b/kernel/rcu/tree.c
+@@ -1086,9 +1086,8 @@ void rcu_irq_enter_irqson(void)
+  * Just check whether or not this CPU has non-offloaded RCU callbacks
+  * queued.
+  */
+-int rcu_needs_cpu(u64 basemono, u64 *nextevt)
++int rcu_needs_cpu(void)
+ {
+-	*nextevt = KTIME_MAX;
+ 	return !rcu_segcblist_empty(&this_cpu_ptr(&rcu_data)->cblist) &&
+ 		!rcu_rdp_is_offloaded(this_cpu_ptr(&rcu_data));
+ }
+diff --git a/kernel/time/tick-sched.c b/kernel/time/tick-sched.c
+index 0578c9301b1794..4c62fa0f70f1c6 100644
+--- a/kernel/time/tick-sched.c
++++ b/kernel/time/tick-sched.c
+@@ -785,7 +785,7 @@ static inline bool local_timer_softirq_pending(void)
+
+ static ktime_t tick_nohz_next_event(struct tick_sched *ts, int cpu)
+ {
+-	u64 basemono, next_tick, next_tmr, next_rcu, delta, expires;
++	u64 basemono, next_tick, delta, expires;
+ 	unsigned long basejiff;
+ 	unsigned int seq;
+
+@@ -808,7 +808,7 @@ static ktime_t tick_nohz_next_event(struct tick_sched *ts, int cpu)
+ 	 * minimal delta which brings us back to this place
+ 	 * immediately. Lather, rinse and repeat...
+ 	 */
+-	if (rcu_needs_cpu(basemono, &next_rcu) || arch_needs_cpu() ||
++	if (rcu_needs_cpu() || arch_needs_cpu() ||
+ 	    irq_work_needs_cpu() || local_timer_softirq_pending()) {
+ 		next_tick = basemono + TICK_NSEC;
+ 	} else {
+@@ -819,10 +819,8 @@ static ktime_t tick_nohz_next_event(struct tick_sched *ts, int cpu)
+ 		 * disabled this also looks at the next expiring
+ 		 * hrtimer.
+ 		 */
+-		next_tmr = get_next_timer_interrupt(basejiff, basemono);
+-		ts->next_timer = next_tmr;
+-		/* Take the next rcu event into account */
+-		next_tick = next_rcu < next_tmr ? next_rcu : next_tmr;
++		next_tick = get_next_timer_interrupt(basejiff, basemono);
++		ts->next_timer = next_tick;
+ 	}
+
+ 	/*
diff --git a/0104-tick-rcu-Stop_allowing_RCU_SOFTIRQ_in_idle.patch b/0105-tick-rcu-Stop_allowing_RCU_SOFTIRQ_in_idle.patch
index 60cf7507aedf..60cf7507aedf 100644
--- a/0104-tick-rcu-Stop_allowing_RCU_SOFTIRQ_in_idle.patch
+++ b/0105-tick-rcu-Stop_allowing_RCU_SOFTIRQ_in_idle.patch
diff --git a/0105-lib-irq_poll-Declare_IRQ_POLL_softirq_vector_as_ksoftirqd-parking_safe.patch b/0106-lib-irq_poll-Declare_IRQ_POLL_softirq_vector_as_ksoftirqd-parking_safe.patch
index 64c483563d02..64c483563d02 100644
--- a/0105-lib-irq_poll-Declare_IRQ_POLL_softirq_vector_as_ksoftirqd-parking_safe.patch
+++ b/0106-lib-irq_poll-Declare_IRQ_POLL_softirq_vector_as_ksoftirqd-parking_safe.patch
diff --git a/0106-NFSv4.1_provide_mount_option_to_toggle_trunking_discovery.patch b/0107-NFSv4.1_provide_mount_option_to_toggle_trunking_discovery.patch
index 6a9f9fbfd3d8..6a9f9fbfd3d8 100644
--- a/0106-NFSv4.1_provide_mount_option_to_toggle_trunking_discovery.patch
+++ b/0107-NFSv4.1_provide_mount_option_to_toggle_trunking_discovery.patch
diff --git a/PKGBUILD b/PKGBUILD
index df115e19650c..6db26b536ede 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -8,14 +8,13 @@
 #
 # This is original kernel of Manjaro Linux + ACS patch
 
-
 pkgbase=linux-acs-manjaro
 pkgname=('linux-acs-manjaro' 'linux-acs-manjaro-headers')
 _kernelname=-ACS-MANJARO
 _basekernel=5.17
 _basever=517
-pkgver=5.17.5
-pkgrel=2
+pkgver=5.17.6
+pkgrel=1
 arch=('x86_64')
 url="https://www.kernel.org/"
 license=('GPL2')
@@ -39,9 +38,10 @@ source=("https://www.kernel.org/pub/linux/kernel/v5.x/linux-${_basekernel}.tar.x
         '0101-ZEN_Add_sysctl_and_CONFIG_to_disallow_unprivileged_CLONE_NEWUSER.patch'
         '0102-random-treat_bootloader_trust_toggle_the_same_way_as_cpu_trust_toggle.patch'
         '0103-tick-Detect_and_fix_jiffies_update_stall.patch'
-        '0104-tick-rcu-Stop_allowing_RCU_SOFTIRQ_in_idle.patch'
-        '0105-lib-irq_poll-Declare_IRQ_POLL_softirq_vector_as_ksoftirqd-parking_safe.patch'
-        '0106-NFSv4.1_provide_mount_option_to_toggle_trunking_discovery.patch'
+        '0104-tick-rcu-Remove_obsolete_parameters.patch'
+        '0105-tick-rcu-Stop_allowing_RCU_SOFTIRQ_in_idle.patch'
+        '0106-lib-irq_poll-Declare_IRQ_POLL_softirq_vector_as_ksoftirqd-parking_safe.patch'
+        '0107-NFSv4.1_provide_mount_option_to_toggle_trunking_discovery.patch'
         # MANJARO Patches
         '0201-rtl_bt_fix_load_firmware.patch'
         # Bootsplash
@@ -64,11 +64,12 @@ source=("https://www.kernel.org/pub/linux/kernel/v5.x/linux-${_basekernel}.tar.x
         # ACS override patch
         '0999-acs.gitpatch')
 sha256sums=('555fef61dddb591a83d62dd04e252792f9af4ba9ef14683f64840e46fa20b1b1'
-            '486bf7ca199a9b2ed1acbe47a0e000404e27228d4df14fb67ecbb229c9f7b965'
+            '59d429643f4874cd24ed71c7d32881e3b337264b8d486c866703b3e96f9ae4cc'
             '84ca995ed4dc942643474b2730533f6815d03f817829d988c31f66e3c723fc24'
             'f85b07d73b2f4ad8bb6b59ee6624b2dd06a03824fc7b00131a01df36c8d899fe'
             'fc9223bf2d430ab1c122daada4f51d835a74f56c007c82842eeca3acd2d788be'
             'f7eb15d563cdbb2c5d780559a1c9564ca8d2dd1ea79fc73a5cc8545278605dad'
+            'e17f4175131fd5224b438be00b55ac6496ec6c25ac2c6fcc3ec6f9a94e6b3221'
             'ca5bb1ba3cb70020d712fa7f684de7d20d2bd6ad2efe6d92b578ab3b12749b04'
             '6a7cd911548f2b6618ce667f8b88cf1159e6b455e64b74d802710b4fe83ef0a2'
             '305e5f1844c5f919f8de1873e11b88dec305dfa8cc2245e75e7c157e01bc1443'