update to LTS 5.10.16

12 files changed, 29 insertions, 467 deletions

diff --git a/.SRCINFO b/.SRCINFO
index f9dcc33611b1..08d93b778033 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,7 +1,7 @@
 # Generated by makepkg 5.2.2
-# Wed Feb 17 17:00:11 UTC 2021
+# Thu Feb 18 02:35:53 UTC 2021
 pkgbase = linux-shmilee
-	pkgver = 5.4.99
+	pkgver = 5.10.16
 	pkgrel = 1
 	url = https://www.kernel.org/
 	arch = x86_64
@@ -20,41 +20,21 @@ pkgbase = linux-shmilee
 	makedepends = graphviz
 	makedepends = imagemagick
 	options = !strip
-	source = https://www.kernel.org/pub/linux/kernel/v5.x/linux-5.4.tar.xz
-	source = https://www.kernel.org/pub/linux/kernel/v5.x/linux-5.4.tar.sign
-	source = https://www.kernel.org/pub/linux/kernel/v5.x/patch-5.4.99.xz
-	source = http://ck.kolivas.org/patches/5.0/5.4/5.4-ck1/patch-5.4-ck1.xz
-	source = ck-patch-for-5.4.57+.patch
-	source = ck-patch-for-5.4.62+.patch
-	source = ck-fix-broken-sleep2ram-5.4.48+.patch
-	source = https://github.com/dolohow/uksm/raw/9b68301484619b60af2515f782160cdfe6c168f3/v5.x/uksm-5.4.patch
-	source = uksm-patch-for-5.4.33+.patch
-	source = uksm-patch-for-5.4.69+.patch
-	source = cjktty-5.4.patch::https://github.com/torvalds/linux/compare/v5.4...Gentoo-zh:5.4-utf8.patch
-	source = cjktty-11-patch-for-5.4.36+.patch
-	source = cjktty-11-patch-for-5.4.54+.patch
-	source = cjktty-11-patch-for-5.4.62+.patch
-	source = cjktty-12-patch-for-5.4.66+.patch
-	source = sphinx-workaround.patch
+	source = https://www.kernel.org/pub/linux/kernel/v5.x/linux-5.10.tar.xz
+	source = https://www.kernel.org/pub/linux/kernel/v5.x/linux-5.10.tar.sign
+	source = https://www.kernel.org/pub/linux/kernel/v5.x/patch-5.10.16.xz
+	source = http://ck.kolivas.org/patches/5.0/5.10/5.10-ck1/patch-5.10-ck1.xz
+	source = https://github.com/dolohow/uksm/raw/9b68301484619b60af2515f782160cdfe6c168f3/v5.x/uksm-5.10.patch
+	source = https://github.com/zhmars/cjktty-patches/raw/3fb0f901fa6a9ff4300335357001819e525fb076/v5.x/cjktty-5.10.patch
 	source = config
 	validpgpkeys = ABAF11C65A2970B130ABE3C479BE3E4300411886
 	validpgpkeys = 647F28654894E3BD457199BE38DBBDC86092693E
-	sha256sums = bf338980b1670bca287f9994b7441c2361907635879169c64ae78364efc5f491
+	sha256sums = dcdf99e43e98330d925016985bfbc7b83c66d367b714b2de0cbbfcbf83d8ca43
 	sha256sums = SKIP
-	sha256sums = 51dcac4893b617d02afb804efb5540894856c09ad1e10c376261d820c3699e61
-	sha256sums = f445eea4d0ec2015a25f1ad625c848f4f2252099795966fa4105e0aa29674c5c
-	sha256sums = a10a4848c7a9842c0c7760b087ea38a4356dc1a2c2e26334cb0106c25785554f
-	sha256sums = 0334391900f31d6aaedaa68e8917f93262ba3e523f2654774b289e9b18c1a923
-	sha256sums = 961ed94b8d905f1e901cacb08d253c4170af0a25828111b7558d9c874e923558
-	sha256sums = 81d34bf02e771a126af5cb382d44a86dcc759c88b7c89fc7e5b7737731b9130e
-	sha256sums = 6826624f65276927de012f040e77b02231fe6345b9da7c702deacd9372ea001e
-	sha256sums = cdcd0e0ebd24d9b66c216df01b02da23760a44fe2a451137190f89d18a4c7f59
-	sha256sums = 50213f3270499fceb452946252d61f5471571c77baf3dd510fbb00cfa9831c9a
-	sha256sums = fa7950b5763a592ca2a04c423842451ac79633deebf77c730fc8ee35dfac2d45
-	sha256sums = 81bb112fed28c8ef22d7e02eb4150a76c8d549c72775e65cd3ecf10fa5fe1b4e
-	sha256sums = 7b3eea4462811a26c3c32721009a807dcaee5b8fbf1ad3e0cdad851679c9246e
-	sha256sums = 0c6385f8d5a61b09d046babe5351ca638ccb5a263e0f167d2b311f57054bc8d1
-	sha256sums = b7c814c8183e4645947a6dcc3cbf80431de8a8fd4e895b780f9a5fd92f82cb8e
+	sha256sums = efef24680b4d0bb00fa63bf5cb733d9e1f00b726562732ab5395323ad35a9236
+	sha256sums = 64909f07b404b138945d5d6fd19bf3c62d10adce9f592524d91a3359331a6ace
+	sha256sums = 24729e63e08de13039ce7e6637146ec5a5747379ebbd92cdeef744edfad17183
+	sha256sums = 078837287607800f948e0e26e6a8ba874d856fd37e0063e8975bb562268546c4
 	sha256sums = 7ce388e429d8df479a721285e445e116c5ee41e3126a702862e59056460b655e
 
 pkgname = linux-shmilee
