Update to 4.20.2-1

3 files changed, 20 insertions, 43 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 2b980480470b..a12f6c378b29 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,7 +1,7 @@
 # Generated by mksrcinfo v8
-# Wed Jan  9 21:07:18 UTC 2019
+# Sun Jan 13 13:18:41 UTC 2019
 pkgbase = linux-ck
-	pkgver = 4.20.1
+	pkgver = 4.20.2
 	pkgrel = 1
 	url = https://wiki.archlinux.org/index.php/Linux-ck
 	arch = x86_64
@@ -11,8 +11,8 @@ pkgbase = linux-ck
 	makedepends = bc
 	makedepends = libelf
 	options = !strip
-	source = https://www.kernel.org/pub/linux/kernel/v4.x/linux-4.20.1.tar.xz
-	source = https://www.kernel.org/pub/linux/kernel/v4.x/linux-4.20.1.tar.sign
+	source = https://www.kernel.org/pub/linux/kernel/v4.x/linux-4.20.2.tar.xz
+	source = https://www.kernel.org/pub/linux/kernel/v4.x/linux-4.20.2.tar.sign
 	source = config
 	source = 60-linux.hook
 	source = 90-linux.hook
@@ -20,9 +20,9 @@ pkgbase = linux-ck
 	source = enable_additional_cpu_optimizations-20180509.tar.gz::https://github.com/graysky2/kernel_gcc_patch/archive/20180509.tar.gz
 	source = http://ck.kolivas.org/patches/4.0/4.20/4.20-ck1/patch-4.20-ck1.xz
 	source = 0001-add-sysctl-to-disallow-unprivileged-CLONE_NEWUSER-by.patch
-	sha256sums = 45096f1ffbfbb4cdeef6eecfa6ca7eabbf534f04645fd0d849564a58ddd2198f
+	sha256sums = eb49b89833c548cf0c61d824f6e6e327dfe28877a7301d3bad97641064078669
 	sha256sums = SKIP
-	sha256sums = 5229409c61e545697c09a7a877f6d20033cf8658dff286790295dd895df5299c
+	sha256sums = 40f4d5d3ba7a926f00a77236b6096dee8ffa97ed11120454a03fa9e115695324
 	sha256sums = ae2e95db94ef7176207c690224169594d49445e04249d2499e9d2fbc117a0b21
 	sha256sums = c043f3033bb781e2688794a59f6d1f7ed49ef9b13eb77ff9a425df33a244a636
 	sha256sums = ad6344badc91ad0630caacde83f7f9b97276f80d26a20619a87952be65492c65
@@ -38,12 +38,12 @@ pkgname = linux-ck
 	depends = kmod
 	depends = mkinitcpio
 	optdepends = crda: to set the correct wireless channels of your country
-	provides = linux-ck=4.20.1
+	provides = linux-ck=4.20.2
 	backup = etc/mkinitcpio.d/linux-ck.preset
 
 pkgname = linux-ck-headers
 	pkgdesc = Header files and scripts for building modules for Linux-ck kernel
 	depends = linux-ck
-	provides = linux-ck-headers=4.20.1
-	provides = linux-headers=4.20.1
+	provides = linux-ck-headers=4.20.2
+	provides = linux-headers=4.20.2
 
diff --git a/PKGBUILD b/PKGBUILD
index 356f91060948..8c00f3dfcad0 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -10,10 +10,13 @@
 _makenconfig=
 
 # Optionally select a sub architecture by number if building in a clean chroot
-# Leaving this entry blank will require user interaction during the build 
+# Leaving this entry blank will require user interaction during the build
 # which will cause a failure to build if using makechrootpkg. Note that the
 # generic (default) option is 26.
 #
+# Note - the march=native option is unavailable by this method, use the nconfig
+# and manually select it.
+#
 #  1. AMD Opteron/Athlon64/Hammer/K8 (MK8)
 #  2. AMD Opteron/Athlon64/Hammer/K8 with SSE3 (MK8SSE3)
 #  3. AMD 61xx/7x50/PhenomX3/X4/II/K10 (MK10)
@@ -40,22 +43,11 @@ _makenconfig=
 #  24. Intel Cannon Lake (MCANNONLAKE)
 #  25. Intel Ice Lake (MICELAKE)
 #  26. Generic-x86-64 (GENERIC_CPU)
-#  27. Native optimizations autodetected by GCC (MNATIVE)
 _subarch=
 
