Greg Kroah-Hartman bfa0399bc8 Merge Linus's 5.4-rc1-prerelease branch into android-mainline ...

This merges Linus's tree as of commit b41dae061b ("Merge tag
'xfs-5.4-merge-7' of git://git.kernel.org/pub/scm/fs/xfs/xfs-linux")
into android-mainline.

This "early" merge makes it easier to test and handle merge conflicts
instead of having to wait until the "end" of the merge window and handle
all 10000+ commits at once.

Signed-off-by: Greg Kroah-Hartman <gregkh@google.com>
Change-Id: I6bebf55e5e2353f814e3c87f5033607b1ae5d812

2019-09-20 16:07:54 -07:00

65 KiB

Raw Blame History

View Raw