From: Anna Schumaker <anna.schumaker@netapp.com>
To: David Wysochanski <dwysocha@redhat.com>
Cc: Stephen Rothwell <sfr@canb.auug.org.au>,
Trond Myklebust <trondmy@gmail.com>,
NFS Mailing List <linux-nfs@vger.kernel.org>,
David Howells <dhowells@redhat.com>,
Linux Kernel Mailing List <linux-kernel@vger.kernel.org>,
Linux Next Mailing List <linux-next@vger.kernel.org>
Subject: Re: linux-next: manual merge of the nfs-anna tree with the fscache tree
Date: Fri, 17 Dec 2021 10:34:44 -0500 [thread overview]
Message-ID: <CAFX2Jfk3bnVVEwPXghGLXL-Nw1bcb_g1asJ6eWPVv6j6iDCG8w@mail.gmail.com> (raw)
In-Reply-To: <CALF+zO=zDrRzPkpgjRQNYbxQ8j3qNVJjo9Ub=tCqFtT32sr-KQ@mail.gmail.com>
On Fri, Dec 17, 2021 at 10:34 AM David Wysochanski <dwysocha@redhat.com> wrote:
>
> On Thu, Dec 16, 2021 at 7:35 PM Stephen Rothwell <sfr@canb.auug.org.au> wrote:
> >
> > 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")
> >
> Anna, feel free to drop these from your tree to avoid the conflicts
> with the rest of your tree and dhowells fscache-rewrite patchset.
Sounds good!
Anna
>
>
>
> > 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
>
next prev parent reply other threads:[~2021-12-17 15:35 UTC|newest]
Thread overview: 5+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-12-17 0:35 linux-next: manual merge of the nfs-anna tree with the fscache tree Stephen Rothwell
2021-12-17 11:40 ` David Wysochanski
2021-12-17 15:34 ` Anna Schumaker [this message]
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=CAFX2Jfk3bnVVEwPXghGLXL-Nw1bcb_g1asJ6eWPVv6j6iDCG8w@mail.gmail.com \
--to=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=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 an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.