Merge branch 'xfs-4.7-error-cfg' into for-next

author Dave Chinner <david@fromorbit.com>

Fri, 20 May 2016 00:33:38 +0000 (10:33 +1000)

committer Dave Chinner <david@fromorbit.com>

Fri, 20 May 2016 00:33:38 +0000 (10:33 +1000)
author Dave Chinner <david@fromorbit.com>
Fri, 20 May 2016 00:33:38 +0000 (10:33 +1000)
committer Dave Chinner <david@fromorbit.com>
Fri, 20 May 2016 00:33:38 +0000 (10:33 +1000)
diff --cc fs/xfs/xfs_mount.c
Simple merge
diff --cc fs/xfs/xfs_trace.h
Simple merge
author	Dave Chinner <david@fromorbit.com>
	Fri, 20 May 2016 00:33:38 +0000 (10:33 +1000)
committer	Dave Chinner <david@fromorbit.com>
	Fri, 20 May 2016 00:33:38 +0000 (10:33 +1000)
		1	2
fs/xfs/xfs_mount.c	patch \|	diff1 \|	diff2 \|	blob \| history
fs/xfs/xfs_trace.h	patch \|	diff1 \|	diff2 \|	blob \| history