Add patch now that the rhel8.2 hack is gone from wg's qemu makefileHEADmaster

Signed-off-by: Jason A. Donenfeld <Jason@zx2c4.com>

34 files changed, 133 insertions, 104 deletions

diff --git a/patches/0001-x86-spinlock_types-use-u16-__ticket_t-always.patch b/patches/0001-x86-spinlock_types-use-u16-__ticket_t-always.patch
index 5b79c66..b003057 100644
--- a/patches/0001-x86-spinlock_types-use-u16-__ticket_t-always.patch
+++ b/patches/0001-x86-spinlock_types-use-u16-__ticket_t-always.patch
@@ -1,7 +1,7 @@
 From de6dee868338291ad1640ec1c211a633dc45b479 Mon Sep 17 00:00:00 2001
 From: "Jason A. Donenfeld" <Jason@zx2c4.com>
 Date: Sun, 24 May 2020 18:44:05 -0600
-Subject: [PATCH 01/33] x86: spinlock_types: use u16 __ticket_t always
+Subject: [PATCH 01/34] x86: spinlock_types: use u16 __ticket_t always
 
 While it'd be nice to have the smaller type for low-CPU builds, the
 generic spinlock include hardcodes this at u16 for kABI purposes. For
@@ -14,7 +14,7 @@ Signed-off-by: Jason A. Donenfeld <Jason@zx2c4.com>
  1 file changed, 5 deletions(-)
 
 diff --git a/arch/x86/include/asm/spinlock_types.h b/arch/x86/include/asm/spinlock_types.h
-index 93560ed86b79..371827863791 100644
+index 93560ed86b7..37182786379 100644
 --- a/arch/x86/include/asm/spinlock_types.h
 +++ b/arch/x86/include/asm/spinlock_types.h
 @@ -11,13 +11,8 @@
@@ -32,5 +32,5 @@ index 93560ed86b79..371827863791 100644
  #define TICKET_LOCK_INC	((__ticket_t)__TICKET_LOCK_INC)
  
 -- 
-2.28.0
+2.29.1
 
diff --git a/patches/0002-sched-sched_statistics-is-only-defined-for-CONFIG_SC.patch b/patches/0002-sched-sched_statistics-is-only-defined-for-CONFIG_SC.patch
index 9847de4..555bec5 100644
--- a/patches/0002-sched-sched_statistics-is-only-defined-for-CONFIG_SC.patch
+++ b/patches/0002-sched-sched_statistics-is-only-defined-for-CONFIG_SC.patch
@@ -1,7 +1,7 @@
 From 66b33080b58f9f50a232db027e8c1f1b17180589 Mon Sep 17 00:00:00 2001
 From: "Jason A. Donenfeld" <Jason@zx2c4.com>
 Date: Sun, 24 May 2020 18:46:30 -0600
-Subject: [PATCH 02/33] sched: sched_statistics is only defined for
+Subject: [PATCH 02/34] sched: sched_statistics is only defined for
  CONFIG_SCHEDSTATS systems
 
 Keeping this here results in a compile error on !CONFIG_SCHEDSTATS
@@ -13,7 +13,7 @@ Signed-off-by: Jason A. Donenfeld <Jason@zx2c4.com>
  1 file changed, 2 insertions(+)
 
 diff --git a/include/linux/sched.h b/include/linux/sched.h
