From: Stephen Rothwell <sfr@canb.auug.org.au>
To: Al Viro <viro@ZenIV.linux.org.uk>,
Anna Schumaker <Anna.Schumaker@Netapp.com>,
Trond Myklebust <trondmy@gmail.com>,
NFS Mailing List <linux-nfs@vger.kernel.org>
Cc: 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: linux-next: manual merge of the vfs tree with the nfs-anna tree
Date: Thu, 6 Feb 2020 09:25:12 +1100 [thread overview]
Message-ID: <20200206092512.5eb304b7@canb.auug.org.au> (raw)
[-- Attachment #1: Type: text/plain, Size: 739 bytes --]
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.
--
Cheers,
Stephen Rothwell
[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 488 bytes --]
next reply other threads:[~2020-02-05 22:25 UTC|newest]
Thread overview: 3+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-02-05 22:25 Stephen Rothwell [this message]
2020-02-05 22:48 ` linux-next: manual merge of the vfs tree with the nfs-anna tree Al Viro
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=20200206092512.5eb304b7@canb.auug.org.au \
--to=sfr@canb.auug.org.au \
--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=trondmy@gmail.com \
--cc=viro@ZenIV.linux.org.uk \
/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).