Merge branch 'rh/dioread-nolock-1k' into dev
authorTheodore Ts'o <tytso@mit.edu>
Fri, 1 Nov 2019 18:49:52 +0000 (14:49 -0400)
committerTheodore Ts'o <tytso@mit.edu>
Fri, 1 Nov 2019 18:49:52 +0000 (14:49 -0400)

Trivial merge