From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Mon, 3 Aug 2020 17:46:41 +0000 (-0700)
Subject: Merge tag 'filelock-v5.9-1' of git://git.kernel.org/pub/scm/linux/kernel/git/jlayton... 
X-Git-Tag: sched-urgent-2020-08-15~65
X-Git-Url: https://www.infradead.org/git/?a=commitdiff_plain;h=3208167a865e862fff5045d7910387941ff7e114;p=users%2Fdwmw2%2Flinux.git

Merge tag 'filelock-v5.9-1' of git://git.kernel.org/pub/scm/linux/kernel/git/jlayton/linux

Pull file locking fix from Jeff Layton:
 "Just a single, one-line patch to fix an inefficiency in the posix
  locking code that can lead to it doing more wakeups than necessary"

* tag 'filelock-v5.9-1' of git://git.kernel.org/pub/scm/linux/kernel/git/jlayton/linux:
  locks: add locks_move_blocks in posix_lock_inode
---

3208167a865e862fff5045d7910387941ff7e114