]> www.infradead.org Git - users/willy/linux.git/commitdiff
Merge remote-tracking branch 'gfs2/for-next'
authorStephen Rothwell <sfr@canb.auug.org.au>
Mon, 10 Dec 2018 02:31:11 +0000 (13:31 +1100)
committerStephen Rothwell <sfr@canb.auug.org.au>
Mon, 10 Dec 2018 02:31:11 +0000 (13:31 +1100)
1  2 
fs/gfs2/ops_fstype.c
fs/gfs2/super.c

Simple merge
diff --cc fs/gfs2/super.c
Simple merge