Merge branch 'erofs_fix' into staging-next
authorGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Mon, 17 Jun 2019 21:00:37 +0000 (23:00 +0200)
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Mon, 17 Jun 2019 21:00:37 +0000 (23:00 +0200)
commit98a716ce1d6ae09a3ed4acabec4bd3236515a0f4
tree2869a668daca3c628ec1c815b75d03e053b83115
parentfaa398844161df4d1826cb2ffa828ff50de79441
parent5efe5137f05bbb4688890620934538c005e7d1d6
Merge branch 'erofs_fix' into staging-next

erofs needed a fix in both -linus and -next branches at the same time.

Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
drivers/staging/erofs/internal.h