From: Stephen Rothwell <sfr@canb.auug.org.au>
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 N <sprasad@microsoft.com>,
Steve French <stfrench@microsoft.com>
Subject: Re: linux-next: manual merge of the cifs tree with the fscache tree
Date: Mon, 6 Dec 2021 08:56:50 +1100 [thread overview]
Message-ID: <20211206085650.09dcb11e@canb.auug.org.au> (raw)
In-Reply-To: <20211203094139.059541cd@canb.auug.org.au>
[-- Attachment #1: Type: text/plain, Size: 1148 bytes --]
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
[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 488 bytes --]
next prev parent reply other threads:[~2021-12-05 21:56 UTC|newest]
Thread overview: 9+ 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 [this message]
2021-12-07 8:28 ` [EXTERNAL] " Shyam Prasad
2021-12-07 21:12 ` David Howells
2021-12-16 12:43 broonie
2021-12-17 19:38 ` Steve French
2021-12-17 19:47 ` David Howells
2021-12-19 23:46 ` Stephen Rothwell
2022-01-19 22:43 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=20211206085650.09dcb11e@canb.auug.org.au \
--to=sfr@canb.auug.org.au \
--cc=dhowells@redhat.com \
--cc=linux-cifs@vger.kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-next@vger.kernel.org \
--cc=smfrench@gmail.com \
--cc=sprasad@microsoft.com \
--cc=stfrench@microsoft.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).