Merge branch 'kmap_atomic' of git://github.com/congwang/linux