commit d75663868d60f74bda33135fd737a7967532c357
author Linus Torvalds <torvalds@linux-foundation.org> Sun Dec 29 09:50:57 2019 -0800
committer Linus Torvalds <torvalds@linux-foundation.org> Sun Dec 29 09:50:57 2019 -0800
tree deadb7223b57f0f3b6161df2e59a9e41378dadb1
parent cc2f36ec7188e48c2afb1428fc3ce18884ad634b
parent 98ca480a8f22fdbd768e3dad07024c8d4856576c

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

Pull /proc/locks formatting fix from Jeff Layton:
 "This is a trivial fix for a _very_ long standing bug in /proc/locks
  formatting. Ordinarily, I'd wait for the merge window for something
  like this, but it is making it difficult to validate some overlayfs
  fixes.

  I've also gone ahead and marked this for stable"

* tag 'locks-v5.5-1' of git://git.kernel.org/pub/scm/linux/kernel/git/jlayton/linux:
  locks: print unsigned ino in /proc/locks