linux-next: manual merge of the akpm tree with the cifs tree
diff mbox series

Message ID 20200116191352.64fd4030@canb.auug.org.au
State New
Headers show
Series
  • linux-next: manual merge of the akpm tree with the cifs tree
Related show

Commit Message

Stephen Rothwell Jan. 16, 2020, 8:13 a.m. UTC
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.

Patch
diff mbox series

diff --cc fs/cifs/dfs_cache.c
index 76ffe12d64f5,6aad6a2bf8f0..000000000000
--- a/fs/cifs/dfs_cache.c