]> git.ipfire.org Git - thirdparty/kernel/linux.git/commitdiff
Merge tag 'pull-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs master
authorLinus Torvalds <torvalds@linux-foundation.org>
Tue, 16 Dec 2025 07:44:36 +0000 (19:44 +1200)
committerLinus Torvalds <torvalds@linux-foundation.org>
Tue, 16 Dec 2025 07:44:36 +0000 (19:44 +1200)
Pull shmem rename fixes from Al Viro:
 "A couple of shmem rename fixes - recent regression from tree-in-dcache
  series and older breakage from stable directory offsets stuff"

* tag 'pull-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs:
  shmem: fix recovery on rename failures
  shmem_whiteout(): fix regression from tree-in-dcache series

1  2 
mm/shmem.c

diff --cc mm/shmem.c
Simple merge