]> www.infradead.org Git - users/dwmw2/linux.git/commitdiff
Merge tag 'fs_for_v6.12-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/jack...
authorLinus Torvalds <torvalds@linux-foundation.org>
Mon, 23 Sep 2024 17:49:28 +0000 (10:49 -0700)
committerLinus Torvalds <torvalds@linux-foundation.org>
Mon, 23 Sep 2024 17:49:28 +0000 (10:49 -0700)
Pull quota and isofs updates from Jan Kara:
 "A few small cleanups in quota and isofs"

* tag 'fs_for_v6.12-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/jack/linux-fs:
  isofs: Annotate struct SL_component with __counted_by()
  quota: remove unnecessary error code translation in dquot_quota_enable
  quota: remove redundant return at end of void function
  quota: remove unneeded return value of register_quota_format
  quota: avoid missing put_quota_format when DQUOT_SUSPENDED is passed

1  2 
fs/ocfs2/super.c
fs/quota/dquot.c
mm/shmem.c

Simple merge
Simple merge
diff --cc mm/shmem.c
Simple merge