Merge branch 'topic/unmap_cleanup' into for-linus