]> www.infradead.org Git - users/dwmw2/linux.git/commitdiff
projects / users / dwmw2 / linux.git / commitdiff
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: b971424 7c9d922)
Merge tag 'gfs2-for-6.14' of git://git.kernel.org/pub/scm/linux/kernel/git/gfs2/linux...
authorLinus Torvalds <torvalds@linux-foundation.org>
Mon, 20 Jan 2025 21:06:28 +0000 (13:06 -0800)
committerLinus Torvalds <torvalds@linux-foundation.org>
Mon, 20 Jan 2025 21:06:28 +0000 (13:06 -0800)
Pull gfs2 updates from Andreas Gruenbacher:

 - In the quota code, to avoid spurious audit messages, don't call
   capable() when quotas are off

 - When changing the 'j' flag of an inode, truncate the inode address
   space to avoid mixing "buffer head" and "iomap" pages

* tag 'gfs2-for-6.14' of git://git.kernel.org/pub/scm/linux/kernel/git/gfs2/linux-gfs2:
  gfs2: Truncate address space when flipping GFS2_DIF_JDATA flag
  gfs2: reorder capability check last


Trivial merge
Unnamed repository; edit this file 'description' to name the repository.