lkml.org 
[lkml]   [2016]   [Jan]   [18]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
/
Date
From
Subjectlinux-next: manual merge of the akpm tree with Linus' tree
Hi Andrew,

Today's linux-next merge of the akpm tree got a conflict in:

include/net/tcp_memcontrol.h

between commit:

cdb00777ffad ("tcp_memcontrol: Forward declare cgroup_subsys and mem_cgroup stucts")

from Linus' tree and commit:

"mm: memcontrol: drop unused @css argument in memcg_init_kmem"

from the akpm tree.

I fixed it up (see below) and can carry the fix as necessary (no action
is required).

--
Cheers,
Stephen Rothwell sfr@canb.auug.org.au

diff --cc include/net/tcp_memcontrol.h
index 01ff7c6efada,dc2da2f8c8b2..000000000000
--- a/include/net/tcp_memcontrol.h
+++ b/include/net/tcp_memcontrol.h
@@@ -1,9 -1,7 +1,9 @@@
#ifndef _TCP_MEMCG_H
#define _TCP_MEMCG_H

- struct cgroup_subsys;
+struct mem_cgroup;
+
- int tcp_init_cgroup(struct mem_cgroup *memcg, struct cgroup_subsys *ss);
+ int tcp_init_cgroup(struct mem_cgroup *memcg);
void tcp_destroy_cgroup(struct mem_cgroup *memcg);
+
#endif /* _TCP_MEMCG_H */

\
 
 \ /
  Last update: 2016-01-19 04:01    [W:0.018 / U:0.196 seconds]
©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site