summarylogtreecommitdiffstats
path: root/0002-ZEN-Add-CONFIG-for-unprivileged_userns_clone.patch
diff options
context:
space:
mode:
authorgraysky2019-07-12 14:34:19 -0400
committergraysky2019-07-12 14:34:19 -0400
commit044cee2ac3ebac40a7ae1cdd5f06c257c514fee7 (patch)
tree12dfdf17bbcb35abc26726fe262cdc8852737ad9 /0002-ZEN-Add-CONFIG-for-unprivileged_userns_clone.patch
parentd8fc157e336eecc4f04b7124e8e137cc4a67e6f6 (diff)
downloadaur-044cee2ac3ebac40a7ae1cdd5f06c257c514fee7.tar.gz
Update to 5.2.1rc1-1
Diffstat (limited to '0002-ZEN-Add-CONFIG-for-unprivileged_userns_clone.patch')
-rw-r--r--0002-ZEN-Add-CONFIG-for-unprivileged_userns_clone.patch12
1 files changed, 6 insertions, 6 deletions
diff --git a/0002-ZEN-Add-CONFIG-for-unprivileged_userns_clone.patch b/0002-ZEN-Add-CONFIG-for-unprivileged_userns_clone.patch
index 6c25e34545bd..3ec1d811cb34 100644
--- a/0002-ZEN-Add-CONFIG-for-unprivileged_userns_clone.patch
+++ b/0002-ZEN-Add-CONFIG-for-unprivileged_userns_clone.patch
@@ -1,7 +1,7 @@
-From d279aeda16b4cc525a0a2c4747946d87683e3e51 Mon Sep 17 00:00:00 2001
+From f6f4d8c026e1bc210432afc6440ce685e6eaa3e9 Mon Sep 17 00:00:00 2001
From: "Jan Alexander Steffens (heftig)" <jan.steffens@gmail.com>
Date: Thu, 7 Dec 2017 13:50:48 +0100
-Subject: [PATCH 2/3] ZEN: Add CONFIG for unprivileged_userns_clone
+Subject: [PATCH 2/4] ZEN: Add CONFIG for unprivileged_userns_clone
This way our default behavior continues to match the vanilla kernel.
---
@@ -10,10 +10,10 @@ This way our default behavior continues to match the vanilla kernel.
2 files changed, 20 insertions(+)
diff --git a/init/Kconfig b/init/Kconfig
-index 4592bf7997c0..f3df02990aff 100644
+index 0e2344389501..96f76927710a 100644
--- a/init/Kconfig
+++ b/init/Kconfig
-@@ -1004,6 +1004,22 @@ config USER_NS
+@@ -1013,6 +1013,22 @@ config USER_NS
If unsure, say N.
@@ -37,10 +37,10 @@ index 4592bf7997c0..f3df02990aff 100644
bool "PID Namespaces"
default y
diff --git a/kernel/user_namespace.c b/kernel/user_namespace.c
-index 6b9dbc257e34..107b17f0d528 100644
+index b2f8b5777670..aa27ecacfb1e 100644
--- a/kernel/user_namespace.c
+++ b/kernel/user_namespace.c
-@@ -27,7 +27,11 @@
+@@ -22,7 +22,11 @@
#include <linux/sort.h>
/* sysctl */