Merge branch 'linux-ssc-for-5.5'

2019-11-05 14:53:29 -05:00
parent 66eb3add45 8dff1df551
commit 807ce06c24
13 changed files with 604 additions and 47 deletions
--- a/include/linux/nfs_fs_sb.h
+++ b/include/linux/nfs_fs_sb.h
@@ -279,5 +279,6 @@ struct nfs_server {
 #define NFS_CAP_COPY		(1U << 24)
 #define NFS_CAP_OFFLOAD_CANCEL	(1U << 25)
 #define NFS_CAP_LAYOUTERROR	(1U << 26)
+#define NFS_CAP_COPY_NOTIFY	(1U << 27)

 #endif