linux-next: manual merge of the cifsd tree with the cifs tree

linux-next: manual merge of the cifsd tree with the cifs tree

[Stephen Rothwell]

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

Hi all,

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

  fs/Kconfig

between commit:

  ac3e4db1b38c ("cifs: fork arc4 and create a separate module for it for cifs and other users")

from the cifs tree and commits:

  a848c4f15ab6 ("cifsd: add Kconfig and Makefile")
  1a93084b9a89 ("ksmbd: move fs/cifsd to fs/ksmbd")

from the cifsd 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/Kconfig
index 6d719f2c5828,720c38f484c6..000000000000
--- a/fs/Kconfig
+++ b/fs/Kconfig
@@@ -358,14 -343,8 +358,15 @@@ config NFS_V4_2_SSC_HELPE
  
  source "net/sunrpc/Kconfig"
  source "fs/ceph/Kconfig"
 +
  source "fs/cifs/Kconfig"
 +
 +config CIFS_COMMON
 +	tristate
 +	default y if CIFS=y
 +	default m if CIFS=m
 +
+ source "fs/ksmbd/Kconfig"
  source "fs/coda/Kconfig"
  source "fs/afs/Kconfig"
  source "fs/9p/Kconfig"

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