archive mirror
 help / color / mirror / Atom feed
From: Stephen Rothwell <>
To: Steve French <>, CIFS <>
Cc: Hyunchul Lee <>,
	Linux Kernel Mailing List <>,
	Linux Next Mailing List <>,
	Namjae Jeon <>,
	Ronnie Sahlberg <>,
	Sergey Senozhatsky <>,
	Steve French <>
Subject: linux-next: manual merge of the cifsd tree with the cifs tree
Date: Mon, 23 Aug 2021 09:39:01 +1000	[thread overview]
Message-ID: <> (raw)

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

Hi all,

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


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.

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 --]

                 reply	other threads:[~2021-08-22 23:39 UTC|newest]

Thread overview: [no followups] expand[flat|nested]  mbox.gz  Atom feed

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \ \ \ \ \ \ \ \ \ \ \ \

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).