Merge remote-tracking branch 'origin/topic/uek-4.1/dtrace' into uek/uek-4.1-next

author Nicolas Droux <nicolas.droux@oracle.com>

Thu, 15 Jun 2017 18:10:43 +0000 (12:10 -0600)

committer Nicolas Droux <nicolas.droux@oracle.com>

Thu, 15 Jun 2017 18:10:43 +0000 (12:10 -0600)
author Nicolas Droux <nicolas.droux@oracle.com>
Thu, 15 Jun 2017 18:10:43 +0000 (12:10 -0600)
committer Nicolas Droux <nicolas.droux@oracle.com>
Thu, 15 Jun 2017 18:10:43 +0000 (12:10 -0600)
diff --cc fs/nfs/internal.h
Simple merge
diff --cc fs/nfs/write.c
Simple merge
author	Nicolas Droux <nicolas.droux@oracle.com>
	Thu, 15 Jun 2017 18:10:43 +0000 (12:10 -0600)
committer	Nicolas Droux <nicolas.droux@oracle.com>
	Thu, 15 Jun 2017 18:10:43 +0000 (12:10 -0600)
		1	2
fs/nfs/internal.h	patch \|	diff1 \|	diff2 \|	blob \| history
fs/nfs/write.c	patch \|	diff1 \|	diff2 \|	blob \| history