upgpkg: linux-gc 5.2.7-1

upstream release

3 files changed, 17 insertions, 24 deletions

diff --git a/.SRCINFO b/.SRCINFO
index f860bc33a970..9f35f007900f 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,6 +1,6 @@
 pkgbase = linux-gc
-	pkgver = 5.2.5
-	pkgrel = 2
+	pkgver = 5.2.7
+	pkgrel = 1
 	url = https://cchalpha.blogspot.co.uk/
 	arch = x86_64
 	license = GPL2
@@ -15,40 +15,38 @@ pkgbase = linux-gc
 	makedepends = graphviz
 	makedepends = imagemagick
 	options = !strip
-	source = linux-5.2.5-arch1.tar.gz::https://git.archlinux.org/linux.git/snapshot/linux-5.2.5-arch1.tar.gz
+	source = linux-5.2.7-arch1.tar.gz::https://git.archlinux.org/linux.git/snapshot/linux-5.2.7-arch1.tar.gz
 	source = config
 	source = 60-linux.hook
 	source = 90-linux.hook
 	source = linux.preset
 	source = 0001_v5.2_bmq098.patch::https://gitlab.com/alfredchen/bmq/raw/master/5.2/v5.2_bmq098.patch
 	source = 0002_enable_additional_cpu_optimizations-20190714.tar.gz::https://github.com/graysky2/kernel_gcc_patch/archive/20190714.tar.gz
-	source = 0003_uksm-5.2.patch::https://raw.githubusercontent.com/Szpadel/uksm/patch-2/v5.x/uksm-5.2.patch
 	validpgpkeys = ABAF11C65A2970B130ABE3C479BE3E4300411886
 	validpgpkeys = 647F28654894E3BD457199BE38DBBDC86092693E
 	validpgpkeys = 8218F88849AAC522E94CF470A5E9288C4FA415FA
-	sha256sums = 22674945a57daed9f848cb0abf6a75f1aa65e8441556b583bdd7515288e81783
-	sha256sums = 4423813200fefc9e8a5b9956692d763b74824030312983973e3ae5c027a971e2
+	sha256sums = 3a7c185fc8557c0da41316f0165447aa1c9018c2db81eac36c19f68ff464dbff
+	sha256sums = b22d748dd419708cda26970f97bd302d84100b5df0147cbe29d29749d57d2637
 	sha256sums = ae2e95db94ef7176207c690224169594d49445e04249d2499e9d2fbc117a0b21
 	sha256sums = c043f3033bb781e2688794a59f6d1f7ed49ef9b13eb77ff9a425df33a244a636
 	sha256sums = ad6344badc91ad0630caacde83f7f9b97276f80d26a20619a87952be65492c65
 	sha256sums = 628efd7ea8d6eb7a015e8790411e2353aa9cd6548099aa5c229a3b1cd25f1794
 	sha256sums = 2466fb4aecc66d1b258b4cbdb2f215b5099f266d8c4386bb62ad1a0acd0caf5b
-	sha256sums = 5febbab9437b1b97605fbfd170660e86d12593dac9033e8a32d112360eec1acc
 
 pkgname = linux-gc
-	pkgdesc = The Linux-gc kernel and modules with the PDS-mq CPU scheduler and UKSM patchset
+	pkgdesc = The Linux-gc kernel and modules with the PDS-mq CPU scheduler
 	install = linux.install
 	depends = coreutils
 	depends = linux-firmware
 	depends = kmod
 	depends = mkinitcpio
 	optdepends = crda: to set the correct wireless channels of your country
-	provides = linux-gc=5.2.5
+	provides = linux-gc=5.2.7
 	backup = etc/mkinitcpio.d/linux-gc.preset
 
 pkgname = linux-gc-headers
-	pkgdesc = Header files and scripts for building modules for Linux-gc kernel and UKSM patchset
+	pkgdesc = Header files and scripts for building modules for Linux-gc kernel
 	depends = linux-gc
-	provides = linux-gc-headers=5.2.5
-	provides = linux-headers=5.2.5
+	provides = linux-gc-headers=5.2.7
+	provides = linux-headers=5.2.7
 
diff --git a/PKGBUILD b/PKGBUILD
index 038e5e3c7b1f..e964e5f5b9be 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -23,9 +23,9 @@ _localmodcfg=
 ### IMPORTANT: Do no edit below this line unless you know what you're doing
 
 pkgbase=linux-gc
-_srcver=5.2.5-arch1
+_srcver=5.2.7-arch1
 pkgver=${_srcver%-*}
