Merge branch 'bugfixes'

author Trond Myklebust <trond.myklebust@primarydata.com>

Sun, 20 Aug 2017 17:04:12 +0000 (13:04 -0400)

committer Trond Myklebust <trond.myklebust@primarydata.com>

Sun, 20 Aug 2017 17:04:12 +0000 (13:04 -0400)
author Trond Myklebust <trond.myklebust@primarydata.com>
Sun, 20 Aug 2017 17:04:12 +0000 (13:04 -0400)
committer Trond Myklebust <trond.myklebust@primarydata.com>
Sun, 20 Aug 2017 17:04:12 +0000 (13:04 -0400)
diff --cc fs/nfs/pagelist.c
Simple merge
diff --cc fs/nfs/write.c
Simple merge
diff --cc include/linux/nfs_page.h
Simple merge
author	Trond Myklebust <trond.myklebust@primarydata.com>
	Sun, 20 Aug 2017 17:04:12 +0000 (13:04 -0400)
committer	Trond Myklebust <trond.myklebust@primarydata.com>
	Sun, 20 Aug 2017 17:04:12 +0000 (13:04 -0400)
		1	2
fs/nfs/pagelist.c	patch \|	diff1 \|	diff2 \|	blob \| history
fs/nfs/write.c	patch \|	diff1 \|	diff2 \|	blob \| history
include/linux/nfs_page.h	patch \|	diff1 \|	diff2 \|	blob \| history