Merge branch 'bugfixes'
authorTrond Myklebust <trond.myklebust@primarydata.com>
Sun, 20 Aug 2017 17:04:12 +0000 (13:04 -0400)
committerTrond Myklebust <trond.myklebust@primarydata.com>
Sun, 20 Aug 2017 17:04:12 +0000 (13:04 -0400)
1  2 
fs/nfs/pagelist.c
fs/nfs/write.c
include/linux/nfs_page.h

Simple merge
diff --cc fs/nfs/write.c
Simple merge
Simple merge