-pkgrel=2
+pkgrel=1
 _bmqversion=098
 arch=(x86_64)
 url="https://cchalpha.blogspot.co.uk/"
@@ -38,7 +38,6 @@ options=('!strip')
 _srcname=linux-$_srcver
 _bmq_patch="v5.2_bmq${_bmqversion}.patch"
 _gcc_more_v='20190714'
-_ukms_patch='uksm-5.2.patch'
 source=(
   "$_srcname.tar.gz::https://git.archlinux.org/linux.git/snapshot/linux-$_srcver.tar.gz"
   config         # the main kernel config file
@@ -47,21 +46,19 @@ source=(
   linux.preset   # standard config files for mkinitcpio ramdisk
   "0001_${_bmq_patch}::https://gitlab.com/alfredchen/bmq/raw/master/5.2/${_bmq_patch}"
   "0002_enable_additional_cpu_optimizations-${_gcc_more_v}.tar.gz::https://github.com/graysky2/kernel_gcc_patch/archive/${_gcc_more_v}.tar.gz"
-  "0003_${_ukms_patch}::https://raw.githubusercontent.com/Szpadel/uksm/patch-2/v5.x/${_ukms_patch}"
 )
 validpgpkeys=(
   'ABAF11C65A2970B130ABE3C479BE3E4300411886'  # Linus Torvalds
   '647F28654894E3BD457199BE38DBBDC86092693E'  # Greg Kroah-Hartman
   '8218F88849AAC522E94CF470A5E9288C4FA415FA'  # Jan Alexander Steffens (heftig)
 )
-sha256sums=('22674945a57daed9f848cb0abf6a75f1aa65e8441556b583bdd7515288e81783'
-            '4423813200fefc9e8a5b9956692d763b74824030312983973e3ae5c027a971e2'
+sha256sums=('3a7c185fc8557c0da41316f0165447aa1c9018c2db81eac36c19f68ff464dbff'
+            'b22d748dd419708cda26970f97bd302d84100b5df0147cbe29d29749d57d2637'
             'ae2e95db94ef7176207c690224169594d49445e04249d2499e9d2fbc117a0b21'
             'c043f3033bb781e2688794a59f6d1f7ed49ef9b13eb77ff9a425df33a244a636'
             'ad6344badc91ad0630caacde83f7f9b97276f80d26a20619a87952be65492c65'
             '628efd7ea8d6eb7a015e8790411e2353aa9cd6548099aa5c229a3b1cd25f1794'
-            '2466fb4aecc66d1b258b4cbdb2f215b5099f266d8c4386bb62ad1a0acd0caf5b'
-            '5febbab9437b1b97605fbfd170660e86d12593dac9033e8a32d112360eec1acc')
+            '2466fb4aecc66d1b258b4cbdb2f215b5099f266d8c4386bb62ad1a0acd0caf5b')
 
 _kernelname=${pkgbase#linux}
 : ${_kernelname:=-gc}
@@ -123,7 +120,7 @@ build() {
 }
 
 _package() {
-  pkgdesc="The ${pkgbase/linux/Linux} kernel and modules with the PDS-mq CPU scheduler and UKSM patchset"
+  pkgdesc="The ${pkgbase/linux/Linux} kernel and modules with the PDS-mq CPU scheduler"
   depends=(coreutils linux-firmware kmod mkinitcpio)
   optdepends=('crda: to set the correct wireless channels of your country')
   provides=("linux-gc=${pkgver}")
@@ -179,7 +176,7 @@ _package() {
 }
 
 _package-headers() {
-  pkgdesc="Header files and scripts for building modules for ${pkgbase/linux/Linux} kernel and UKSM patchset"
+  pkgdesc="Header files and scripts for building modules for ${pkgbase/linux/Linux} kernel"
   depends=('linux-gc')
   provides=("linux-gc-headers=${pkgver}" "linux-headers=${pkgver}")
 
diff --git a/config b/config
index e9f96a54a46b..8ac1818672cd 100644
--- a/config
+++ b/config
@@ -978,8 +978,6 @@ CONFIG_BOUNCE=y
 CONFIG_VIRT_TO_BUS=y
 CONFIG_MMU_NOTIFIER=y
 CONFIG_KSM=y
-CONFIG_UKSM=y
-# CONFIG_KSM_LEGACY is not set
 CONFIG_DEFAULT_MMAP_MIN_ADDR=65536
 CONFIG_ARCH_SUPPORTS_MEMORY_FAILURE=y
 CONFIG_MEMORY_FAILURE=y