Linux-CIFS Archive on
 help / color / Atom feed
* linux-next: manual merge of the akpm tree with the cifs tree
@ 2020-01-16  8:13 Stephen Rothwell
  0 siblings, 0 replies; only message in thread
From: Stephen Rothwell @ 2020-01-16  8:13 UTC (permalink / raw)
  To: Andrew Morton, Steve French, CIFS
  Cc: Linux Next Mailing List, Linux Kernel Mailing List,
	Paulo Alcantara (SUSE),
	Alexey Dobriyan

[-- Attachment #1: Type: text/plain, Size: 1124 bytes --]

Hi all,

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


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.

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 <>
+ #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>

[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 488 bytes --]

^ permalink raw reply	[flat|nested] only message in thread

only message in thread, back to index

Thread overview: (only message) (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2020-01-16  8:13 linux-next: manual merge of the akpm tree with the cifs tree Stephen Rothwell

Linux-CIFS Archive on

Archives are clonable:
	git clone --mirror linux-cifs/git/0.git

	# If you have public-inbox 1.1+ installed, you may
	# initialize and index your mirror using the following commands:
	public-inbox-init -V2 linux-cifs linux-cifs/ \
	public-inbox-index linux-cifs

Example config snippet for mirrors

Newsgroup available over NNTP:

AGPL code for this site: git clone