From: Shyam Prasad <Shyam.Prasad@microsoft.com>
To: Stephen Rothwell <sfr@canb.auug.org.au>,
David Howells <dhowells@redhat.com>
Cc: "broonie@kernel.org" <broonie@kernel.org>,
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: Mon, 20 Dec 2021 04:31:27 +0000 [thread overview]
Message-ID: <KL1P15301MB034331969F371B30AAD6642D947B9@KL1P15301MB0343.APCP153.PROD.OUTLOOK.COM> (raw)
In-Reply-To: <20211220104610.5f074aec@canb.auug.org.au>
-----Original Message-----
From: Stephen Rothwell <sfr@canb.auug.org.au>
Sent: Monday, December 20, 2021 5:16 AM
To: David Howells <dhowells@redhat.com>
Cc: broonie@kernel.org; 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 Thu, 16 Dec 2021 12:43:17 +0000 broonie@kernel.org wrote:
>
> Today's linux-next merge of the cifs tree got a conflict in:
>
> fs/cifs/inode.c
>
> between commit:
>
> 830c476f5eb82 ("cifs: Support fscache indexing rewrite (untested)")
>
> from the fscache tree and commit:
>
> 68f87ec9c1ce3 ("cifs: ignore resource_id while getting fscache super cookie")
This is now commit
b774302e8856 ("cifs: ignore resource_id while getting fscache super cookie")
in Linus' tree.
> from the cifs tree.
>
> diff --cc fs/cifs/inode.c
> index dc2fe76450b96,279622e4eb1c2..0000000000000
> --- a/fs/cifs/inode.c
> +++ b/fs/cifs/inode.c
> @@@ -1372,20 -1370,6 +1367,7 @@@ iget_no_retry
> iget_failed(inode);
> inode = ERR_PTR(rc);
> }
> +
> - if (!rc) {
> - /*
> - * The cookie is initialized from volume info returned above.
> - * Inside cifs_fscache_get_super_cookie it checks
> - * that we do not get super cookie twice.
> - */
> - rc = cifs_fscache_get_super_cookie(tcon);
> - if (rc < 0) {
> - iget_failed(inode);
> - inode = ERR_PTR(rc);
> - }
> - }
> -
> out:
> kfree(path);
> free_xid(xid);
so this is now a conflict between the fscache tree and Linus's tree.
--
Cheers,
Stephen Rothwell
=================================
> so this is now a conflict between the fscache tree and Linus's tree.
Hi David and Steve,
I think one of these two branches need to be rebased. Can one of you please do it?
Regards,
Shyam
next prev parent reply other threads:[~2021-12-20 4:31 UTC|newest]
Thread overview: 7+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-12-16 12:43 linux-next: manual merge of the cifs tree with the fscache tree broonie
2021-12-17 19:38 ` Steve French
2021-12-17 19:47 ` David Howells
2021-12-19 23:46 ` Stephen Rothwell
2021-12-20 4:31 ` Shyam Prasad [this message]
2021-12-20 6:11 ` [EXTERNAL] " Stephen Rothwell
-- strict thread matches above, loose matches on Subject: below --
2021-12-02 22:41 Stephen Rothwell
2021-12-05 21:56 ` Stephen Rothwell
2021-12-07 8:28 ` [EXTERNAL] " Shyam Prasad
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=KL1P15301MB034331969F371B30AAD6642D947B9@KL1P15301MB0343.APCP153.PROD.OUTLOOK.COM \
--to=shyam.prasad@microsoft.com \
--cc=Steven.French@microsoft.com \
--cc=broonie@kernel.org \
--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).