Merge tag 'locks-v5.10-1' of git://git.kernel.org/pub/scm/linux/kernel/git/jlayton...
authorLinus Torvalds <torvalds@linux-foundation.org>
Mon, 12 Oct 2020 23:50:18 +0000 (16:50 -0700)
committerLinus Torvalds <torvalds@linux-foundation.org>
Mon, 12 Oct 2020 23:50:18 +0000 (16:50 -0700)
commit53acd350503d56a73aa6c61bced1699e8396c6d0
tree766c0ea0f21311c8ed4e688898ec56abffcd425a
parent22230cd2c55bd27ee2c3a3def97c0d5577a75b82
parent1ad5f100e3ba73fe75615f720fa721f039759ee6
Merge tag 'locks-v5.10-1' of git://git./linux/kernel/git/jlayton/linux

Pull file locking fix from Jeff Layton:
 "Just a single patch to fix up some tracepoint output"

* tag 'locks-v5.10-1' of git://git.kernel.org/pub/scm/linux/kernel/git/jlayton/linux:
  locks: Remove extra "0x" in tracepoint format specifier