]> git.baikalelectronics.ru Git - kernel.git/commitdiff
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)
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


Trivial merge