Merge branch 'erofs_fix' into staging-linus
authorGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Mon, 17 Jun 2019 20:59:28 +0000 (22:59 +0200)
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Mon, 17 Jun 2019 20:59:28 +0000 (22:59 +0200)
commit9b9410766f5422d1e736783dc0c3a053eefedac4
treebd397aa6fdecfd0713b725f9728d42e8261093d4
parentd7a5417b89470d353118a451630ed71f119f58b8
parent5efe5137f05bbb4688890620934538c005e7d1d6
Merge branch 'erofs_fix' into staging-linus

A branch is needed here to get the fix into staging-next as well.

Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>