From: Shyam Prasad <Shyam.Prasad@microsoft.com>
To: Stephen Rothwell <sfr@canb.auug.org.au>,
David Howells <dhowells@redhat.com>
Cc: Steve French <smfrench@gmail.com>,
CIFS <linux-cifs@vger.kernel.org>,
Linux Kernel Mailing List <linux-kernel@vger.kernel.org>,
Linux Next Mailing List <linux-next@vger.kernel.org>,
Steven French <Steven.French@microsoft.com>
Subject: RE: [EXTERNAL] Re: linux-next: manual merge of the cifs tree with the fscache tree
Date: Tue, 7 Dec 2021 08:28:34 +0000 [thread overview]
Message-ID: <SG2P153MB03504A773C5F7B6C75E410F5946E9@SG2P153MB0350.APCP153.PROD.OUTLOOK.COM> (raw)
In-Reply-To: <20211206085650.09dcb11e@canb.auug.org.au>
-----Original Message-----
From: Stephen Rothwell <sfr@canb.auug.org.au>
Sent: Monday, December 6, 2021 3:27 AM
To: David Howells <dhowells@redhat.com>
Cc: Steve French <smfrench@gmail.com>; CIFS <linux-cifs@vger.kernel.org>; Linux Kernel Mailing List <linux-kernel@vger.kernel.org>; Linux Next Mailing List <linux-next@vger.kernel.org>; Shyam Prasad <Shyam.Prasad@microsoft.com>; Steven French <Steven.French@microsoft.com>
Subject: [EXTERNAL] Re: linux-next: manual merge of the cifs tree with the fscache tree
Hi all,
On Fri, 3 Dec 2021 09:41:39 +1100 Stephen Rothwell <sfr@canb.auug.org.au> wrote:
>
> Hi all,
>
> Today's linux-next merge of the cifs tree got conflicts in:
>
> fs/cifs/connect.c
> fs/cifs/fscache.c
>
> between commit:
>
> 935b45107a80 ("cifs: Support fscache indexing rewrite (untested)")
>
> from the fscache tree and commits:
>
> 9d0245fc6a2e ("cifs: wait for tcon resource_id before getting fscache super")
> c148f8eb032f ("cifs: add server conn_id to fscache client cookie")
> b1f962ba272b ("cifs: avoid use of dstaddr as key for fscache client
> cookie")
>
> from the cifs tree.
>
> I fixed it up (I just used the former versions) 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.
These are now conflict between the fscache tree and Linus' tree.
--
Cheers,
Stephen Rothwell
================================
Hi David,
As we discussed offline, I will test out the fscache rewrite integration in cifs.ko later this week and submit the final patch to linux-cifs mailing list.
As a part of this, I will fix all the conflicts that arise.
Is this okay with you?
I hope this will eliminate the conflicts between the two trees for now?
Regards,
Shyam
next prev parent reply other threads:[~2021-12-07 8:28 UTC|newest]
Thread overview: 6+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-12-02 22:41 linux-next: manual merge of the cifs tree with the fscache tree Stephen Rothwell
2021-12-05 21:56 ` Stephen Rothwell
2021-12-07 8:28 ` Shyam Prasad [this message]
2021-12-07 21:12 ` David Howells
2021-12-16 12:43 broonie
2021-12-19 23:46 ` Stephen Rothwell
2021-12-20 4:31 ` [EXTERNAL] " Shyam Prasad
2021-12-20 6:11 ` Stephen Rothwell
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:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=SG2P153MB03504A773C5F7B6C75E410F5946E9@SG2P153MB0350.APCP153.PROD.OUTLOOK.COM \
--to=shyam.prasad@microsoft.com \
--cc=Steven.French@microsoft.com \
--cc=dhowells@redhat.com \
--cc=linux-cifs@vger.kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-next@vger.kernel.org \
--cc=sfr@canb.auug.org.au \
--cc=smfrench@gmail.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* 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).