Merge tag 'locks-v5.5-1' of git://

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

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

* tag 'locks-v5.5-1' of git://
  locks: print unsigned ino in /proc/locks