From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Mon, 12 Oct 2020 23:50:18 +0000 (-0700)
Subject: Merge tag 'locks-v5.10-1' of git://git.kernel.org/pub/scm/linux/kernel/git/jlayton... 
X-Git-Tag: baikal/mips/sdk5.9~12540
X-Git-Url: https://git.baikalelectronics.ru/sdk/?a=commitdiff_plain;h=bf59f86dddfc7722bed868791533098515f9e154;p=kernel.git

Merge tag 'locks-v5.10-1' of git://git.kernel.org/pub/scm/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
---

bf59f86dddfc7722bed868791533098515f9e154