diff --git a/PKGBUILD b/PKGBUILD
index 2fac6e6037b6..3475b4ebf4db 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -6,9 +6,9 @@
 
 # last/latest "longterm maintenance" kernel releases
 # https://www.kernel.org/category/releases.html
-# 5.4 Greg Kroah-Hartman & Sasha Levin 2019-11-24 Dec, 2025
-_LLL_VER=5.4
-_LLL_SUBVER=99
+# 5.10 Greg Kroah-Hartman & Sasha Levin 2020-12-13 Dec, 2022
+_LLL_VER=5.10
+_LLL_SUBVER=16
 
 # Bisect debug, v5.4.47 -> v5.4.48
 _Bisect_debug=off # on, test, off
@@ -33,33 +33,22 @@ _NUMA_disable=y
 # https://wiki.archlinux.org/index.php/Linux-ck
 _CK_VER=1
 _CK_PATCH_SRC="http://ck.kolivas.org/patches/5.0/${_LLL_VER}/${_LLL_VER}-ck${_CK_VER}/patch-${_LLL_VER}-ck${_CK_VER}.xz"
-_CK_PATCH_PATCH=(
-    'ck-patch-for-5.4.57+.patch'
-    'ck-patch-for-5.4.62+.patch'
-)
+_CK_PATCH_PATCH=()
 
 # Ultra Kernel Samepage Merging
 _UKSM_VER=0.1.2.6
 _UKSM_COMMIT=9b68301484619b60af2515f782160cdfe6c168f3
 _UKSM_PATCH_SRC="https://github.com/dolohow/uksm/raw/${_UKSM_COMMIT}/v5.x/uksm-${_LLL_VER}.patch"
-_UKSM_PATCH_PATCH=(
-    'uksm-patch-for-5.4.33+.patch'
-    'uksm-patch-for-5.4.69+.patch'
-)
+_UKSM_PATCH_PATCH=()
 
 # CJKTTY patch 
 # https://github.com/Gentoo-zh/linux-cjktty
-_CJKTTY_PATCH_URL="https://github.com/torvalds/linux/compare/v${_LLL_VER}...Gentoo-zh:${_LLL_VER}-utf8.patch"
-_CJKTTY_PATCH_SRC="cjktty-${_LLL_VER}.patch::${_CJKTTY_PATCH_URL}"
+#_CJKTTY_PATCH_URL="https://github.com/torvalds/linux/compare/v${_LLL_VER}...Gentoo-zh:${_LLL_VER}-utf8.patch"
+#_CJKTTY_PATCH_SRC="cjktty-${_LLL_VER}.patch::${_CJKTTY_PATCH_URL}"
 # https://github.com/zhmars/cjktty-patches
-#_CJKTTY_COMMIT=0acfa3fdfe900ad15e56b513be70061f86cfe606
-#_CJKTTY_PATCH_SRC="https://github.com/zhmars/cjktty-patches/raw/${_CJKTTY_COMMIT}/v5.x/cjktty-${_LLL_VER}.patch"
-_CJKTTY_PATCH_PATCH=(
-    'cjktty-11-patch-for-5.4.36+.patch'
-    'cjktty-11-patch-for-5.4.54+.patch'
-    'cjktty-11-patch-for-5.4.62+.patch'
-    'cjktty-12-patch-for-5.4.66+.patch'
-)
+_CJKTTY_COMMIT=3fb0f901fa6a9ff4300335357001819e525fb076
+_CJKTTY_PATCH_SRC="https://github.com/zhmars/cjktty-patches/raw/${_CJKTTY_COMMIT}/v5.x/cjktty-${_LLL_VER}.patch"
+_CJKTTY_PATCH_PATCH=()
 
 _PATHSET_DESC="ck${_CK_VER} uksm-${_UKSM_VER} and cjktty"
 
