lkml.org 
[lkml]   [2021]   [Dec]   [16]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
/
Date
From
Subjectlinux-next: manual merge of the nfs-anna tree with the fscache tree
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
[unhandled content-type:application/pgp-signature]
\
 
 \ /
  Last update: 2021-12-17 01:36    [W:0.059 / U:0.092 seconds]
©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site