From: Linus Torvalds Date: Sun, 29 Dec 2019 17:50:57 +0000 (-0800) Subject: Merge tag 'locks-v5.5-1' of git://git.kernel.org/pub/scm/linux/kernel/git/jlayton... X-Git-Url: http://git.maquefel.me/?a=commitdiff_plain;h=d75663868d60f74bda33135fd737a7967532c357;p=linux.git Merge tag 'locks-v5.5-1' of git://git./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 --- d75663868d60f74bda33135fd737a7967532c357