From: Jens Axboe <axboe@kernel.dk>
Date: Wed, 7 Jul 2021 12:37:36 +0000 (-0600)
Subject: Merge branch 'nvme-5.14' of git://git.infradead.org/nvme into block-5.14
X-Git-Tag: v5.14-rc1~27^2~2
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=c6af8db92b9a9bc89e3d25535fdc26cb61f419d0;p=thirdparty%2Flinux.git

Merge branch 'nvme-5.14' of git://git.infradead.org/nvme into block-5.14

Pull single NVMe fix from Christoph.

* 'nvme-5.14' of git://git.infradead.org/nvme:
  nvme-tcp: can't set sk_user_data without write_lock
---

c6af8db92b9a9bc89e3d25535fdc26cb61f419d0