]> git.ipfire.org Git - thirdparty/kernel/stable.git/commitdiff
projects / thirdparty / kernel / stable.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: faa3988 5efe513)
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)
erofs needed a fix in both -linus and -next branches at the same time.

Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
1  2 
drivers/staging/erofs/internal.h patch | diff1 | diff2 | blob | history

diff --cc drivers/staging/erofs/internal.h
Simple merge
Mirror https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git