From f5c9dceafc94b8ac112f211056d7f881d60fadb2 Mon Sep 17 00:00:00 2001
From: Tk-Glitch <ti3nou@gmail.com>
Date: Mon, 14 Dec 2020 11:50:09 +0100
Subject: [PATCH] linux510-tkg: Update to 5.10 release.

---
 PKGBUILD                                      | 10 ++++-----
 linux-tkg-config/5.10/config.x86_64           |  1 +
 linux-tkg-config/prepare                      | 21 +++++++------------
 .../5.10/0013-v5.10-rc7-revert.patch          | 11 ----------
 4 files changed, 13 insertions(+), 30 deletions(-)
 delete mode 100644 linux-tkg-patches/5.10/0013-v5.10-rc7-revert.patch

diff --git a/PKGBUILD b/PKGBUILD
index 8c4ddd7..3045a3d 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -48,7 +48,7 @@ else
 fi
 pkgname=("${pkgbase}" "${pkgbase}-headers")
 pkgver="${_basekernel}"."${_sub}"
-pkgrel=99
+pkgrel=100
 pkgdesc='Linux-tkg'
 arch=('x86_64') # no i686 in here
 url="http://www.kernel.org/"
@@ -316,11 +316,10 @@ case $_basever in
         0011-ZFS-fix.patch
         #0012-linux-hardened.patch
         0012-misc-additions.patch
-        0013-v5.10-rc7-revert.patch
     )
-    sha256sums=('9f95194fc84eef01789f2ed6566518ef597e9c6541b640f7276f2a3ef1a221f2'
+    sha256sums=('dcdf99e43e98330d925016985bfbc7b83c66d367b714b2de0cbbfcbf83d8ca43'
             'SKIP'
-            '834247434877e4e76201ada7df35ebd4622116737e9650e0772f22d03083b426'
+            '346f1fb91784f978390834c36ec46995ae49688a06f907dc5870ddfae9d814d8'
             '1e15fc2ef3fa770217ecc63a220e5df2ddbcf3295eb4a021171e7edd4c6cc898'
             '66a03c246037451a77b4d448565b1d7e9368270c7d02872fbd0b5d024ed0a997'
             'f6383abef027fd9a430fd33415355e0df492cdc3c90e9938bf2d98f4f63b32e6'
@@ -340,8 +339,7 @@ case $_basever in
             'a557b342111849a5f920bbe1c129f3ff1fc1eff62c6bd6685e0972fc88e39911'
             '0d5fe3a9050536fe431564b221badb85af7ff57b330e3978ae90d21989fcad2d'
             '49262ce4a8089fa70275aad742fc914baa28d9c384f710c9a62f64796d13e104'
-            '433b919e6a0be26784fb4304c43b1811a28f12ad3de9e26c0af827f64c0c316e'
-            '748f7d9db58946d82caf4fe1c76d4f855eee806aa140b0aa69236f1f89a3e5c6')
+            '433b919e6a0be26784fb4304c43b1811a28f12ad3de9e26c0af827f64c0c316e')
 	;;
 esac
 
diff --git a/linux-tkg-config/5.10/config.x86_64 b/linux-tkg-config/5.10/config.x86_64
index 5d15c18..b3f7c8a 100644
--- a/linux-tkg-config/5.10/config.x86_64
+++ b/linux-tkg-config/5.10/config.x86_64
@@ -10230,6 +10230,7 @@ CONFIG_NFS_FSCACHE=y
 CONFIG_NFS_USE_KERNEL_DNS=y
 CONFIG_NFS_DEBUG=y
 # CONFIG_NFS_DISABLE_UDP_SUPPORT is not set
+# CONFIG_NFS_V4_2_READ_PLUS is not set
 CONFIG_NFSD=m
 CONFIG_NFSD_V2_ACL=y
 CONFIG_NFSD_V3=y
diff --git a/linux-tkg-config/prepare b/linux-tkg-config/prepare
index fc89a56..614d04b 100644
--- a/linux-tkg-config/prepare
+++ b/linux-tkg-config/prepare
@@ -4,7 +4,7 @@ ver54=83
 ver57=19
 ver58=18
 ver59=14
-ver510=rc7
+ver510=0
 
 _tkg_initscript() {
   # Load external configuration file if present. Available variable values will overwrite customization.cfg ones.
@@ -27,7 +27,7 @@ _tkg_initscript() {
 
   if [ -z "$_version" ] && [ ! -e "$_path"/versel ]; then
     plain "Which kernel version do you want to install?"
-    read -rp "`echo $'    1. 5.4 LTS\n    2. 5.7\n    3. 5.8\n  > 4. 5.9\n    5. 5.10 RC\nchoice[1-5?]'`" _VERSEL;
+    read -rp "`echo $'    1. 5.4 LTS\n    2. 5.7\n    3. 5.8\n    4. 5.9\n  > 5. 5.10\nchoice[1-5?]'`" _VERSEL;
     case $_VERSEL in
           "1")
           echo "_basever=54" > "$_path"/versel
@@ -44,16 +44,16 @@ _tkg_initscript() {
           echo "_basekernel=5.8" >> "$_path"/versel
           echo "_sub=${ver58}" >> "$_path"/versel
           ;;
-          "5")
-          echo "_basever=510" > "$_path"/versel
-          echo "_basekernel=5.10" >> "$_path"/versel
-          echo "_sub=${ver510}" >> "$_path"/versel
-          ;;
-          *)
+          "4")
           echo "_basever=59" > "$_path"/versel
           echo "_basekernel=5.9" >> "$_path"/versel
           echo "_sub=${ver59}" >> "$_path"/versel
           ;;
+          *)
+          echo "_basever=510" > "$_path"/versel
+          echo "_basekernel=5.10" >> "$_path"/versel
+          echo "_sub=${ver510}" >> "$_path"/versel
+          ;;
     esac
   elif [ -n "$_version" ];then
     case "$_version" in
@@ -363,11 +363,6 @@ _tkg_srcprep() {
     tkgpatch="$srcdir/0012-misc-additions.patch" && _tkg_patcher
   fi
 
-  if [ "$ver510" = "rc7" ] && [ "$_basever" = "510" ]; then
-    msg2 "Applying 5.10-rc7 compilation patch"
-    tkgpatch="$srcdir/0013-v5.10-rc7-revert.patch" && _tkg_patcher
-  fi
-
   # prjc/bmq patch rev
   if [ "$_basever" = "58" ] || [ "$_basever" = "57" ]; then
     rev=3
diff --git a/linux-tkg-patches/5.10/0013-v5.10-rc7-revert.patch b/linux-tkg-patches/5.10/0013-v5.10-rc7-revert.patch
deleted file mode 100644
index 0db3a3c..0000000
--- a/linux-tkg-patches/5.10/0013-v5.10-rc7-revert.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- a/mm/filemap.c	2020-12-07 01:16:40.233503592 -0800
-+++ b/mm/filemap.c	2020-12-07 01:16:05.211387455 -0800
-@@ -827,7 +827,7 @@
- }
- EXPORT_SYMBOL_GPL(replace_page_cache_page);
- 
--static noinline int __add_to_page_cache_locked(struct page *page,
-+noinline int __add_to_page_cache_locked(struct page *page,
- 					struct address_space *mapping,
- 					pgoff_t offset, gfp_t gfp,
- 					void **shadowp)