From: Linus Torvalds Date: Mon, 1 Aug 2022 15:54:59 +0000 (-0700) Subject: Merge tag 'filelock-v6.0' of git://git.kernel.org/pub/scm/linux/kernel/git/jlayton... X-Git-Tag: howlett/maple/20220816~286 X-Git-Url: https://www.infradead.org/git/?a=commitdiff_plain;h=e6a7cf70a3ca9dc83419dd3d8ef09a800da3d7c1;p=users%2Fjedix%2Flinux-maple.git Merge tag 'filelock-v6.0' of git://git.kernel.org/pub/scm/linux/kernel/git/jlayton/linux Pull file locking updates from Jeff Layton: "Just a couple of flock() patches from Kuniyuki Iwashima. The main change is that this moves a file_lock allocation from the slab to the stack" * tag 'filelock-v6.0' of git://git.kernel.org/pub/scm/linux/kernel/git/jlayton/linux: fs/lock: Rearrange ops in flock syscall. fs/lock: Don't allocate file_lock in flock_make_lock(). --- e6a7cf70a3ca9dc83419dd3d8ef09a800da3d7c1