From: Al Viro <viro@zeniv.linux.org.uk>
To: Stephen Rothwell <sfr@canb.auug.org.au>
Cc: Anna Schumaker <Anna.Schumaker@netapp.com>,
Trond Myklebust <trondmy@gmail.com>,
NFS Mailing List <linux-nfs@vger.kernel.org>,
Linux Next Mailing List <linux-next@vger.kernel.org>,
Linux Kernel Mailing List <linux-kernel@vger.kernel.org>,
Dai Ngo <dai.ngo@oracle.com>
Subject: Re: linux-next: manual merge of the vfs tree with the nfs-anna tree
Date: Wed, 5 Feb 2020 22:48:56 +0000 [thread overview]
Message-ID: <20200205224856.GX23230@ZenIV.linux.org.uk> (raw)
In-Reply-To: <20200206092512.5eb304b7@canb.auug.org.au>
On Thu, Feb 06, 2020 at 09:25:12AM +1100, Stephen Rothwell wrote:
> Hi all,
>
> Today's linux-next merge of the vfs tree got a conflict in:
>
> fs/nfs/dir.c
>
> between commit:
>
> 227823d2074d ("nfs: optimise readdir cache page invalidation")
>
> from the nfs-anna tree and commit:
>
> ef3af2d44331 ("nfs: optimise readdir cache page invalidation")
>
> from the vfs tree.
>
> I fixed it up (I used the nfs-anna tree version) 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.
Umm... OK, I'll redo that merge; FWIW, the only reason I pull that
branch in the first place is that bunch of fixups needed to accomodate
it for work.fs_parse changes.
As soon as nfs-anna lands in mainline, I'm going to send Linus a pull
requrest for work.fs_parse + fixups...
next prev parent reply other threads:[~2020-02-05 22:49 UTC|newest]
Thread overview: 3+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-02-05 22:25 linux-next: manual merge of the vfs tree with the nfs-anna tree Stephen Rothwell
2020-02-05 22:48 ` Al Viro [this message]
2020-02-05 23:20 ` Al Viro
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=20200205224856.GX23230@ZenIV.linux.org.uk \
--to=viro@zeniv.linux.org.uk \
--cc=Anna.Schumaker@netapp.com \
--cc=dai.ngo@oracle.com \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-next@vger.kernel.org \
--cc=linux-nfs@vger.kernel.org \
--cc=sfr@canb.auug.org.au \
--cc=trondmy@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).