-# NUMA is optimized for multi-socket motherboards. A single multi-core CPU can
-# actually run slower with NUMA enabled. Most users will want to set this option
-# to enabled ... in other words, do not use NUMA on a single CPU system.
-#
-# It has been reported that users of CUDA require NUMA to be enabled, therefore
-# if you require CUDA support, be sure the variable below is set to a null
-# See: https://bbs.archlinux.org/viewtopic.php?id=239174
-_NUMAdisable=y
-
 # Compile ONLY probed modules
-# As of mainline 2.6.32, running with this option will only build the modules
-# that you currently have probed in your system VASTLY reducing the number of
-# modules built and the build time to do it.
+# Build in only the modules that you currently have probed in your system VASTLY
+# reducing the number of modules built and the build time.
 #
 # WARNING - ALL modules must be probed BEFORE you begin making the pkg!
 #
@@ -69,7 +61,7 @@ _localmodcfg=
 ### IMPORTANT: Do no edit below this line unless you know what you're doing
 
 pkgbase=linux-ck
-_srcver=4.20.1-arch1
+_srcver=4.20.2-arch1
 pkgver=${_srcver%-*}
 pkgrel=1
 _ckpatchversion=1
@@ -94,9 +86,9 @@ validpgpkeys=(
   'ABAF11C65A2970B130ABE3C479BE3E4300411886'  # Linus Torvalds
   '647F28654894E3BD457199BE38DBBDC86092693E'  # Greg Kroah-Hartman
 )
-sha256sums=('45096f1ffbfbb4cdeef6eecfa6ca7eabbf534f04645fd0d849564a58ddd2198f'
+sha256sums=('eb49b89833c548cf0c61d824f6e6e327dfe28877a7301d3bad97641064078669'
             'SKIP'
-            '5229409c61e545697c09a7a877f6d20033cf8658dff286790295dd895df5299c'
+            '40f4d5d3ba7a926f00a77236b6096dee8ffa97ed11120454a03fa9e115695324'
             'ae2e95db94ef7176207c690224169594d49445e04249d2499e9d2fbc117a0b21'
             'c043f3033bb781e2688794a59f6d1f7ed49ef9b13eb77ff9a425df33a244a636'
             'ad6344badc91ad0630caacde83f7f9b97276f80d26a20619a87952be65492c65'
@@ -133,21 +125,6 @@ prepare() {
   msg2 "Setting config..."
   cp ../config .config
 
-  ### Optionally disable NUMA
-  if [ -n "$_NUMAdisable" ]; then
-    msg2 "Disabling NUMA from kernel config..."
-    sed -i -e 's/CONFIG_NUMA=y/# CONFIG_NUMA is not set/' \
-      -i -e '/CONFIG_AMD_NUMA=y/d' \
-      -i -e '/CONFIG_X86_64_ACPI_NUMA=y/d' \
-      -i -e '/CONFIG_NODES_SPAN_OTHER_NODES=y/d' \
-      -i -e '/# CONFIG_NUMA_EMU is not set/d' \
-      -i -e '/CONFIG_NODES_SHIFT=6/d' \
-      -i -e '/CONFIG_NEED_MULTIPLE_NODES=y/d' \
-      -i -e '/# CONFIG_MOVABLE_NODE is not set/d' \
-      -i -e '/CONFIG_USE_PERCPU_NUMA_NODE_ID=y/d' \
-      -i -e '/CONFIG_ACPI_NUMA=y/d' ./.config
-  fi
-
   # https://bbs.archlinux.org/viewtopic.php?pid=1824594#p1824594
   sed -i -e 's/# CONFIG_PSI_DEFAULT_DISABLED is not set/CONFIG_PSI_DEFAULT_DISABLED=y/' ./.config
 
diff --git a/config b/config
index e34aa7d02748..2a22dc285fd6 100644
--- a/config
+++ b/config
@@ -1,6 +1,6 @@
 #
 # Automatically generated file; DO NOT EDIT.
-# Linux/x86 4.20.0 Kernel Configuration
+# Linux/x86 4.20.1 Kernel Configuration
 #
 
 #
@@ -7242,10 +7242,10 @@ CONFIG_TYPEC_MUX_PI3USB30532=m
 # USB Type-C Alternate Mode drivers
 #
 CONFIG_TYPEC_DP_ALTMODE=m
+CONFIG_USB_ROLE_SWITCH=m
 CONFIG_USB_ROLES_INTEL_XHCI=m
 CONFIG_USB_LED_TRIG=y
 CONFIG_USB_ULPI_BUS=m
-CONFIG_USB_ROLE_SWITCH=m
 CONFIG_UWB=m
 CONFIG_UWB_HWA=m
 CONFIG_UWB_WHCI=m