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

From: Stephen Rothwell <[email-masked]>
Date: Thu, 16 Jan 2020 19:13:52 +1100

Hi all,

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

  fs/cifs/dfs_cache.c

between commit:

  03535b72873b ("cifs: Avoid doing network I/O while holding cache lock")

from the cifs tree and patch:

  "proc: convert everything to "struct proc_ops""

from the akpm 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 fs/cifs/dfs_cache.c
index 76ffe12d64f5,6aad6a2bf8f0..000000000000
--- a/fs/cifs/dfs_cache.c
+++ b/fs/cifs/dfs_cache.c
@@@ -5,6 -5,9 +5,7 @@@
   * Copyright (c) 2018-2019 Paulo Alcantara <[email-masked]>
   */
  
+ #include <linux/proc_fs.h>
 -#include <linux/rcupdate.h>
 -#include <linux/rculist.h>
  #include <linux/jhash.h>
  #include <linux/ktime.h>
  #include <linux/slab.h>