From 4c227722aeee7b03424d498af421cbff89b8702a Mon Sep 17 00:00:00 2001
From: Alexey Min <alexey.min@gmail.com>
Date: Sun, 12 Jul 2020 15:55:43 +0300
Subject: [PATCH] linux-motorola-payton: enable CONFIG_USER_NS (MR 1411)

---
 device/testing/linux-motorola-payton/APKBUILD               | 4 ++--
 .../linux-motorola-payton/config-motorola-payton.aarch64    | 6 +++---
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/device/testing/linux-motorola-payton/APKBUILD b/device/testing/linux-motorola-payton/APKBUILD
index f2e4be8bc..df5480b91 100644
--- a/device/testing/linux-motorola-payton/APKBUILD
+++ b/device/testing/linux-motorola-payton/APKBUILD
@@ -3,7 +3,7 @@
 
 pkgname=linux-motorola-payton
 pkgver=4.4.219
-pkgrel=0
+pkgrel=1
 pkgdesc="Motorola Moto X4 kernel fork"
 arch="aarch64"
 _carch="arm64"
@@ -45,7 +45,7 @@ package() {
 }
 
 sha512sums="7e109d8e04706fe43c7eceaacc2c50371e35e9256c3eb2f3d3a4cceb2580df6a7a054852a31bf661810bd934cedab49179484417fd7ea762a254e3c66d6a9d5e  linux-motorola-payton-ce9ea8f125c7302ae9b2fec84f23a69271e957c3.tar.gz
-58225a9e8ddd009e6cfe0cd244bcf4ba541571f0b176ce133bc641abf8ee1224234c92d6d8dfcc70cbb0d1ab1d44e457feaeb3db4f814cef14d83f9cc10957b5  config-motorola-payton.aarch64
+89896147d06dafbbec2971342f4cdebded6f44f011e6a763c303fae7561fb7016a99d25b09290d16f6567b83eb7630bd7da688072043bd43bec6ef03e1cbc746  config-motorola-payton.aarch64
 a62883a325d858eaff4e44e7e1f85f84803ee8360073f83f9657ba5bf1676618ff77e7e62971ecdfb661956ba081196bc2618179d4d7cafadf528d2aa00062cd  fix-virtual-terminal.patch
 9ce867c4254b537ef5d2485780c26b72da8a3a8767ba71557f3b48d6c550e0e14c8c3e575b31bf65d2878f08a8a4926e48a1c2f1be534bf80a7a57f58313b0fd  remove_bootloader_cmdline_opts.patch
 d5b868c64b8ebddcf74cb3aa478f30f0897af1e14e4fc42d977921104a6c568cc0bf36fc8a3b0f538cd3ca2ebf59244fdf23186a903259e5acc14d1c4ef4ccc3  mdss-panel-to-fb-var.patch
diff --git a/device/testing/linux-motorola-payton/config-motorola-payton.aarch64 b/device/testing/linux-motorola-payton/config-motorola-payton.aarch64
index fd7a26858..8846e28c2 100644
--- a/device/testing/linux-motorola-payton/config-motorola-payton.aarch64
+++ b/device/testing/linux-motorola-payton/config-motorola-payton.aarch64
@@ -157,10 +157,10 @@ CONFIG_SCHED_HMP_CSTATE_AWARE=y
 # CONFIG_SCHED_CORE_CTL is not set
 # CONFIG_CHECKPOINT_RESTORE is not set
 CONFIG_NAMESPACES=y
-# CONFIG_UTS_NS is not set
+CONFIG_UTS_NS=y
 CONFIG_IPC_NS=y
-# CONFIG_USER_NS is not set
-# CONFIG_PID_NS is not set
+CONFIG_USER_NS=y
+CONFIG_PID_NS=y
 CONFIG_NET_NS=y
 # CONFIG_SCHED_AUTOGROUP is not set
 CONFIG_SCHED_TUNE=y