Sync with Arch

Signed-off-by: Piotr Gorski <lucjan.lucjanov@gmail.com>

3 files changed, 8 insertions, 11 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 900cf36c1acb..a4d5af82ab05 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -27,7 +27,7 @@ pkgbase = linux-uksm
 	sha512sums = e62aa377a0acc4f63f394e27a0fb7316583ff1a6a6afdfcc97593ddffd7d2bc224cfd70b552cb3fb9513cf6b8db4c2fd913d21ec2380db8cd642e37d4d67370c
 	sha512sums = af14061bc151ed0b94c7759da1618a4a05d2c7669aec31d6e59a2f4874fe3b5a1774ad8b8f67f6c01daec84aae2dbd464ce4a74c611dd81619a3f4312507f017
 	sha512sums = 1d98e34bb276c8ccbc5f175a4ef887ccb9ecf2c72ded9133b2973bf940f8ca996129110d0a49b3bbe25f997a3f28108f3d8477403b05f01fee2589b4a04f4d0b
-	sha512sums = fab889d0a36d42eac3b86caa208d688e106a033b2eccca2ba734e776c2f898688517286ae049935365d430919ae5a05259963b6d08e4ad10f9d5f9b671351e94
+	sha512sums = 68e9a17cc473467694888d5dd1e9bc6d5bed9cf1d5ba23f6e27afbb4881e1a9b2c8e7f759bfd4b2f8bf2e361e6f9dcd5b4b6c3907500d4324a8d1566c5f2fc6b
 	sha512sums = 7ad5be75ee422dda3b80edd2eb614d8a9181e2c8228cd68b3881e2fb95953bf2dea6cbe7900ce1013c9de89b2802574b7b24869fc5d7a95d3cc3112c4d27063a
 	sha512sums = 2718b58dbbb15063bacb2bde6489e5b3c59afac4c0e0435b97fe720d42c711b6bcba926f67a8687878bd51373c9cf3adb1915a11666d79ccb220bf36e0788ab7
 	sha512sums = 8742e2eed421e2f29850e18616f435536c12036ff793f5682a3a8c980cf5dbfc88d17fd9539c87de15d9e4663dc3190f964f18a4722940465437927b6052abbf
diff --git a/PKGBUILD b/PKGBUILD
index 78614cc39f6f..0530d8c57b2c 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -384,7 +384,7 @@ sha512sums=('98de8f8d76ce6f0c0bbc6785e54caf4274329ccba55973b3e679209d62712c313a2
             'e62aa377a0acc4f63f394e27a0fb7316583ff1a6a6afdfcc97593ddffd7d2bc224cfd70b552cb3fb9513cf6b8db4c2fd913d21ec2380db8cd642e37d4d67370c'
             'af14061bc151ed0b94c7759da1618a4a05d2c7669aec31d6e59a2f4874fe3b5a1774ad8b8f67f6c01daec84aae2dbd464ce4a74c611dd81619a3f4312507f017'
             '1d98e34bb276c8ccbc5f175a4ef887ccb9ecf2c72ded9133b2973bf940f8ca996129110d0a49b3bbe25f997a3f28108f3d8477403b05f01fee2589b4a04f4d0b'
-            'fab889d0a36d42eac3b86caa208d688e106a033b2eccca2ba734e776c2f898688517286ae049935365d430919ae5a05259963b6d08e4ad10f9d5f9b671351e94'
+            '68e9a17cc473467694888d5dd1e9bc6d5bed9cf1d5ba23f6e27afbb4881e1a9b2c8e7f759bfd4b2f8bf2e361e6f9dcd5b4b6c3907500d4324a8d1566c5f2fc6b'
             '7ad5be75ee422dda3b80edd2eb614d8a9181e2c8228cd68b3881e2fb95953bf2dea6cbe7900ce1013c9de89b2802574b7b24869fc5d7a95d3cc3112c4d27063a'
             '2718b58dbbb15063bacb2bde6489e5b3c59afac4c0e0435b97fe720d42c711b6bcba926f67a8687878bd51373c9cf3adb1915a11666d79ccb220bf36e0788ab7'
             '8742e2eed421e2f29850e18616f435536c12036ff793f5682a3a8c980cf5dbfc88d17fd9539c87de15d9e4663dc3190f964f18a4722940465437927b6052abbf'
diff --git a/config b/config
index 5467df33987d..8110e4d285b8 100644
--- a/config
+++ b/config
@@ -1,6 +1,6 @@
 #
 # Automatically generated file; DO NOT EDIT.
-# Linux/x86 4.20.0-arch1 Kernel Configuration
+# Linux/x86 4.20.1-arch1 Kernel Configuration
 #
 
 #
@@ -1004,15 +1004,10 @@ CONFIG_IOSCHED_NOOP=y
 CONFIG_IOSCHED_DEADLINE=y
 CONFIG_IOSCHED_CFQ=y
 CONFIG_CFQ_GROUP_IOSCHED=y
-CONFIG_IOSCHED_BFQ_SQ=y
-CONFIG_BFQ_SQ_GROUP_IOSCHED=y
 # CONFIG_DEFAULT_DEADLINE is not set
-# CONFIG_DEFAULT_CFQ is not set
-CONFIG_DEFAULT_BFQ_SQ=y
+CONFIG_DEFAULT_CFQ=y
 # CONFIG_DEFAULT_NOOP is not set
-CONFIG_DEFAULT_IOSCHED="bfq-sq"
-CONFIG_MQ_IOSCHED_BFQ=y
-CONFIG_MQ_BFQ_GROUP_IOSCHED=y
+CONFIG_DEFAULT_IOSCHED="cfq"
 CONFIG_MQ_IOSCHED_DEADLINE=y
 CONFIG_MQ_IOSCHED_KYBER=y
 CONFIG_IOSCHED_BFQ=y
@@ -1073,6 +1068,8 @@ 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
@@ -7267,10 +7264,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