Merge branch 'erofs_fix' into staging-next

Browse source

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

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

...

This commit is contained in:

Greg Kroah-Hartman 2019-06-17 23:00:37 +02:00

parent faa3988441 5efe5137f0

commit 98a716ce1d

3 changed files with 31 additions and 3 deletions

Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL

Download patch file Download diff file Expand all files Collapse all files

13

drivers/staging/erofs/erofs_fs.h

View file

2

drivers/staging/erofs/internal.h

View file

19

drivers/staging/erofs/super.c

View file