From: Stephen Rothwell <sfr@canb.auug.org.au>
To: Anna Schumaker <Anna.Schumaker@Netapp.com>,
Trond Myklebust <trondmy@gmail.com>,
NFS Mailing List <linux-nfs@vger.kernel.org>,
David Howells <dhowells@redhat.com>
Cc: Dave Wysochanski <dwysocha@redhat.com>,
Linux Kernel Mailing List <linux-kernel@vger.kernel.org>,
Linux Next Mailing List <linux-next@vger.kernel.org>
Subject: linux-next: manual merge of the nfs-anna tree with the fscache tree
Date: Fri, 17 Dec 2021 11:35:07 +1100 [thread overview]
Message-ID: <20211217113507.76f852f2@canb.auug.org.au> (raw)
[-- Attachment #1: Type: text/plain, Size: 1058 bytes --]
Hi all,
Today's linux-next merge of the nfs-anna tree got conflicts in:
fs/nfs/fscache.c
fs/nfs/fscache.h
fs/nfs/fscache-index.c
between commit:
882ff66585ec ("nfs: Convert to new fscache volume/cookie API")
from the fscache tree and commits:
e89edabcb3d4 ("NFS: Remove remaining usages of NFSDBG_FSCACHE")
0d20bd7faac9 ("NFS: Cleanup usage of nfs_inode in fscache interface and handle i_size properly")
4a0574909596 ("NFS: Rename fscache read and write pages functions")
3b779545aa01 ("NFS: Convert NFS fscache enable/disable dfprintks to tracepoints")
b9077ca60a13 ("NFS: Replace dfprintks with tracepoints in fscache read and write page functions")
416de7e7eeb6 ("NFS: Remove remaining dfprintks related to fscache cookies")
fcb692b98976 ("NFS: Use nfs_i_fscache() consistently within NFS fscache code")
from the nfs-anna tree.
I had no idea how to fix this all up, so I just dropped the nfs-anna
tree for today. Please get together and coordinate thses changes.
--
Cheers,
Stephen Rothwell
[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 488 bytes --]
next reply other threads:[~2021-12-17 0:35 UTC|newest]
Thread overview: 5+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-12-17 0:35 Stephen Rothwell [this message]
2021-12-17 11:40 ` David Wysochanski
2021-12-17 15:34 ` Anna Schumaker
2021-12-17 13:11 ` David Howells
2021-12-17 13:33 ` David Wysochanski
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=20211217113507.76f852f2@canb.auug.org.au \
--to=sfr@canb.auug.org.au \
--cc=Anna.Schumaker@Netapp.com \
--cc=dhowells@redhat.com \
--cc=dwysocha@redhat.com \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-next@vger.kernel.org \
--cc=linux-nfs@vger.kernel.org \
--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
all inboxes | Powered by JetHome®