]> www.infradead.org Git - users/willy/linux.git/commitdiff
projects / users / willy / linux.git / commitdiff
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: e7445ce 6510223)
Merge tag 'v4.20-rc1'
authorAndreas Gruenbacher <agruenba@redhat.com>
Sun, 11 Nov 2018 11:12:43 +0000 (11:12 +0000)
committerAndreas Gruenbacher <agruenba@redhat.com>
Thu, 15 Nov 2018 20:18:34 +0000 (21:18 +0100)
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 <agruenba@redhat.com>
1  2 
fs/gfs2/bmap.c patch | diff1 | diff2 | blob | history

diff --cc fs/gfs2/bmap.c
Simple merge
Unnamed repository; edit this file 'description' to name the repository.