diff options
-rw-r--r-- | .mailmap | 2 | ||||
-rw-r--r-- | MAINTAINERS | 2 |
2 files changed, 3 insertions, 1 deletions
@@ -158,6 +158,8 @@ Valdis Kletnieks <Valdis.Kletnieks@vt.edu> | |||
158 | Viresh Kumar <vireshk@kernel.org> <viresh.kumar@st.com> | 158 | Viresh Kumar <vireshk@kernel.org> <viresh.kumar@st.com> |
159 | Viresh Kumar <vireshk@kernel.org> <viresh.linux@gmail.com> | 159 | Viresh Kumar <vireshk@kernel.org> <viresh.linux@gmail.com> |
160 | Viresh Kumar <vireshk@kernel.org> <viresh.kumar2@arm.com> | 160 | Viresh Kumar <vireshk@kernel.org> <viresh.kumar2@arm.com> |
161 | Vladimir Davydov <vdavydov.dev@gmail.com> <vdavydov@virtuozzo.com> | ||
162 | Vladimir Davydov <vdavydov.dev@gmail.com> <vdavydov@parallels.com> | ||
161 | Takashi YOSHII <takashi.yoshii.zj@renesas.com> | 163 | Takashi YOSHII <takashi.yoshii.zj@renesas.com> |
162 | Yusuke Goda <goda.yusuke@renesas.com> | 164 | Yusuke Goda <goda.yusuke@renesas.com> |
163 | Gustavo Padovan <gustavo@las.ic.unicamp.br> | 165 | Gustavo Padovan <gustavo@las.ic.unicamp.br> |
diff --git a/MAINTAINERS b/MAINTAINERS index 71aa5daeae8f..d44be8ad997b 100644 --- a/MAINTAINERS +++ b/MAINTAINERS | |||
@@ -3247,7 +3247,7 @@ F: kernel/cpuset.c | |||
3247 | CONTROL GROUP - MEMORY RESOURCE CONTROLLER (MEMCG) | 3247 | CONTROL GROUP - MEMORY RESOURCE CONTROLLER (MEMCG) |
3248 | M: Johannes Weiner <hannes@cmpxchg.org> | 3248 | M: Johannes Weiner <hannes@cmpxchg.org> |
3249 | M: Michal Hocko <mhocko@kernel.org> | 3249 | M: Michal Hocko <mhocko@kernel.org> |
3250 | M: Vladimir Davydov <vdavydov@virtuozzo.com> | 3250 | M: Vladimir Davydov <vdavydov.dev@gmail.com> |
3251 | L: cgroups@vger.kernel.org | 3251 | L: cgroups@vger.kernel.org |
3252 | L: linux-mm@kvack.org | 3252 | L: linux-mm@kvack.org |
3253 | S: Maintained | 3253 | S: Maintained |