projects
/
cascardo
/
linux.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/ebiederm...
[cascardo/linux.git]
/
include
/
linux
/
cgroup.h
diff --git
a/include/linux/cgroup.h
b/include/linux/cgroup.h
index
a4414a1
..
440a721
100644
(file)
--- a/
include/linux/cgroup.h
+++ b/
include/linux/cgroup.h
@@
-644,6
+644,7
@@
struct cgroup_namespace {
atomic_t count;
struct ns_common ns;
struct user_namespace *user_ns;
+ struct ucounts *ucounts;
struct css_set *root_cset;
};