-index 18d480780025..a3eac0d783e6 100644
+index 18d48078002..a3eac0d783e 100644
 --- a/include/linux/sched.h
 +++ b/include/linux/sched.h
 @@ -1864,7 +1864,9 @@ struct task_struct {
@@ -27,5 +27,5 @@ index 18d480780025..a3eac0d783e6 100644
  	struct prev_cputime prev_cputime;
  	struct vtime vtime;
 -- 
-2.28.0
+2.29.1
 
diff --git a/patches/0003-x86-pud_trans_huge-is-already-defined-generically-fo.patch b/patches/0003-x86-pud_trans_huge-is-already-defined-generically-fo.patch
index 4052012..1166ea6 100644
--- a/patches/0003-x86-pud_trans_huge-is-already-defined-generically-fo.patch
+++ b/patches/0003-x86-pud_trans_huge-is-already-defined-generically-fo.patch
@@ -1,7 +1,7 @@
 From eb9589e5c7ddcf59702ef7b105eb3a1ef065887a Mon Sep 17 00:00:00 2001
 From: "Jason A. Donenfeld" <Jason@zx2c4.com>
 Date: Sun, 24 May 2020 18:48:24 -0600
-Subject: [PATCH 03/33] x86: pud_trans_huge is already defined generically for
+Subject: [PATCH 03/34] x86: pud_trans_huge is already defined generically for
  the nop inline
 
 When pud_trans_huge is not required, the stub function is already
@@ -17,7 +17,7 @@ Signed-off-by: Jason A. Donenfeld <Jason@zx2c4.com>
  2 files changed, 13 deletions(-)
 
 diff --git a/arch/x86/include/asm/pgtable.h b/arch/x86/include/asm/pgtable.h
-index 88926233768f..e39cd5a8bd52 100644
+index 88926233768..e39cd5a8bd5 100644
 --- a/arch/x86/include/asm/pgtable.h
 +++ b/arch/x86/include/asm/pgtable.h
 @@ -1101,15 +1101,6 @@ static inline int pmd_write(pmd_t pmd)
@@ -37,7 +37,7 @@ index 88926233768f..e39cd5a8bd52 100644
  static inline pmd_t pmdp_get_and_clear(struct mm_struct *mm, unsigned long addr,
  				       pmd_t *pmdp)
 diff --git a/include/asm-generic/pgtable.h b/include/asm-generic/pgtable.h
-index 4cea7a5f7095..16a4514b4fec 100644
+index 4cea7a5f709..16a4514b4fe 100644
 --- a/include/asm-generic/pgtable.h
 +++ b/include/asm-generic/pgtable.h
 @@ -629,10 +629,6 @@ static inline int pmd_trans_splitting(pmd_t pmd)
@@ -52,5 +52,5 @@ index 4cea7a5f7095..16a4514b4fec 100644
  {
  	return 0;
 -- 
-2.28.0
+2.29.1
 
diff --git a/patches/0004-huge_mm-remove-trailing-semicolon.patch b/patches/0004-huge_mm-remove-trailing-semicolon.patch
index a29b8b3..e29bb7f 100644
--- a/patches/0004-huge_mm-remove-trailing-semicolon.patch
+++ b/patches/0004-huge_mm-remove-trailing-semicolon.patch
@@ -1,7 +1,7 @@
 From 39a444e91c578b65bf238982d1782d93c6654676 Mon Sep 17 00:00:00 2001
 From: "Jason A. Donenfeld" <Jason@zx2c4.com>
 Date: Sun, 24 May 2020 18:50:19 -0600
-Subject: [PATCH 04/33] huge_mm: remove trailing semicolon
+Subject: [PATCH 04/34] huge_mm: remove trailing semicolon
 
 The trialing semicolon before the function body is invalid C and
 resulted in a compiler error. This was probably due to a copy and paste
@@ -13,7 +13,7 @@ Signed-off-by: Jason A. Donenfeld <Jason@zx2c4.com>
  1 file changed, 1 insertion(+), 1 deletion(-)
 
 diff --git a/include/linux/huge_mm.h b/include/linux/huge_mm.h
-index 12d5f1aec45e..b608e46a3b50 100644
+index 12d5f1aec45..b608e46a3b5 100644
 --- a/include/linux/huge_mm.h
 +++ b/include/linux/huge_mm.h
 @@ -362,7 +362,7 @@ static inline int pud_trans_huge_lock(pud_t *pud, struct vm_area_struct *vma,
@@ -26,5 +26,5 @@ index 12d5f1aec45e..b608e46a3b50 100644
  	return 0;
  }
 -- 
-2.28.0
+2.29.1
 
diff --git a/patches/0005-mm-pass-in-correct-zero-gup_flags-argument.patch b/patches/0005-mm-pass-in-correct-zero-gup_flags-argument.patch
index 06c36fb..309bba7 100644
--- a/patches/0005-mm-pass-in-correct-zero-gup_flags-argument.patch
+++ b/patches/0005-mm-pass-in-correct-zero-gup_flags-argument.patch
@@ -1,7 +1,7 @@
 From 0d92adcd4d33f8194f03cd64667f01f42752125e Mon Sep 17 00:00:00 2001
 From: "Jason A. Donenfeld" <Jason@zx2c4.com>
 Date: Sun, 24 May 2020 18:51:36 -0600
-Subject: [PATCH 05/33] mm: pass in correct zero gup_flags argument
+Subject: [PATCH 05/34] mm: pass in correct zero gup_flags argument
 
 The outer-function, get_user_pages_longterm, does not take a gup_flags
 argument, which means we should pass it onwards here as 0, rather than
@@ -13,7 +13,7 @@ Signed-off-by: Jason A. Donenfeld <Jason@zx2c4.com>
  1 file changed, 1 insertion(+), 1 deletion(-)
 
 diff --git a/include/linux/mm.h b/include/linux/mm.h
-index 6832964c2934..0b9b3545c657 100644
+index 6832964c293..0b9b3545c65 100644
 --- a/include/linux/mm.h
 +++ b/include/linux/mm.h
 @@ -1422,7 +1422,7 @@ static inline long get_user_pages_longterm(unsigned long start,
@@ -26,5 +26,5 @@ index 6832964c2934..0b9b3545c657 100644
  #endif /* CONFIG_FS_DAX */
  
 -- 
-2.28.0
+2.29.1
 
diff --git a/patches/0006-x86-do-not-evaluate-sometimes-undefined-_PAGE_BIT_SW.patch b/patches/0006-x86-do-not-evaluate-sometimes-undefined-_PAGE_BIT_SW.patch
index 3144a8a..dc1e42a 100644
--- a/patches/0006-x86-do-not-evaluate-sometimes-undefined-_PAGE_BIT_SW.patch
+++ b/patches/0006-x86-do-not-evaluate-sometimes-undefined-_PAGE_BIT_SW.patch
@@ -1,7 +1,7 @@
 From 58d4fb961436e227168d60812e8b5d023f6eead7 Mon Sep 17 00:00:00 2001
 From: "Jason A. Donenfeld" <Jason@zx2c4.com>
 Date: Sun, 24 May 2020 18:53:11 -0600
-Subject: [PATCH 06/33] x86: do not evaluate sometimes-undefined
+Subject: [PATCH 06/34] x86: do not evaluate sometimes-undefined
  _PAGE_BIT_SWP_SOFT_DIRTY
 
 In certain configurations, _PAGE_BIT_SWP_SOFT_DIRTY is undefined,
@@ -14,7 +14,7 @@ Signed-off-by: Jason A. Donenfeld <Jason@zx2c4.com>
  1 file changed, 1 insertion(+), 1 deletion(-)
 
 diff --git a/arch/x86/include/asm/pgtable_types.h b/arch/x86/include/asm/pgtable_types.h
-index e857a2c26004..c47e99e1be90 100644
+index e857a2c2600..c47e99e1be9 100644
 --- a/arch/x86/include/asm/pgtable_types.h
 +++ b/arch/x86/include/asm/pgtable_types.h
 @@ -133,7 +133,7 @@
@@ -27,5 +27,5 @@ index e857a2c26004..c47e99e1be90 100644
  #endif
  #if _PAGE_BIT_FILE == _PAGE_BIT_PROTNONE
 -- 
-2.28.0
+2.29.1
 
diff --git a/patches/0007-mm-include-sched.h-for-task_struct-usage.patch b/patches/0007-mm-include-sched.h-for-task_struct-usage.patch
index 8ff1fd6..136ae10 100644
--- a/patches/0007-mm-include-sched.h-for-task_struct-usage.patch
+++ b/patches/0007-mm-include-sched.h-for-task_struct-usage.patch
@@ -1,7 +1,7 @@
 From 80da0f64facbff694801fbae4f299b7bd0ac8725 Mon Sep 17 00:00:00 2001
 From: "Jason A. Donenfeld" <Jason@zx2c4.com>
 Date: Sun, 24 May 2020 18:55:05 -0600
-Subject: [PATCH 07/33] mm: include sched.h for task_struct usage
+Subject: [PATCH 07/34] mm: include sched.h for task_struct usage
 
 Functions in here dereference current, which means we need to include
 linux/sched.h to avoid compilation errors.
@@ -12,7 +12,7 @@ Signed-off-by: Jason A. Donenfeld <Jason@zx2c4.com>
  1 file changed, 1 insertion(+)
 
 diff --git a/include/linux/mm.h b/include/linux/mm.h
-index 0b9b3545c657..7dfb104b53d7 100644
+index 0b9b3545c65..7dfb104b53d 100644
 --- a/include/linux/mm.h
 +++ b/include/linux/mm.h
 @@ -24,6 +24,7 @@
@@ -24,5 +24,5 @@ index 0b9b3545c657..7dfb104b53d7 100644
  struct mempolicy;
  struct anon_vma;
 -- 
-2.28.0
+2.29.1
 
diff --git a/patches/0008-pgtable-properly-ifdef-out-second-definition-of-pud_.patch b/patches/0008-pgtable-properly-ifdef-out-second-definition-of-pud_.patch
index 43c0dcf..87ca658 100644
--- a/patches/0008-pgtable-properly-ifdef-out-second-definition-of-pud_.patch
+++ b/patches/0008-pgtable-properly-ifdef-out-second-definition-of-pud_.patch
@@ -1,7 +1,7 @@
 From ae48ab16817e5faf4b2cc5bdd358eae88ea09db4 Mon Sep 17 00:00:00 2001
 From: "Jason A. Donenfeld" <Jason@zx2c4.com>
 Date: Sun, 24 May 2020 18:57:32 -0600
-Subject: [PATCH 08/33] pgtable: properly ifdef out second definition of
+Subject: [PATCH 08/34] pgtable: properly ifdef out second definition of
  pud_write
 
 There's a conflicting definition in include/linux/pgtable.h, which is
@@ -14,7 +14,7 @@ Signed-off-by: Jason A. Donenfeld <Jason@zx2c4.com>
  1 file changed, 1 insertion(+), 1 deletion(-)
 
 diff --git a/include/asm-generic/pgtable.h b/include/asm-generic/pgtable.h
-index 16a4514b4fec..8c9a8d63692a 100644
+index 16a4514b4fe..8c9a8d63692 100644
 --- a/include/asm-generic/pgtable.h
 +++ b/include/asm-generic/pgtable.h
 @@ -640,7 +640,7 @@ static inline int pmd_write(pmd_t pmd)
@@ -27,5 +27,5 @@ index 16a4514b4fec..8c9a8d63692a 100644
  {
  	BUG();
 -- 
-2.28.0
+2.29.1
 
diff --git a/patches/0009-x86-fault-do-not-define-trace-function-for-CONFIG_TR.patch b/patches/0009-x86-fault-do-not-define-trace-function-for-CONFIG_TR.patch
index 3b24730..23cdfb2 100644
--- a/patches/0009-x86-fault-do-not-define-trace-function-for-CONFIG_TR.patch
+++ b/patches/0009-x86-fault-do-not-define-trace-function-for-CONFIG_TR.patch
@@ -1,7 +1,7 @@
 From 210cd60d993e023a293b403eb4886dfb8c8acbc9 Mon Sep 17 00:00:00 2001
 From: "Jason A. Donenfeld" <Jason@zx2c4.com>
 Date: Sun, 24 May 2020 19:01:48 -0600
-Subject: [PATCH 09/33] x86: fault: do not define trace function for
+Subject: [PATCH 09/34] x86: fault: do not define trace function for
  !CONFIG_TRACING
 
 Do not define the page fault tracing function for !CONFIG_TRACING, when
@@ -14,7 +14,7 @@ Signed-off-by: Jason A. Donenfeld <Jason@zx2c4.com>
  1 file changed, 2 insertions(+)
 
 diff --git a/arch/x86/mm/fault.c b/arch/x86/mm/fault.c
-index f7d79eae0b13..4698dedc7071 100644
+index f7d79eae0b1..4698dedc707 100644
 --- a/arch/x86/mm/fault.c
 +++ b/arch/x86/mm/fault.c
 @@ -1379,6 +1379,7 @@ static void trace_page_fault_entries(struct pt_regs *regs,
@@ -31,5 +31,5 @@ index f7d79eae0b13..4698dedc7071 100644
  }
 +#endif
 -- 
-2.28.0
+2.29.1
 
diff --git a/patches/0010-fs-only-call-out-to-emergency_thaw_bdev-with-CONFIG_.patch b/patches/0010-fs-only-call-out-to-emergency_thaw_bdev-with-CONFIG_.patch
index d5a9ec2..d22d674 100644
--- a/patches/0010-fs-only-call-out-to-emergency_thaw_bdev-with-CONFIG_.patch
+++ b/patches/0010-fs-only-call-out-to-emergency_thaw_bdev-with-CONFIG_.patch
@@ -1,7 +1,7 @@
 From d1ad32d88546dbd9681b3ad9eaa47010ca6133b3 Mon Sep 17 00:00:00 2001
 From: "Jason A. Donenfeld" <Jason@zx2c4.com>
 Date: Sun, 24 May 2020 19:04:26 -0600
-Subject: [PATCH 10/33] fs: only call out to emergency_thaw_bdev with
+Subject: [PATCH 10/34] fs: only call out to emergency_thaw_bdev with
  CONFIG_BLOCK
 
 The function emergency_thaw_bdev is only declared when CONFIG_BLOCK is
@@ -14,7 +14,7 @@ Signed-off-by: Jason A. Donenfeld <Jason@zx2c4.com>
  1 file changed, 2 insertions(+)
 
 diff --git a/fs/super.c b/fs/super.c
-index 500fdcfd7ef6..8bf6b7eb023b 100644
+index 500fdcfd7ef..8bf6b7eb023 100644
 --- a/fs/super.c
 +++ b/fs/super.c
 @@ -856,7 +856,9 @@ static void do_thaw_all(struct work_struct *work)
@@ -28,5 +28,5 @@ index 500fdcfd7ef6..8bf6b7eb023b 100644
  		} else {
  			up_write(&sb->s_umount);
 -- 
-2.28.0
+2.29.1
 
diff --git a/patches/0011-fs-forward-declare-struct-bio-to-avoid-compiler-warn.patch b/patches/0011-fs-forward-declare-struct-bio-to-avoid-compiler-warn.patch
index d9f3f0d..53252c5 100644
--- a/patches/0011-fs-forward-declare-struct-bio-to-avoid-compiler-warn.patch
+++ b/patches/0011-fs-forward-declare-struct-bio-to-avoid-compiler-warn.patch
@@ -1,7 +1,7 @@
 From 09529b5e55ded368d3bfd5391900349c5607e5bf Mon Sep 17 00:00:00 2001
 From: "Jason A. Donenfeld" <Jason@zx2c4.com>
 Date: Sun, 24 May 2020 19:06:05 -0600
-Subject: [PATCH 11/33] fs: forward declare struct bio to avoid compiler
+Subject: [PATCH 11/34] fs: forward declare struct bio to avoid compiler
  warning
 
 Otherwise the compiler warns because the first usage of this struct is
@@ -13,7 +13,7 @@ Signed-off-by: Jason A. Donenfeld <Jason@zx2c4.com>
  1 file changed, 1 insertion(+)
 
 diff --git a/fs/internal.h b/fs/internal.h
-index cf73dc065f85..9c633659d4ba 100644
+index cf73dc065f8..9c633659d4b 100644
 --- a/fs/internal.h
 +++ b/fs/internal.h
 @@ -18,6 +18,7 @@ struct iomap_ops;
@@ -25,5 +25,5 @@ index cf73dc065f85..9c633659d4ba 100644
  /*
   * block_dev.c
 -- 
-2.28.0
+2.29.1
 
diff --git a/patches/0012-sched-sched_info-requires-CONFIG_SCHEDSTATS.patch b/patches/0012-sched-sched_info-requires-CONFIG_SCHEDSTATS.patch
index d61dd21..3184375 100644
--- a/patches/0012-sched-sched_info-requires-CONFIG_SCHEDSTATS.patch
+++ b/patches/0012-sched-sched_info-requires-CONFIG_SCHEDSTATS.patch
@@ -1,7 +1,7 @@
 From 081f0cca55dbb1e577ac66ccd018052f6448451d Mon Sep 17 00:00:00 2001
 From: "Jason A. Donenfeld" <Jason@zx2c4.com>
 Date: Sun, 24 May 2020 19:08:57 -0600
-Subject: [PATCH 12/33] sched: sched_info requires CONFIG_SCHEDSTATS
+Subject: [PATCH 12/34] sched: sched_info requires CONFIG_SCHEDSTATS
 
 Because the sched_info symbol is only defined for CONFIG_SCHEDSTATS
 kernels, we shouldn't include it inside other structs in this case.
@@ -12,7 +12,7 @@ Signed-off-by: Jason A. Donenfeld <Jason@zx2c4.com>
  1 file changed, 2 insertions(+), 1 deletion(-)
 
 diff --git a/kernel/sched/sched.h b/kernel/sched/sched.h
-index f5842fb36718..ac44dd36e782 100644
+index f5842fb3671..ac44dd36e78 100644
 --- a/kernel/sched/sched.h
 +++ b/kernel/sched/sched.h
 @@ -733,11 +733,12 @@ struct rq {
@@ -30,5 +30,5 @@ index f5842fb36718..ac44dd36e782 100644
  	/* sys_sched_yield() stats */
  	unsigned int yld_count;
 -- 
-2.28.0
+2.29.1
 
diff --git a/patches/0013-workqueue-remove-call-to-non-existent-pr_cont_pool_i.patch b/patches/0013-workqueue-remove-call-to-non-existent-pr_cont_pool_i.patch
index a974950..933884b 100644
--- a/patches/0013-workqueue-remove-call-to-non-existent-pr_cont_pool_i.patch
+++ b/patches/0013-workqueue-remove-call-to-non-existent-pr_cont_pool_i.patch
@@ -1,7 +1,7 @@
 From ecc84438f2032d302f2ecabb53676d79eb0669cb Mon Sep 17 00:00:00 2001
 From: "Jason A. Donenfeld" <Jason@zx2c4.com>
 Date: Sun, 24 May 2020 19:09:50 -0600
-Subject: [PATCH 13/33] workqueue: remove call to non-existent
+Subject: [PATCH 13/34] workqueue: remove call to non-existent
  pr_cont_pool_info
 
 The function pr_cont_pool_info is called, but does not exist anywhere in
@@ -14,7 +14,7 @@ Signed-off-by: Jason A. Donenfeld <Jason@zx2c4.com>
  1 file changed, 1 deletion(-)
 
 diff --git a/kernel/workqueue.c b/kernel/workqueue.c
-index 5379e3f1af70..34830e034038 100644
+index 5379e3f1af7..34830e03403 100644
 --- a/kernel/workqueue.c
 +++ b/kernel/workqueue.c
 @@ -5338,7 +5338,6 @@ static void wq_watchdog_timer_fn(unsigned long data)
@@ -26,5 +26,5 @@ index 5379e3f1af70..34830e034038 100644
  				jiffies_to_msecs(jiffies - pool_ts) / 1000);
  		}
 -- 
-2.28.0
+2.29.1
 
diff --git a/patches/0014-mm-oom_kill-task_uid-is-a-direct-uid_t.patch b/patches/0014-mm-oom_kill-task_uid-is-a-direct-uid_t.patch
index 5e10667..6646d4e 100644
--- a/patches/0014-mm-oom_kill-task_uid-is-a-direct-uid_t.patch
+++ b/patches/0014-mm-oom_kill-task_uid-is-a-direct-uid_t.patch
@@ -1,7 +1,7 @@
 From b13f03d8cd55339f2f634e6fe5e1e136d4d0084f Mon Sep 17 00:00:00 2001
 From: "Jason A. Donenfeld" <Jason@zx2c4.com>
 Date: Wed, 30 Sep 2020 16:26:51 +0200
-Subject: [PATCH 14/33] mm: oom_kill: task_uid is a direct uid_t
+Subject: [PATCH 14/34] mm: oom_kill: task_uid is a direct uid_t
 
 This is code that presumes that uid_t is some sort of union type, which
 it isn't, so the val member doesn't exist. Instead, use the return value
@@ -13,7 +13,7 @@ Signed-off-by: Jason A. Donenfeld <Jason@zx2c4.com>
  1 file changed, 1 insertion(+), 1 deletion(-)
 
 diff --git a/mm/oom_kill.c b/mm/oom_kill.c
-index b7599778fa18..ce0a46393308 100644
+index b7599778fa1..ce0a4639330 100644
 --- a/mm/oom_kill.c
 +++ b/mm/oom_kill.c
 @@ -529,7 +529,7 @@ void oom_kill_process(struct task_struct *p, gfp_t gfp_mask, int order,
@@ -26,5 +26,5 @@ index b7599778fa18..ce0a46393308 100644
  		K(get_mm_counter(victim->mm, MM_FILEPAGES)),
  		K(get_mm_counter(victim->mm, MM_SHMEMPAGES)));
 -- 
-2.28.0
+2.29.1
 
diff --git a/patches/0015-crash_dump-always-include-UAPI-header.patch b/patches/0015-crash_dump-always-include-UAPI-header.patch
index dc8b5f0..7bbebd5 100644
--- a/patches/0015-crash_dump-always-include-UAPI-header.patch
+++ b/patches/0015-crash_dump-always-include-UAPI-header.patch
@@ -1,7 +1,7 @@
 From e912aaf105bfcbdcb3a3c2cc292c9f1f2606a356 Mon Sep 17 00:00:00 2001
 From: "Jason A. Donenfeld" <Jason@zx2c4.com>
 Date: Sun, 24 May 2020 19:14:25 -0600
-Subject: [PATCH 15/33] crash_dump: always include UAPI header
+Subject: [PATCH 15/34] crash_dump: always include UAPI header
 
 The uapi header has important constants, regardless of whether or not
 CONFIG_CRASH_DUMP is enabled, so always include it.
@@ -12,7 +12,7 @@ Signed-off-by: Jason A. Donenfeld <Jason@zx2c4.com>
  1 file changed, 1 insertion(+), 1 deletion(-)
 
 diff --git a/include/linux/crash_dump.h b/include/linux/crash_dump.h
-index ade593b819d8..a313492bf2e8 100644
+index ade593b819d..a313492bf2e 100644
 --- a/include/linux/crash_dump.h
 +++ b/include/linux/crash_dump.h
 @@ -1,11 +1,11 @@
@@ -29,5 +29,5 @@ index ade593b819d8..a313492bf2e8 100644
  #define ELFCORE_ADDR_MAX	(-1ULL)
  #define ELFCORE_ADDR_ERR	(-2ULL)
 -- 
-2.28.0
+2.29.1
 
diff --git a/patches/0016-huge_mm-define-trans_huge_mmu_gather_count-stub-func.patch b/patches/0016-huge_mm-define-trans_huge_mmu_gather_count-stub-func.patch
index c873f9b..342a8fb 100644
--- a/patches/0016-huge_mm-define-trans_huge_mmu_gather_count-stub-func.patch
+++ b/patches/0016-huge_mm-define-trans_huge_mmu_gather_count-stub-func.patch
@@ -1,7 +1,7 @@
 From 44fa036030209e6a8449a8f6c9fd2dd948093475 Mon Sep 17 00:00:00 2001
 From: "Jason A. Donenfeld" <Jason@zx2c4.com>
 Date: Sun, 24 May 2020 19:17:10 -0600
-Subject: [PATCH 16/33] huge_mm: define trans_huge_mmu_gather_count stub
+Subject: [PATCH 16/34] huge_mm: define trans_huge_mmu_gather_count stub
  function
 
 When huge pages are not enabled, swap still needs to have a stub version
@@ -13,7 +13,7 @@ Signed-off-by: Jason A. Donenfeld <Jason@zx2c4.com>
  1 file changed, 5 insertions(+)
 
 diff --git a/include/linux/huge_mm.h b/include/linux/huge_mm.h
-index b608e46a3b50..2863450175a0 100644
+index b608e46a3b5..2863450175a 100644
 --- a/include/linux/huge_mm.h
 +++ b/include/linux/huge_mm.h
 @@ -382,6 +382,11 @@ static inline struct page *trans_huge_page_release_decode(struct page *page)
@@ -29,5 +29,5 @@ index b608e46a3b50..2863450175a0 100644
  extern bool is_huge_zero_page_release(struct page *page);
  
 -- 
-2.28.0
+2.29.1
 
diff --git a/patches/0017-workqueue-remove-call-to-non-existent-show_workqueue.patch b/patches/0017-workqueue-remove-call-to-non-existent-show_workqueue.patch
index 7fc8cce..c5b2e96 100644
--- a/patches/0017-workqueue-remove-call-to-non-existent-show_workqueue.patch
+++ b/patches/0017-workqueue-remove-call-to-non-existent-show_workqueue.patch
@@ -1,7 +1,7 @@
 From 3013e7720054356da5a51621954564f7d9db977e Mon Sep 17 00:00:00 2001
 From: "Jason A. Donenfeld" <Jason@zx2c4.com>
 Date: Sun, 24 May 2020 19:18:34 -0600
-Subject: [PATCH 17/33] workqueue: remove call to non-existent
+Subject: [PATCH 17/34] workqueue: remove call to non-existent
  show_workqueue_state
 
 The function show_workqueue_state is called, but does not exist anywhere
@@ -14,7 +14,7 @@ Signed-off-by: Jason A. Donenfeld <Jason@zx2c4.com>
  1 file changed, 3 deletions(-)
 
 diff --git a/kernel/workqueue.c b/kernel/workqueue.c
-index 34830e034038..873cb1115145 100644
+index 34830e03403..873cb111514 100644
 --- a/kernel/workqueue.c
 +++ b/kernel/workqueue.c
 @@ -5345,9 +5345,6 @@ static void wq_watchdog_timer_fn(unsigned long data)
@@ -28,5 +28,5 @@ index 34830e034038..873cb1115145 100644
  	mod_timer(&wq_watchdog_timer, jiffies + thresh);
  }
 -- 
-2.28.0
+2.29.1
 
diff --git a/patches/0018-x86-kaiser_enabled-isn-t-always-defined.patch b/patches/0018-x86-kaiser_enabled-isn-t-always-defined.patch
index 0788e83..460b649 100644
--- a/patches/0018-x86-kaiser_enabled-isn-t-always-defined.patch
+++ b/patches/0018-x86-kaiser_enabled-isn-t-always-defined.patch
@@ -1,7 +1,7 @@
 From 8258fd4244740abbf9c9386681dcde960b30a7c3 Mon Sep 17 00:00:00 2001
 From: "Jason A. Donenfeld" <Jason@zx2c4.com>
 Date: Sun, 24 May 2020 19:20:19 -0600
-Subject: [PATCH 18/33] x86: kaiser_enabled isn't always defined
+Subject: [PATCH 18/34] x86: kaiser_enabled isn't always defined
 
 This symbol only exists when CONFIG_PAGE_TABLE_ISOLATION is set, so
 don't use it otherwise.
@@ -12,7 +12,7 @@ Signed-off-by: Jason A. Donenfeld <Jason@zx2c4.com>
  1 file changed, 2 insertions(+)
 
 diff --git a/arch/x86/kernel/cpu/bugs.c b/arch/x86/kernel/cpu/bugs.c
-index eed1e0c03c19..c33396b4a3e0 100644
+index eed1e0c03c1..c33396b4a3e 100644
 --- a/arch/x86/kernel/cpu/bugs.c
 +++ b/arch/x86/kernel/cpu/bugs.c
 @@ -1236,8 +1236,10 @@ static ssize_t cpu_show_common(struct device *dev, struct device_attribute *attr
@@ -27,5 +27,5 @@ index eed1e0c03c19..c33396b4a3e0 100644
  		break;
  
 -- 
-2.28.0
+2.29.1
 
diff --git a/patches/0019-mm-slub-use-correct-arguments-for-fallback-function.patch b/patches/0019-mm-slub-use-correct-arguments-for-fallback-function.patch
index aff0a3e..537f22d 100644
--- a/patches/0019-mm-slub-use-correct-arguments-for-fallback-function.patch
+++ b/patches/0019-mm-slub-use-correct-arguments-for-fallback-function.patch
@@ -1,7 +1,7 @@
 From f62f44ccfd3cc315a2877391373f4ac7921fe40e Mon Sep 17 00:00:00 2001
 From: "Jason A. Donenfeld" <Jason@zx2c4.com>
 Date: Sun, 24 May 2020 19:23:58 -0600
-Subject: [PATCH 19/33] mm: slub: use correct arguments for fallback function
+Subject: [PATCH 19/34] mm: slub: use correct arguments for fallback function
 
 The stub function used different arguments from the real function,
 causing compiler errors when used. The fix is to simply use the same
@@ -13,7 +13,7 @@ Signed-off-by: Jason A. Donenfeld <Jason@zx2c4.com>
  1 file changed, 1 insertion(+), 1 deletion(-)
 
 diff --git a/mm/slub.c b/mm/slub.c
-index 02ecdfa5e1fd..6170edf5bfac 100644
+index 02ecdfa5e1f..6170edf5bfa 100644
 --- a/mm/slub.c
 +++ b/mm/slub.c
 @@ -1397,7 +1397,7 @@ static inline int slab_pre_alloc_hook(struct kmem_cache *s, gfp_t flags)
@@ -26,5 +26,5 @@ index 02ecdfa5e1fd..6170edf5bfac 100644
  static inline void slab_free_hook(struct kmem_cache *s, void *x) {}
  
 -- 
-2.28.0
+2.29.1
 
diff --git a/patches/0020-x86-mshyperv-don-t-touch-kexec-symbols-without-CONFI.patch b/patches/0020-x86-mshyperv-don-t-touch-kexec-symbols-without-CONFI.patch
index 84adfd3..e0767c2 100644
--- a/patches/0020-x86-mshyperv-don-t-touch-kexec-symbols-without-CONFI.patch
+++ b/patches/0020-x86-mshyperv-don-t-touch-kexec-symbols-without-CONFI.patch
@@ -1,7 +1,7 @@
 From f1ecb543fffe2fd334f932fb43c548612941d023 Mon Sep 17 00:00:00 2001
 From: "Jason A. Donenfeld" <Jason@zx2c4.com>
 Date: Sun, 24 May 2020 19:27:37 -0600
-Subject: [PATCH 20/33] x86: mshyperv: don't touch kexec symbols without
+Subject: [PATCH 20/34] x86: mshyperv: don't touch kexec symbols without
  CONFIG_KEXEC_CORE
 
 These symbols aren't defined without CONFIG_KEXEC_CORE, so factor it out of
@@ -13,7 +13,7 @@ Signed-off-by: Jason A. Donenfeld <Jason@zx2c4.com>
  1 file changed, 6 insertions(+)
 
 diff --git a/arch/x86/kernel/cpu/mshyperv.c b/arch/x86/kernel/cpu/mshyperv.c
-index 666ba5ca39a9..fbb096c54e35 100644
+index 666ba5ca39a..fbb096c54e3 100644
 --- a/arch/x86/kernel/cpu/mshyperv.c
 +++ b/arch/x86/kernel/cpu/mshyperv.c
 @@ -142,7 +142,11 @@ EXPORT_SYMBOL_GPL(hv_remove_crash_handler);
@@ -39,5 +39,5 @@ index 666ba5ca39a9..fbb096c54e35 100644
  
  
 -- 
-2.28.0
+2.29.1
 
diff --git a/patches/0021-rh_taint-don-t-dereference-struct-module-without-CON.patch b/patches/0021-rh_taint-don-t-dereference-struct-module-without-CON.patch
index 7316727..01ff870 100644
--- a/patches/0021-rh_taint-don-t-dereference-struct-module-without-CON.patch
+++ b/patches/0021-rh_taint-don-t-dereference-struct-module-without-CON.patch
@@ -1,7 +1,7 @@
 From b5108aaf36105894a1412f73788afc3bfedd3071 Mon Sep 17 00:00:00 2001
 From: "Jason A. Donenfeld" <Jason@zx2c4.com>
 Date: Sun, 24 May 2020 19:28:07 -0600
-Subject: [PATCH 21/33] rh_taint: don't dereference struct module without
+Subject: [PATCH 21/34] rh_taint: don't dereference struct module without
  CONFIG_MODULE
 
 This structure isn't defined for !CONFIG_MODULE, so don't try to use it.
@@ -13,7 +13,7 @@ Signed-off-by: Jason A. Donenfeld <Jason@zx2c4.com>
  2 files changed, 6 insertions(+)
 
 diff --git a/include/linux/moduleloader.h b/include/linux/moduleloader.h
-index 560ca53a75fa..3425b352eac9 100644
+index 560ca53a75f..3425b352eac 100644
 --- a/include/linux/moduleloader.h
 +++ b/include/linux/moduleloader.h
 @@ -45,7 +45,9 @@ static inline int apply_relocate(Elf_Shdr *sechdrs,
@@ -27,7 +27,7 @@ index 560ca53a75fa..3425b352eac9 100644
  }
  #endif
 diff --git a/kernel/rh_taint.c b/kernel/rh_taint.c
-index 22f032431c96..bbd7f8a1ab29 100644
+index 22f032431c9..bbd7f8a1ab2 100644
 --- a/kernel/rh_taint.c
 +++ b/kernel/rh_taint.c
 @@ -61,14 +61,18 @@ void mark_tech_preview(const char *msg, struct module *mod)
@@ -50,5 +50,5 @@ index 22f032431c96..bbd7f8a1ab29 100644
  }
  EXPORT_SYMBOL(mark_tech_preview);
 -- 
-2.28.0
+2.29.1
 
diff --git a/patches/0022-bpf-define-trace_bpf_jit_free-stub-for-when-BPF-isn-.patch b/patches/0022-bpf-define-trace_bpf_jit_free-stub-for-when-BPF-isn-.patch
index a18c4e8..c2d080b 100644
--- a/patches/0022-bpf-define-trace_bpf_jit_free-stub-for-when-BPF-isn-.patch
+++ b/patches/0022-bpf-define-trace_bpf_jit_free-stub-for-when-BPF-isn-.patch
@@ -1,7 +1,7 @@
 From e30cb86791cc4a67c38aa3d0385d5e58e2026034 Mon Sep 17 00:00:00 2001
 From: "Jason A. Donenfeld" <Jason@zx2c4.com>
 Date: Sun, 24 May 2020 19:31:18 -0600
-Subject: [PATCH 22/33] bpf: define trace_bpf_jit_free stub for when BPF isn't
+Subject: [PATCH 22/34] bpf: define trace_bpf_jit_free stub for when BPF isn't
  compiled in
 
 Configuration options that exclude BPF mean we need to have a stub
@@ -13,7 +13,7 @@ Signed-off-by: Jason A. Donenfeld <Jason@zx2c4.com>
  1 file changed, 4 insertions(+)
 
 diff --git a/include/linux/filter.h b/include/linux/filter.h
-index 9f8aa2fe7f2f..de43bcf9c6f3 100644
+index 9f8aa2fe7f2..de43bcf9c6f 100644
 --- a/include/linux/filter.h
 +++ b/include/linux/filter.h
 @@ -779,6 +779,10 @@ static inline bool bpf_jit_kallsyms_enabled(void)
@@ -28,5 +28,5 @@ index 9f8aa2fe7f2f..de43bcf9c6f3 100644
  __bpf_address_lookup(unsigned long addr, unsigned long *size,
  		     unsigned long *off, char *sym)
 -- 
-2.28.0
+2.29.1
 
diff --git a/patches/0023-events-remove-copy-and-paste-error.patch b/patches/0023-events-remove-copy-and-paste-error.patch
index 09ec23a..88ff7da 100644
--- a/patches/0023-events-remove-copy-and-paste-error.patch
+++ b/patches/0023-events-remove-copy-and-paste-error.patch
@@ -1,7 +1,7 @@
 From 27ac4bfc76bf3c6efda7aa3315bd37cb41818546 Mon Sep 17 00:00:00 2001
 From: "Jason A. Donenfeld" <Jason@zx2c4.com>
 Date: Sun, 24 May 2020 19:32:25 -0600
-Subject: [PATCH 23/33] events: remove copy and paste error
+Subject: [PATCH 23/34] events: remove copy and paste error
 
 A stray 'static void' with nothing else anywhere is bound to cause some
 problems.
@@ -12,7 +12,7 @@ Signed-off-by: Jason A. Donenfeld <Jason@zx2c4.com>
  1 file changed, 1 deletion(-)
 
 diff --git a/kernel/events/core.c b/kernel/events/core.c
-index 2fdc89591c39..a9a65c1b0974 100644
+index 2fdc89591c3..a9a65c1b097 100644
 --- a/kernel/events/core.c
 +++ b/kernel/events/core.c
 @@ -991,7 +991,6 @@ static inline u64 perf_cgroup_event_time(struct perf_event *event)
@@ -24,5 +24,5 @@ index 2fdc89591c39..a9a65c1b0974 100644
  
  /*
 -- 
-2.28.0
+2.29.1
 
diff --git a/patches/0024-sched-fair-averaging-depends-on-CONFIG_FAIR_GROUP_SC.patch b/patches/0024-sched-fair-averaging-depends-on-CONFIG_FAIR_GROUP_SC.patch
index a8222db..db9dc97 100644
--- a/patches/0024-sched-fair-averaging-depends-on-CONFIG_FAIR_GROUP_SC.patch
+++ b/patches/0024-sched-fair-averaging-depends-on-CONFIG_FAIR_GROUP_SC.patch
@@ -1,7 +1,7 @@
 From d9756dac97ee0d1d56141f54dc14bba644db6634 Mon Sep 17 00:00:00 2001
 From: "Jason A. Donenfeld" <Jason@zx2c4.com>
 Date: Sun, 24 May 2020 19:34:38 -0600
-Subject: [PATCH 24/33] sched: fair: averaging depends on
+Subject: [PATCH 24/34] sched: fair: averaging depends on
  CONFIG_FAIR_GROUP_SCHED
 
 The avg member isn't defined in that struct for !CONFIG_FAIR_GROUP_SCHED
@@ -13,7 +13,7 @@ Signed-off-by: Jason A. Donenfeld <Jason@zx2c4.com>
  1 file changed, 1 insertion(+), 1 deletion(-)
 
 diff --git a/kernel/sched/fair.c b/kernel/sched/fair.c
-index 4a6639d0f72f..514d5426ea62 100644
+index 4a6639d0f72..514d5426ea6 100644
 --- a/kernel/sched/fair.c
 +++ b/kernel/sched/fair.c
 @@ -661,7 +661,7 @@ static u64 sched_vslice(struct cfs_rq *cfs_rq, struct sched_entity *se)
@@ -26,5 +26,5 @@ index 4a6639d0f72f..514d5426ea62 100644
  
  /* Give new task start runnable values to heavy its load in infant time */
 -- 
-2.28.0
+2.29.1
 
diff --git a/patches/0025-net-fib-fib_encap_match-requires-CONFIG_IP_ROUTE_MUL.patch b/patches/0025-net-fib-fib_encap_match-requires-CONFIG_IP_ROUTE_MUL.patch
index 6f10090..1bce86e 100644
--- a/patches/0025-net-fib-fib_encap_match-requires-CONFIG_IP_ROUTE_MUL.patch
+++ b/patches/0025-net-fib-fib_encap_match-requires-CONFIG_IP_ROUTE_MUL.patch
@@ -1,7 +1,7 @@
 From f8a0a8ebcc87434d29753b914794cabe4c4e1367 Mon Sep 17 00:00:00 2001
 From: "Jason A. Donenfeld" <Jason@zx2c4.com>
 Date: Sun, 24 May 2020 19:37:11 -0600
-Subject: [PATCH 25/33] net: fib: fib_encap_match requires
+Subject: [PATCH 25/34] net: fib: fib_encap_match requires
  CONFIG_IP_ROUTE_MULTIPATH
 
 Don't call into fib_encap_match when it's not defined on
@@ -13,7 +13,7 @@ Signed-off-by: Jason A. Donenfeld <Jason@zx2c4.com>
  1 file changed, 2 insertions(+)
 
 diff --git a/net/ipv4/fib_semantics.c b/net/ipv4/fib_semantics.c
-index e483e2e916ca..b3cdea362f46 100644
+index e483e2e916c..b3cdea362f4 100644
 --- a/net/ipv4/fib_semantics.c
 +++ b/net/ipv4/fib_semantics.c
 @@ -615,10 +615,12 @@ int fib_nh_match(struct fib_config *cfg, struct fib_info *fi)
@@ -30,5 +30,5 @@ index e483e2e916ca..b3cdea362f46 100644
  #ifdef CONFIG_IP_ROUTE_CLASSID
  		if (cfg->fc_flow &&
 -- 
-2.28.0
+2.29.1
 
diff --git a/patches/0026-sched-fair-idle_balance-is-always-defined.patch b/patches/0026-sched-fair-idle_balance-is-always-defined.patch
index 3b2b467..b529163 100644
--- a/patches/0026-sched-fair-idle_balance-is-always-defined.patch
+++ b/patches/0026-sched-fair-idle_balance-is-always-defined.patch
@@ -1,7 +1,7 @@
 From 3a0f6c2515290dd99f1a8135035d8cd57b03d421 Mon Sep 17 00:00:00 2001
 From: "Jason A. Donenfeld" <Jason@zx2c4.com>
 Date: Sun, 24 May 2020 19:39:21 -0600
-Subject: [PATCH 26/33] sched: fair: idle_balance is always defined
+Subject: [PATCH 26/34] sched: fair: idle_balance is always defined
 
 So remove the stub function.
 
@@ -11,7 +11,7 @@ Signed-off-by: Jason A. Donenfeld <Jason@zx2c4.com>
  1 file changed, 2 insertions(+), 7 deletions(-)
 
 diff --git a/kernel/sched/fair.c b/kernel/sched/fair.c
-index 514d5426ea62..306bc7cbd2d8 100644
+index 514d5426ea6..306bc7cbd2d 100644
 --- a/kernel/sched/fair.c
 +++ b/kernel/sched/fair.c
 @@ -2655,8 +2655,6 @@ void idle_exit_fair(struct rq *this_rq)
@@ -45,5 +45,5 @@ index 514d5426ea62..306bc7cbd2d8 100644
   * Preempt the current task with a newly woken task if needed:
   */
 -- 
-2.28.0
+2.29.1
 
diff --git a/patches/0027-x86-mark-irq_set_vcpu_affinity-stub-as-static.patch b/patches/0027-x86-mark-irq_set_vcpu_affinity-stub-as-static.patch
index 4de2271..90ddd61 100644
--- a/patches/0027-x86-mark-irq_set_vcpu_affinity-stub-as-static.patch
+++ b/patches/0027-x86-mark-irq_set_vcpu_affinity-stub-as-static.patch
@@ -1,7 +1,7 @@
 From 757886521c963e997f3f60aa6e88ea74f8a3916f Mon Sep 17 00:00:00 2001
 From: "Jason A. Donenfeld" <Jason@zx2c4.com>
 Date: Sun, 24 May 2020 19:43:29 -0600
-Subject: [PATCH 27/33] x86: mark irq_set_vcpu_affinity stub as static
+Subject: [PATCH 27/34] x86: mark irq_set_vcpu_affinity stub as static
 
 Without marking this as static, the linker complaints about conflicts.
 
@@ -11,7 +11,7 @@ Signed-off-by: Jason A. Donenfeld <Jason@zx2c4.com>
  1 file changed, 1 insertion(+), 1 deletion(-)
 
 diff --git a/arch/x86/include/asm/irq_remapping.h b/arch/x86/include/asm/irq_remapping.h
-index 8e346091bb0f..af7e774ea346 100644
+index 8e346091bb0..af7e774ea34 100644
 --- a/arch/x86/include/asm/irq_remapping.h
 +++ b/arch/x86/include/asm/irq_remapping.h
 @@ -117,7 +117,7 @@ static inline bool setup_remapped_irq(int irq,
@@ -24,5 +24,5 @@ index 8e346091bb0f..af7e774ea346 100644
  	return -ENOSYS;
  }
 -- 
-2.28.0
+2.29.1
 
diff --git a/patches/0028-spec_ctrl-don-t-dereference-struct-module-without-CO.patch b/patches/0028-spec_ctrl-don-t-dereference-struct-module-without-CO.patch
index 1560a67..066c5a4 100644
--- a/patches/0028-spec_ctrl-don-t-dereference-struct-module-without-CO.patch
+++ b/patches/0028-spec_ctrl-don-t-dereference-struct-module-without-CO.patch
@@ -1,7 +1,7 @@
 From 61e6dbd92fc94f67e7e24ce0bf5bf9d55d1bbdd9 Mon Sep 17 00:00:00 2001
 From: "Jason A. Donenfeld" <Jason@zx2c4.com>
 Date: Sun, 24 May 2020 19:44:27 -0600
-Subject: [PATCH 28/33] spec_ctrl: don't dereference struct module without
+Subject: [PATCH 28/34] spec_ctrl: don't dereference struct module without
  CONFIG_MODULE
 
 This structure isn't defined for !CONFIG_MODULE, so don't try to use it.
@@ -12,7 +12,7 @@ Signed-off-by: Jason A. Donenfeld <Jason@zx2c4.com>
  1 file changed, 2 insertions(+)
 
 diff --git a/arch/x86/kernel/spec_ctrl.c b/arch/x86/kernel/spec_ctrl.c
-index 7601d0b59dc7..d39c9a3b8a59 100644
+index 7601d0b59dc..d39c9a3b8a5 100644
 --- a/arch/x86/kernel/spec_ctrl.c
 +++ b/arch/x86/kernel/spec_ctrl.c
 @@ -504,9 +504,11 @@ bool spec_ctrl_enable_retpoline_ibrs_user(void)
@@ -28,5 +28,5 @@ index 7601d0b59dc7..d39c9a3b8a59 100644
  	unsafe_module = true;
  }
 -- 
-2.28.0
+2.29.1
 
diff --git a/patches/0029-cpuidle-define-cpuidle_poll_time-fallback-as-static.patch b/patches/0029-cpuidle-define-cpuidle_poll_time-fallback-as-static.patch
index 8561509..a373851 100644
--- a/patches/0029-cpuidle-define-cpuidle_poll_time-fallback-as-static.patch
+++ b/patches/0029-cpuidle-define-cpuidle_poll_time-fallback-as-static.patch
@@ -1,7 +1,7 @@
 From e8bc78d49622ff4efe2e2edb5566d070157c9fa1 Mon Sep 17 00:00:00 2001
 From: "Jason A. Donenfeld" <Jason@zx2c4.com>
 Date: Sun, 24 May 2020 19:55:03 -0600
-Subject: [PATCH 29/33] cpuidle: define cpuidle_poll_time fallback as static
+Subject: [PATCH 29/34] cpuidle: define cpuidle_poll_time fallback as static
 
 Otherwise the linker complains of multiple definitions.
 
@@ -11,7 +11,7 @@ Signed-off-by: Jason A. Donenfeld <Jason@zx2c4.com>
  1 file changed, 1 insertion(+), 1 deletion(-)
 
 diff --git a/include/linux/cpuidle.h b/include/linux/cpuidle.h
-index bcfb33cb70c7..bcfe3054ef76 100644
+index bcfb33cb70c..bcfe3054ef7 100644
 --- a/include/linux/cpuidle.h
 +++ b/include/linux/cpuidle.h
 @@ -149,7 +149,7 @@ static inline void disable_cpuidle(void) { }
@@ -24,5 +24,5 @@ index bcfb33cb70c7..bcfe3054ef76 100644
  {return 0; }
  static inline struct cpuidle_driver *cpuidle_get_driver(void) {return NULL; }
 -- 
-2.28.0
+2.29.1
 
diff --git a/patches/0030-x86-remove-errant-CFI-usage-from-rwlock.patch b/patches/0030-x86-remove-errant-CFI-usage-from-rwlock.patch
index ffbec4d..53b1705 100644
--- a/patches/0030-x86-remove-errant-CFI-usage-from-rwlock.patch
+++ b/patches/0030-x86-remove-errant-CFI-usage-from-rwlock.patch
@@ -1,7 +1,7 @@
 From 1013aca961d8dd47191b4371da95a26ccfb60689 Mon Sep 17 00:00:00 2001
 From: "Jason A. Donenfeld" <Jason@zx2c4.com>
 Date: Sun, 24 May 2020 21:25:28 -0600
-Subject: [PATCH 30/33] x86: remove errant CFI usage from rwlock
+Subject: [PATCH 30/34] x86: remove errant CFI usage from rwlock
 
 These don't assemble with newer binutils due to the use of the cfi
 directives, so simply remove them, since they're anyway just for
@@ -13,7 +13,7 @@ Signed-off-by: Jason A. Donenfeld <Jason@zx2c4.com>
  1 file changed, 4 deletions(-)
 
 diff --git a/arch/x86/lib/rwlock.S b/arch/x86/lib/rwlock.S
-index cc4a8c2f9b8d..34d5184ada35 100644
+index cc4a8c2f9b8..34d5184ada3 100644
 --- a/arch/x86/lib/rwlock.S
 +++ b/arch/x86/lib/rwlock.S
 @@ -12,7 +12,6 @@
@@ -43,5 +43,5 @@ index cc4a8c2f9b8d..34d5184ada35 100644
 -	CFI_ENDPROC
  END(__read_lock_failed)
 -- 
-2.28.0
+2.29.1
 
diff --git a/patches/0031-mm-guard-pudp_clear_flush_notify-with-mm-notifier-co.patch b/patches/0031-mm-guard-pudp_clear_flush_notify-with-mm-notifier-co.patch
index ed99d2f..0b07b3a 100644
--- a/patches/0031-mm-guard-pudp_clear_flush_notify-with-mm-notifier-co.patch
+++ b/patches/0031-mm-guard-pudp_clear_flush_notify-with-mm-notifier-co.patch
@@ -1,7 +1,7 @@
 From b5065fe42bae3379cc169a7ebab48805d4dd8eb2 Mon Sep 17 00:00:00 2001
 From: "Jason A. Donenfeld" <Jason@zx2c4.com>
 Date: Fri, 19 Jun 2020 17:52:18 -0600
-Subject: [PATCH 31/33] mm: guard pudp_clear_flush_notify with mm notifier
+Subject: [PATCH 31/34] mm: guard pudp_clear_flush_notify with mm notifier
  config
 
 Without CONFIG_MMU_NOTIFIER, pudp_clear_flush_notify isn't defined and
@@ -13,7 +13,7 @@ Signed-off-by: Jason A. Donenfeld <Jason@zx2c4.com>
  1 file changed, 2 insertions(+)
 
 diff --git a/mm/huge_memory.c b/mm/huge_memory.c
-index 4d7993ce39ba..a709ea6eb322 100644
+index 4d7993ce39b..a709ea6eb32 100644
 --- a/mm/huge_memory.c
 +++ b/mm/huge_memory.c
 @@ -2035,7 +2035,9 @@ void __split_huge_page_pud(struct vm_area_struct *vma, unsigned long address,
@@ -27,5 +27,5 @@ index 4d7993ce39ba..a709ea6eb322 100644
  out:
  	spin_unlock(ptl);
 -- 
-2.28.0
+2.29.1
 
diff --git a/patches/0032-x86-clear-smap-in-cr4-when-not-used.patch b/patches/0032-x86-clear-smap-in-cr4-when-not-used.patch
index de67e2f..45d941c 100644
--- a/patches/0032-x86-clear-smap-in-cr4-when-not-used.patch
+++ b/patches/0032-x86-clear-smap-in-cr4-when-not-used.patch
@@ -1,7 +1,7 @@
 From f33db22cf6467e06805aec240ced40916c550492 Mon Sep 17 00:00:00 2001
 From: "Jason A. Donenfeld" <Jason@zx2c4.com>
 Date: Fri, 19 Jun 2020 18:07:53 -0600
-Subject: [PATCH 32/33] x86: clear smap in cr4 when not used
+Subject: [PATCH 32/34] x86: clear smap in cr4 when not used
 
 If the CPU supports SMAP, but it isn't specified in the config, then we
 need to explicitly clear it from cr4. Otherwise the processor will trap
@@ -17,7 +17,7 @@ Signed-off-by: Jason A. Donenfeld <Jason@zx2c4.com>
  4 files changed, 13 insertions(+), 3 deletions(-)
 
 diff --git a/arch/x86/include/asm/disabled-features.h b/arch/x86/include/asm/disabled-features.h
-index 476b053ef1c1..990bc6232376 100644
+index 476b053ef1c..990bc623237 100644
 --- a/arch/x86/include/asm/disabled-features.h
 +++ b/arch/x86/include/asm/disabled-features.h
 @@ -16,6 +16,12 @@
@@ -43,7 +43,7 @@ index 476b053ef1c1..990bc6232376 100644
  #define DISABLED_MASK11	0
  #define DISABLED_MASK12	0
 diff --git a/arch/x86/kernel/cpu/bugs.c b/arch/x86/kernel/cpu/bugs.c
-index c33396b4a3e0..e03b532d96ee 100644
+index c33396b4a3e..e03b532d96e 100644
 --- a/arch/x86/kernel/cpu/bugs.c
 +++ b/arch/x86/kernel/cpu/bugs.c
 @@ -449,7 +449,7 @@ static const char * const spectre_v1_strings[] = {
@@ -56,7 +56,7 @@ index c33396b4a3e0..e03b532d96ee 100644
  
  	/*
 diff --git a/arch/x86/kernel/cpu/common.c b/arch/x86/kernel/cpu/common.c
-index 1970e49705e0..67d6f0c692cf 100644
+index 1970e49705e..67d6f0c692c 100644
 --- a/arch/x86/kernel/cpu/common.c
 +++ b/arch/x86/kernel/cpu/common.c
 @@ -355,7 +355,11 @@ static __always_inline void setup_smap(struct cpuinfo_x86 *c)
@@ -72,7 +72,7 @@ index 1970e49705e0..67d6f0c692cf 100644
  
  static __always_inline void setup_umip(struct cpuinfo_x86 *c)
 diff --git a/arch/x86/mm/fault.c b/arch/x86/mm/fault.c
-index 4698dedc7071..50c04da82508 100644
+index 4698dedc707..50c04da8250 100644
 --- a/arch/x86/mm/fault.c
 +++ b/arch/x86/mm/fault.c
 @@ -1207,7 +1207,7 @@ __do_page_fault(struct pt_regs *regs, unsigned long error_code,
@@ -85,5 +85,5 @@ index 4698dedc7071..50c04da82508 100644
  			bad_area_nosemaphore(regs, error_code, address,
  				NULL);
 -- 
-2.28.0
+2.29.1
 
diff --git a/patches/0033-mm-only-use-bdev-functions-for-CONFIG_BLOCK.patch b/patches/0033-mm-only-use-bdev-functions-for-CONFIG_BLOCK.patch
index 5908bff..e4c906c 100644
--- a/patches/0033-mm-only-use-bdev-functions-for-CONFIG_BLOCK.patch
+++ b/patches/0033-mm-only-use-bdev-functions-for-CONFIG_BLOCK.patch
@@ -1,7 +1,7 @@
 From 949366463796471c62032e2b57ef5e501efb0c4d Mon Sep 17 00:00:00 2001
 From: "Jason A. Donenfeld" <Jason@zx2c4.com>
 Date: Wed, 30 Sep 2020 16:58:15 +0200
-Subject: [PATCH 33/33] mm: only use bdev functions for CONFIG_BLOCK
+Subject: [PATCH 33/34] mm: only use bdev functions for CONFIG_BLOCK
 
 Signed-off-by: Jason A. Donenfeld <Jason@zx2c4.com>
 ---
@@ -9,7 +9,7 @@ Signed-off-by: Jason A. Donenfeld <Jason@zx2c4.com>
  1 file changed, 4 insertions(+)
 
 diff --git a/mm/filemap.c b/mm/filemap.c
-index 89a4851ac925..1c826057289b 100644
+index 89a4851ac92..1c826057289 100644
 --- a/mm/filemap.c
 +++ b/mm/filemap.c
 @@ -2186,9 +2186,13 @@ generic_file_aio_read2(struct kiocb *iocb, const struct iovec *iov,
@@ -27,5 +27,5 @@ index 89a4851ac925..1c826057289b 100644
  		if ((pos | count) & bs_mask) {
  			if (pos == size)
 -- 
-2.28.0
+2.29.1
 
diff --git a/patches/0034-mm-do-not-assume-generic_max_swapfile_size-exists.patch b/patches/0034-mm-do-not-assume-generic_max_swapfile_size-exists.patch
new file mode 100644
index 0000000..798a80e
--- /dev/null
+++ b/patches/0034-mm-do-not-assume-generic_max_swapfile_size-exists.patch
@@ -0,0 +1,29 @@
+From 35ffc2a00fe3b8be8ccd9158a88595d9094a6269 Mon Sep 17 00:00:00 2001
+From: "Jason A. Donenfeld" <Jason@zx2c4.com>
+Date: Wed, 4 Nov 2020 10:03:00 +0100
+Subject: [PATCH 34/34] mm: do not assume generic_max_swapfile_size exists
+
+For CONFIG_SWAP=n configurations, generic_max_swapfile_size is not
+compiled in, so conditionalize this statement.
+
+Signed-off-by: Jason A. Donenfeld <Jason@zx2c4.com>
+---
+ arch/x86/mm/init.c | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/arch/x86/mm/init.c b/arch/x86/mm/init.c
+index 43c77f4d4d1..b21a95b508b 100644
+--- a/arch/x86/mm/init.c
++++ b/arch/x86/mm/init.c
+@@ -817,7 +817,7 @@ unsigned long max_swapfile_size(void)
+ {
+ 	unsigned long pages;
+ 
+-	pages = generic_max_swapfile_size();
++	pages = IS_ENABLED(CONFIG_SWAP) ? generic_max_swapfile_size() : 0;
+ 
+ 	if (boot_cpu_has_bug(X86_BUG_L1TF)) {
+ 		/* Limit the swap file size to MAX_PA/2 for L1TF workaround */
+-- 
+2.29.1
+