Subject: linux-next: manual merge of the akpm-current tree with the block tree

From: Stephen Rothwell <[email-masked]>
Date: Thu, 2 Aug 2018 18:31:10 +1000

Hi all,

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

  kernel/fork.c

between commit:

  2c323017e381 ("blk-cgroup: clear the throttle queue on fork")

from the block tree and commit:

  f3ed47469a7b ("fs: fsnotify: account fsnotify metadata to kmemcg")

from the akpm-current tree.

I fixed it up (see below) and can carry the fix as necessary. This
is now fixed as far as linux-next is concerned, but any non trivial
conflicts should be mentioned to your upstream maintainer when your tree
is submitted for merging.  You may also want to consider cooperating
with the maintainer of the conflicting tree to minimise any particularly
complex conflicts.

-- 
Cheers,
Stephen Rothwell

diff --cc kernel/fork.c
index f54c49573139,3913dd898bd4..000000000000
--- a/kernel/fork.c
+++ b/kernel/fork.c
@@@ -867,11 -867,9 +868,14 @@@ static struct task_struct *dup_task_str
  	tsk->fail_nth = 0;
  #endif
  
 +#ifdef CONFIG_BLK_CGROUP
 +	tsk->throttle_queue = NULL;
 +	tsk->use_memdelay = 0;
 +#endif
 +
+ #ifdef CONFIG_MEMCG
+ 	tsk->active_memcg = NULL;
+ #endif
  	return tsk;
  
  free_stack: