From: Andreas Gruenbacher Date: Sun, 11 Nov 2018 11:12:43 +0000 (+0000) Subject: Merge tag 'v4.20-rc1' X-Git-Url: https://www.infradead.org/git/?a=commitdiff_plain;h=5a36307b93dc7cffb71ef56a706fcbf53bcc29a3;p=users%2Fwilly%2Flinux.git Merge tag 'v4.20-rc1' Pull in the gfs2 fixes that went into v4.19-rc8: gfs2: Fix iomap buffered write support for journaled files gfs2: Fix iomap buffered write support for journaled files (2) Without these two commits, the following fix would cause conflicts. Signed-off-by: Andreas Gruenbacher --- 5a36307b93dc7cffb71ef56a706fcbf53bcc29a3