rubenslte/android_kernel_samsung_msm8226-rubenslte
1
Fork 0
forked from rubenslte/android_kernel_samsung_msm8226
Code Pull Requests Activity

Fix incorrect conflict resolution in

Browse Source 
"vfs: Add setns support for the mount namespace"

Change-Id: I554f28a1f92267ea3681d519c8402d983e799186
Signed-off-by: Kevin F. Haggerty <haggertk@lineageos.org>
This commit is contained in:
Daniel Rosenberg
2019-08-05 09:13:24 +02:00
committed by Francescodario Cuzzocrea
parent c414c6544c
commit a7bc024c34
2 changed files with 0 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
fs/proc/namespaces.c
-3
View File
@@ -23,9 +23,6 @@ static const struct proc_ns_operations *ns_entries[] = {
#endif
#ifdef CONFIG_IPC_NS
&ipcns_operations,
#endif
#ifdef CONFIG_PID_NS
&pidns_operations,
#endif
&mntns_operations,
};
include/linux/proc_fs.h
-1
View File
@@ -272,7 +272,6 @@ struct proc_ns_operations {
extern const struct proc_ns_operations netns_operations;
extern const struct proc_ns_operations utsns_operations;
extern const struct proc_ns_operations ipcns_operations;
extern const struct proc_ns_operations pidns_operations;
extern const struct proc_ns_operations mntns_operations;
union proc_op {