Re: linux-next: manual merge of the nfs-anna tree with the fscache tree

[Anna Schumaker]

On Fri, Dec 17, 2021 at 10:34 AM David Wysochanski <dwysocha@xxxxxxxxxx> wrote:
>
> On Thu, Dec 16, 2021 at 7:35 PM Stephen Rothwell <sfr@xxxxxxxxxxxxxxxx> 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
>