Merge branch 'kdave' into for-linus-4.14

Signed-off-by: Chris Mason <clm@fb.com>