@@ -85,12 +74,10 @@ source=(
         #"https://www.kernel.org/pub/linux/kernel/v5.x/patch-${pkgver}.sign"
         ${_CK_PATCH_SRC}
         ${_CK_PATCH_PATCH[@]}
-        'ck-fix-broken-sleep2ram-5.4.48+.patch' # https://github.com/zen-kernel/zen-kernel/commit/fb7e2cfaf61cf5f9c2336331e73296f455bd2d51.patch
         ${_UKSM_PATCH_SRC}
         ${_UKSM_PATCH_PATCH[@]}
         ${_CJKTTY_PATCH_SRC}
         ${_CJKTTY_PATCH_PATCH[@]}
-        'sphinx-workaround.patch'
         'config'         # the main kernel config file
 )
 validpgpkeys=(
@@ -98,22 +85,12 @@ validpgpkeys=(
               '647F28654894E3BD457199BE38DBBDC86092693E' # Greg Kroah-Hartman 
 )
 # https://www.kernel.org/pub/linux/kernel/v4.x/sha256sums.asc
-sha256sums=('bf338980b1670bca287f9994b7441c2361907635879169c64ae78364efc5f491'
+sha256sums=('dcdf99e43e98330d925016985bfbc7b83c66d367b714b2de0cbbfcbf83d8ca43'
             'SKIP'
-            '51dcac4893b617d02afb804efb5540894856c09ad1e10c376261d820c3699e61'
-            'f445eea4d0ec2015a25f1ad625c848f4f2252099795966fa4105e0aa29674c5c'
-            'a10a4848c7a9842c0c7760b087ea38a4356dc1a2c2e26334cb0106c25785554f'
-            '0334391900f31d6aaedaa68e8917f93262ba3e523f2654774b289e9b18c1a923'
-            '961ed94b8d905f1e901cacb08d253c4170af0a25828111b7558d9c874e923558'
-            '81d34bf02e771a126af5cb382d44a86dcc759c88b7c89fc7e5b7737731b9130e'
-            '6826624f65276927de012f040e77b02231fe6345b9da7c702deacd9372ea001e'
-            'cdcd0e0ebd24d9b66c216df01b02da23760a44fe2a451137190f89d18a4c7f59'
-            '50213f3270499fceb452946252d61f5471571c77baf3dd510fbb00cfa9831c9a'
-            'fa7950b5763a592ca2a04c423842451ac79633deebf77c730fc8ee35dfac2d45'
-            '81bb112fed28c8ef22d7e02eb4150a76c8d549c72775e65cd3ecf10fa5fe1b4e'
-            '7b3eea4462811a26c3c32721009a807dcaee5b8fbf1ad3e0cdad851679c9246e'
-            '0c6385f8d5a61b09d046babe5351ca638ccb5a263e0f167d2b311f57054bc8d1'
-            'b7c814c8183e4645947a6dcc3cbf80431de8a8fd4e895b780f9a5fd92f82cb8e'
+            'efef24680b4d0bb00fa63bf5cb733d9e1f00b726562732ab5395323ad35a9236'
+            '64909f07b404b138945d5d6fd19bf3c62d10adce9f592524d91a3359331a6ace'
+            '24729e63e08de13039ce7e6637146ec5a5747379ebbd92cdeef744edfad17183'
+            '078837287607800f948e0e26e6a8ba874d856fd37e0063e8975bb562268546c4'
             '7ce388e429d8df479a721285e445e116c5ee41e3126a702862e59056460b655e')
 
 export KBUILD_BUILD_HOST=archlinux
@@ -159,9 +136,7 @@ prepare() {
 
   # Bisect debug result
   if [ "$_Bisect_debug" != "on" ]; then
-    #see https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git/patch/?id=f7757368e0f0b3e108088ca7b5b8abda6faa7ebc
-    patch -p1 -i "../ck-fix-broken-sleep2ram-5.4.48+.patch"
-    #:
+    :
   fi
 
   msg2 "Patching source with uksm ${_UKSM_VER} patches"
@@ -178,9 +153,6 @@ prepare() {
   done
   patch -Np1 -i "../cjktty-${_LLL_VER}.${_LLL_SUBVER}.patch"
 
-  msg2 "Patching sphinx extensions for htmldocs"
-  patch -Np1 -i ../sphinx-workaround.patch
-
   echo "Setting config..."
   cp -Tf ../config .config
 
diff --git a/cjktty-11-patch-for-5.4.36+.patch b/cjktty-11-patch-for-5.4.36+.patch
deleted file mode 100644
index 8e89e73f3fe4..000000000000
--- a/cjktty-11-patch-for-5.4.36+.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- cjktty-10-fix-255-glyph-limit-prepare-for-CJK-font-support.patch	2020-04-30 11:29:47.000000000 +0800
-+++ cjktty-10-fix-255-glyph-limit-prepare-for-CJK-font-support-5.4.36.patch	2020-04-30 11:36:17.000000000 +0800
-@@ -137,7 +137,7 @@
-  	if (new_cols == vc->vc_cols && new_rows == vc->vc_rows)
-  		return 0;
-  
-- 	if (new_screen_size > (4 << 20))
-+ 	if (new_screen_size > KMALLOC_MAX_SIZE)
-  		return -EINVAL;
- -	newscreen = kzalloc(new_screen_size, GFP_USER);
- +
diff --git a/cjktty-11-patch-for-5.4.54+.patch b/cjktty-11-patch-for-5.4.54+.patch
deleted file mode 100644
index b4c249f69415..000000000000
--- a/cjktty-11-patch-for-5.4.54+.patch
+++ /dev/null
@@ -1,43 +0,0 @@
---- cjktty-10-fix-255-glyph-limit-prepare-for-CJK-font-support.patch	2020-08-08 17:16:04.000000000 +0800
-+++ cjktty-10-fix-255-glyph-limit-prepare-for-CJK-font-support-5.4.54.patch	2020-08-08 23:18:35.000000000 +0800
-@@ -111,11 +111,11 @@
-  		notify_update(vc);
-  	}
- @@ -1095,7 +1118,7 @@ int vc_allocate(unsigned int currcons)	/* return 0 on success */
-- 	if (!*vc->vc_uni_pagedir_loc)
-- 		con_set_default_unimap(vc);
-- 
-+ 	    vc->vc_screenbuf_size > KMALLOC_MAX_SIZE || !vc->vc_screenbuf_size)
-+ 		goto err_free;
-+ 	err = -ENOMEM;
- -	vc->vc_screenbuf = kzalloc(vc->vc_screenbuf_size, GFP_KERNEL);
--+	vc->vc_screenbuf = kmalloc(vc->vc_screenbuf_size * 2, GFP_KERNEL);
-++	vc->vc_screenbuf = kzalloc(vc->vc_screenbuf_size * 2, GFP_KERNEL);
-  	if (!vc->vc_screenbuf)
-  		goto err_free;
-  
-@@ -137,11 +137,11 @@
-  	if (new_cols == vc->vc_cols && new_rows == vc->vc_rows)
-  		return 0;
-  
-- 	if (new_screen_size > KMALLOC_MAX_SIZE)
-+ 	if (new_screen_size > KMALLOC_MAX_SIZE || !new_screen_size)
-  		return -EINVAL;
- -	newscreen = kzalloc(new_screen_size, GFP_USER);
- +
--+	newscreen = kmalloc(new_screen_size * 2, GFP_USER);
-++	newscreen = kzalloc(new_screen_size * 2, GFP_USER);
- +
-  	if (!newscreen)
-  		return -ENOMEM;
-@@ -245,9 +245,9 @@
-  				inverse = 0;
-  				width = 1;
- @@ -3360,7 +3413,7 @@ static int __init con_init(void)
-- 		INIT_WORK(&vc_cons[currcons].SAK_work, vc_SAK);
-  		tty_port_init(&vc->port);
-  		visual_init(vc, currcons, 1);
-+ 		/* Assuming vc->vc_{cols,rows,screenbuf_size} are sane here. */
- -		vc->vc_screenbuf = kzalloc(vc->vc_screenbuf_size, GFP_NOWAIT);
- +		vc->vc_screenbuf = kzalloc(vc->vc_screenbuf_size * 2, GFP_NOWAIT);
-  		vc_init(vc, vc->vc_rows, vc->vc_cols,
diff --git a/cjktty-11-patch-for-5.4.62+.patch b/cjktty-11-patch-for-5.4.62+.patch
deleted file mode 100644
index 3336cba142de..000000000000
--- a/cjktty-11-patch-for-5.4.62+.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- cjktty-10-fix-255-glyph-limit-prepare-for-CJK-font-support.patch	2020-09-05 10:35:09.000000000 +0800
-+++ cjktty-10-fix-255-glyph-limit-prepare-for-CJK-font-support-5.4.62.patch	2020-09-05 20:41:19.000000000 +0800
-@@ -169,7 +169,7 @@
- + 		scr_memsetw((void *)new_origin + (new_screen_size), vc->vc_video_erase_char,
- + 			    new_scr_end - new_origin);
- +	}
-- 	kfree(vc->vc_screenbuf);
-+ 	oldscreen = vc->vc_screenbuf;
-  	vc->vc_screenbuf = newscreen;
-  	vc->vc_screenbuf_size = new_screen_size;
- @@ -2601,6 +2635,8 @@ static int do_con_write(struct tty_struct *tty, const unsigned char *buf, int co
diff --git a/cjktty-12-patch-for-5.4.66+.patch b/cjktty-12-patch-for-5.4.66+.patch
deleted file mode 100644
index 17f35c1a6f74..000000000000
--- a/cjktty-12-patch-for-5.4.66+.patch
+++ /dev/null
@@ -1,193 +0,0 @@
---- cjktty-10-fix-255-glyph-limit-prepare-for-CJK-font-support.patch	2020-09-18 00:19:07.610052000 +0800
-+++ cjktty-10-fix-255-glyph-limit-prepare-for-CJK-font-support-5.4.66.patch	2020-09-18 19:03:23.870884705 +0800
-@@ -284,7 +284,7 @@
-  #include <linux/module.h>
-  #include <linux/slab.h>
-  #include <linux/string.h>
--@@ -43,6 +44,21 @@ static void update_attr(u8 *dst, u8 *src, int attribute,
-+@@ -43,6 +44,19 @@ static void update_attr(u8 *dst, u8 *src, int attribute,
-  	}
-  }
-  
-@@ -293,8 +293,6 @@
- +	unsigned long p = (long)utf8;
- +	if (p >= vc->vc_origin && p < vc->vc_scr_end) {
- +		return scr_readw((unsigned short *)(p + vc->vc_screenbuf_size));
--+	} else if (vc->vc_num == fg_console && fbcon_is_softback(utf8)){
--+		return scr_readw((unsigned short *)(p + fbcon_softback_size));
- +	} else {
- +		u16 extra_c;
- +		int c = *(int*)utf8;
-@@ -381,7 +379,7 @@
- +
-  	cursor.set = 0;
-  
-- 	if (softback_lines) {
-+ 	c = scr_readw((u16 *) vc->vc_pos);
- @@ -258,7 +299,7 @@ static void bit_cursor(struct vc_data *vc, struct fb_info *info, int mode,
-  
-   	c = scr_readw((u16 *) vc->vc_pos);
-@@ -395,43 +393,7 @@
- index c9235a2f42f89..7ed69f292db9b 100644
- --- a/drivers/video/fbdev/core/fbcon.c
- +++ b/drivers/video/fbdev/core/fbcon.c
--@@ -123,7 +123,8 @@ static int logo_lines;
--    enums.  */
-- static int logo_shown = FBCON_LOGO_CANSHOW;
-- /* Software scrollback */
---static int fbcon_softback_size = 32768;
--+/*I need to use it out side fbcon.c */
--+int fbcon_softback_size = 32768;
-- static unsigned long softback_buf, softback_curr;
-- static unsigned long softback_in;
-- static unsigned long softback_top, softback_end;
--@@ -216,6 +217,14 @@ static void fbcon_start(void);
-- static void fbcon_exit(void);
-- static struct device *fbcon_device;
-- 
--+int fbcon_is_softback(const unsigned short *str)
--+{
--+	unsigned long p = (long)str;
--+	if(p >= softback_buf && p <softback_end)
--+		return 1;
--+	return 0;
--+}
--+
-- #ifdef CONFIG_FRAMEBUFFER_CONSOLE_ROTATION
-- static inline void fbcon_set_rotation(struct fb_info *info)
-- {
--@@ -1019,10 +1028,7 @@ static const char *fbcon_startup(void)
-- 	if (info->fix.type != FB_TYPE_TEXT) {
-- 		if (fbcon_softback_size) {
-- 			if (!softback_buf) {
---				softback_buf =
---				    (unsigned long)
---				    kvmalloc(fbcon_softback_size,
---					    GFP_KERNEL);
--+				softback_buf = (unsigned long) kmalloc(fbcon_softback_size * 2, GFP_KERNEL);
-- 				if (!softback_buf) {
-- 					fbcon_softback_size = 0;
-- 					softback_top = 0;
-+
- @@ -1051,7 +1057,8 @@ static const char *fbcon_startup(void)
-  		vc->vc_font.width = font->width;
-  		vc->vc_font.height = font->height;
-@@ -481,31 +443,6 @@
-  		p->userfont = t->userfont;
-  		if (p->userfont)
-  			REFCOUNT(p->fontdata)++;
--@@ -1612,6 +1618,7 @@ static __inline__ void ypan_down_redraw(struct vc_data *vc, int t, int count)
-- static void fbcon_redraw_softback(struct vc_data *vc, struct fbcon_display *p,
-- 				  long delta)
-- {
--+	u16 charmask = vc->vc_hi_font_mask ? 0x1ff : 0xff;
-- 	int count = vc->vc_rows;
-- 	unsigned short *d, *s;
-- 	unsigned long n;
--@@ -1674,6 +1681,8 @@ static void fbcon_redraw_softback(struct vc_data *vc, struct fbcon_display *p,
-- 					start = s;
-- 				}
-- 			}
--+			if( ((scr_readw(s) & charmask) == 0xff || (scr_readw(s) & charmask) == 0xfe) && scr_readw(s + (vc->vc_screenbuf_size >> 1)) != 0){
--+			}else{
-- 			if (c == scr_readw(d)) {
-- 				if (s > start) {
-- 					fbcon_putcs(vc, start, s - start,
--@@ -1685,6 +1694,7 @@ static void fbcon_redraw_softback(struct vc_data *vc, struct fbcon_display *p,
-- 					start++;
-- 				}
-- 			}
--+			}
-- 			s++;
-- 			d++;
-- 		} while (s < le);
- @@ -1767,6 +1777,7 @@ static void fbcon_redraw_blit(struct vc_data *vc, struct fb_info *info,
-  			}
-  
-@@ -554,14 +491,6 @@
-  			console_conditional_schedule();
-  			s++;
-  			d++;
--@@ -1852,6 +1868,7 @@ static inline void fbcon_softback_note(struct vc_data *vc, int t,
-- 
-- 	while (count) {
-- 		scr_memcpyw((u16 *) softback_in, p, vc->vc_size_row);
--+		scr_memcpyw((u16 *) softback_in + (fbcon_softback_size >> 1), p + (vc->vc_screenbuf_size >> 1), vc->vc_size_row);
-- 		count--;
-- 		p = advance_row(p, 1);
-- 		softback_in += vc->vc_size_row;
- @@ -2455,7 +2472,6 @@ static int fbcon_get_font(struct vc_data *vc, struct console_font *font)
-  
-  	font->width = vc->vc_font.width;
-@@ -570,40 +499,22 @@
-  	if (!font->data)
-  		return 0;
-  
--@@ -2760,6 +2776,19 @@ static u16 *fbcon_screen_pos(struct vc_data *vc, int offset)
-- 	unsigned long p;
-- 	int line;
-- 	
-+@@ -2593,6 +2593,10 @@ static void fbcon_set_palette(struct vc_
-+ 
-+ static u16 *fbcon_screen_pos(struct vc_data *vc, int offset)
-+ {
- +	if (offset < 0) {
- +		offset = -offset - 1;
--+		if (vc->vc_num != fg_console || !softback_lines)
--+			return (u16 *)(vc->vc_origin + offset + (vc->vc_screenbuf_size));
--+		line = offset / vc->vc_size_row;
--+		if (line >= softback_lines)
--+			return (u16 *) (vc->vc_origin + offset - softback_lines * vc->vc_size_row + (vc->vc_screenbuf_size));
--+		p = softback_curr + offset;
--+		if (p >= softback_end)
--+			p += softback_buf - softback_end;
--+		return (u16 *) (p + (fbcon_softback_size));
--+	}
--+
-- 	if (vc->vc_num != fg_console || !softback_lines)
-- 		return (u16 *) (vc->vc_origin + offset);
-- 	line = offset / vc->vc_size_row;
--@@ -2867,6 +2896,8 @@ static void fbcon_scrolldelta(struct vc_data *vc, int lines)
-- 					q -= vc->vc_size_row;
-- 					scr_memcpyw((u16 *) q, (u16 *) p,
-- 						    vc->vc_size_row);
--+					scr_memcpyw((u16 *) (q + (vc->vc_screenbuf_size >> 1)), (u16 *) (p + (fbcon_softback_size >> 1)),
--+						    vc->vc_size_row);
-- 				}
-- 				softback_in = softback_curr = p;
-- 				update_region(vc, vc->vc_origin,
-++		return (u16 *)(vc->vc_origin + offset + (vc->vc_screenbuf_size));
-++	}    
-+ 	return (u16 *) (vc->vc_origin + offset);
-+ }
-+ 
- diff --git a/drivers/video/fbdev/core/fbcon.h b/drivers/video/fbdev/core/fbcon.h
- index 20dea853765f5..b34c419dd1eb2 100644
- --- a/drivers/video/fbdev/core/fbcon.h
- +++ b/drivers/video/fbdev/core/fbcon.h
--@@ -262,4 +262,13 @@ extern void fbcon_set_rotate(struct fbcon_ops *ops);
-+@@ -262,4 +262,10 @@ extern void fbcon_set_rotate(struct fbcon_ops *ops);
-  #define fbcon_set_rotate(x) do {} while(0)
-  #endif /* CONFIG_FRAMEBUFFER_CONSOLE_ROTATION */
-  
-@@ -613,9 +524,6 @@
- +#define fbcon_platform_get_rotate(i) FB_ROTATE_UR
- +#endif /* CONFIG_DMI */
- +
--+extern int fbcon_softback_size;
--+extern int fbcon_is_softback(const unsigned short *str);
--+
-  #endif /* _VIDEO_FBCON_H */
- diff --git a/drivers/video/fbdev/core/fbcon_ccw.c b/drivers/video/fbdev/core/fbcon_ccw.c
- index dfa9a8aa4509c..beb33f5795061 100644
-@@ -665,8 +573,8 @@
-  	if (!ops->fontbuffer)
-  		return;
- @@ -245,9 +258,19 @@ static void ccw_cursor(struct vc_data *vc, struct fb_info *info, int mode,
-- 			y += softback_lines;
-- 	}
-+ 
-+ 	cursor.set = 0;
-  
- - 	c = scr_readw((u16 *) vc->vc_pos);
- +	c = scr_readw((u16 *) vc->vc_pos);
diff --git a/ck-fix-broken-sleep2ram-5.4.48+.patch b/ck-fix-broken-sleep2ram-5.4.48+.patch
deleted file mode 100644
index b43e9db1a568..000000000000
--- a/ck-fix-broken-sleep2ram-5.4.48+.patch
+++ /dev/null
@@ -1,31 +0,0 @@
-From fb7e2cfaf61cf5f9c2336331e73296f455bd2d51 Mon Sep 17 00:00:00 2001
-From: Steven Barrett <steven@liquorix.net>
-Date: Sat, 27 Jun 2020 17:32:41 -0500
-Subject: [PATCH] muqss: Revert invocation of "finish_cpu" when offlining core
-
-Backporting the equivalent change in sched/core.c to sched/MuQSS.c in
-function, idle_task_exit, causes an oops at boot with MuQSS.
-
-Instead, make an exception for MuQSS so "finish_cpu" is not executed
-while running MuQSS and retain the original "idle_task_exit"
-implementation.
----
- kernel/cpu.c | 4 ++++
- 1 file changed, 4 insertions(+)
-
-diff --git a/kernel/cpu.c b/kernel/cpu.c
-index 244d305443773..90b77028233b0 100644
---- a/kernel/cpu.c
-+++ b/kernel/cpu.c
-@@ -1565,7 +1565,11 @@ static struct cpuhp_step cpuhp_hp_states[] = {
- 	[CPUHP_BRINGUP_CPU] = {
- 		.name			= "cpu:bringup",
- 		.startup.single		= bringup_cpu,
-+#ifdef CONFIG_SCHED_MUQSS
-+		.teardown.single	= NULL,
-+#else
- 		.teardown.single	= finish_cpu,
-+#endif
- 		.cant_stop		= true,
- 	},
- 	/* Final state before CPU kills itself */
diff --git a/ck-patch-for-5.4.57+.patch b/ck-patch-for-5.4.57+.patch
deleted file mode 100644
index 25a847ac5ba0..000000000000
--- a/ck-patch-for-5.4.57+.patch
+++ /dev/null
@@ -1,13 +0,0 @@
---- patch-5.4-ck1	2020-08-08 16:53:19.000000000 +0800
-+++ patch-5.4.57-ck1	2020-08-08 12:51:45.000000000 +0800
-@@ -17368,9 +17368,9 @@
- --- a/kernel/time/timer.c
- +++ b/kernel/time/timer.c
- @@ -43,6 +43,7 @@
-- #include <linux/sched/debug.h>
-  #include <linux/slab.h>
-  #include <linux/compat.h>
-+ #include <linux/random.h>
- +#include <linux/freezer.h>
-  
-  #include <linux/uaccess.h>
diff --git a/ck-patch-for-5.4.62+.patch b/ck-patch-for-5.4.62+.patch
deleted file mode 100644
index 2f2d84096228..000000000000
--- a/ck-patch-for-5.4.62+.patch
+++ /dev/null
@@ -1,35 +0,0 @@
-Fix: muqss, missing static function, uclamp_is_used
-Ref: https://github.com/zen-kernel/zen-kernel/commit/e7113f2c1d56962d4afabc627ad761c138f5b858.patch
-
---- patch-5.4.61-ck1	2020-09-04 22:10:44.000000000 +0800
-+++ patch-5.4.62-ck1	2020-09-05 10:27:35.000000000 +0800
-@@ -15665,7 +15665,7 @@
- index 000000000000..5214b158d82f
- --- /dev/null
- +++ b/kernel/sched/MuQSS.h
--@@ -0,0 +1,1005 @@
-+@@ -0,0 +1,1010 @@
- +/* SPDX-License-Identifier: GPL-2.0 */
- +#ifndef MUQSS_SCHED_H
- +#define MUQSS_SCHED_H
-@@ -16453,6 +16453,11 @@
- +	return util;
- +}
- +
-++static inline bool uclamp_is_used(void)
-++{
-++	return false;
-++}
-++
- +#ifdef arch_scale_freq_capacity
- +#ifndef arch_scale_freq_invariant
- +#define arch_scale_freq_invariant()	(true)
-@@ -16691,7 +16691,7 @@
- @@ -213,7 +219,7 @@ unsigned long schedutil_cpu_util(int cpu, unsigned long util_cfs,
-  	struct rq *rq = cpu_rq(cpu);
-  
-- 	if (!IS_BUILTIN(CONFIG_UCLAMP_TASK) &&
-+ 	if (!uclamp_is_used() &&
- -	    type == FREQUENCY_UTIL && rt_rq_is_runnable(&rq->rt)) {
- +	    type == FREQUENCY_UTIL && rt_rq_runnable(rq)) {
-  		return max;
diff --git a/sphinx-workaround.patch b/sphinx-workaround.patch
deleted file mode 100644
index 59aafa909b7b..000000000000
--- a/sphinx-workaround.patch
+++ /dev/null
@@ -1,15 +0,0 @@
-diff --git i/Documentation/conf.py w/Documentation/conf.py
-index a8fe845832bc..2dae2e830c26 100644
---- i/Documentation/conf.py
-+++ w/Documentation/conf.py
-@@ -36,8 +36,8 @@ needs_sphinx = '1.3'
- # Add any Sphinx extension module names here, as strings. They can be
- # extensions coming with Sphinx (named 'sphinx.ext.*') or your custom
- # ones.
--extensions = ['kerneldoc', 'rstFlatTable', 'kernel_include', 'cdomain',
--              'kfigure', 'sphinx.ext.ifconfig', 'automarkup']
-+extensions = ['kerneldoc', 'rstFlatTable', 'kernel_include',
-+              'kfigure', 'sphinx.ext.ifconfig']
- 
- # The name of the math extension changed on Sphinx 1.4
- if (major == 1 and minor > 3) or (major > 1):
diff --git a/uksm-patch-for-5.4.33+.patch b/uksm-patch-for-5.4.33+.patch
deleted file mode 100644
index 54b4101cfc30..000000000000
--- a/uksm-patch-for-5.4.33+.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- uksm-5.4.patch	2020-01-02 19:55:25.000000000 +0800
-+++ uksm-5.4.33.patch	2020-04-29 17:04:58.000000000 +0800
-@@ -80,7 +80,7 @@
- @@ -1384,6 +1385,7 @@ void setup_new_exec(struct linux_binprm * bprm)
-  	/* An exec changes our domain. We are no longer part of the thread
-  	   group */
-- 	current->self_exec_id++;
-+ 	WRITE_ONCE(current->self_exec_id, current->self_exec_id + 1);
- +
-  	flush_signal_handlers(current, 0);
-  }
diff --git a/uksm-patch-for-5.4.69+.patch b/uksm-patch-for-5.4.69+.patch
deleted file mode 100644
index aeb3b2035843..000000000000
--- a/uksm-patch-for-5.4.69+.patch
+++ /dev/null
@@ -1,27 +0,0 @@
---- uksm-5.4.68.patch	2020-09-12 21:14:21.870005000 +0800
-+++ uksm-5.4.69.patch	2020-10-01 23:32:11.559514294 +0800
-@@ -1129,18 +1129,14 @@
-  
-  			if (!PageAnon(page)) {
-  				if (pte_dirty(ptent)) {
--@@ -2169,8 +2196,10 @@ static inline void cow_user_page(struct page *dst, struct page *src, unsigned lo
-- 			clear_page(kaddr);
-- 		kunmap_atomic(kaddr);
-- 		flush_dcache_page(dst);
---	} else
--+	} else {
-- 		copy_user_highpage(dst, src, va, vma);
-+@@ -2410,6 +2437,7 @@ static inline bool cow_user_page(struct page *dst, struct page *src,
-+ 
-+ 	if (likely(src)) {
-+ 		copy_user_highpage(dst, src, addr, vma);
- +		uksm_cow_page(vma, src);
--+	}
-- }
-+ 		return true;
-+ 	}
-  
-- static gfp_t __get_fault_gfp_mask(struct vm_area_struct *vma)
- @@ -2322,6 +2351,7 @@ static vm_fault_t wp_page_copy(struct vm_fault *vmf)
-  							      vmf->address);
-  		if (!new_page)