From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Sun, 8 May 2022 18:01:20 +0000 (-0700)
Subject: Merge tag 'locking-urgent-2022-05-08' of git://git.kernel.org/pub/scm/linux/kernel... 
X-Git-Tag: v6.1-rc5~1431
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=ede4c6d78a32f9b7dfdb12d5edf8c8c4c84c729a;p=platform%2Fkernel%2Flinux-starfive.git

Merge tag 'locking-urgent-2022-05-08' of git://git./linux/kernel/git/tip/tip

Pull locking fixlet from Thomas Gleixner:
 "Just a email address update for MAINTAINERS and mailmap"

* tag 'locking-urgent-2022-05-08' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip:
  futex: MAINTAINERS, .mailmap: Update André's email address
---

ede4c6d78a32f9b7dfdb12d5edf8c8c4c84c729a