Merge branch 'nvme-5.14' of git://git.infradead.org/nvme into block-5.14
authorJens Axboe <axboe@kernel.dk>
Wed, 7 Jul 2021 12:37:36 +0000 (06:37 -0600)
committerJens Axboe <axboe@kernel.dk>
Wed, 7 Jul 2021 12:37:36 +0000 (06:37 -0600)
commitc6af8db92b9a9bc89e3d25535fdc26cb61f419d0
tree4bedd822909aa74d9f533f0dcb59aa428357afce
parent585af8ede7035379b712cacca80e9c2c34853d4b
parent0755d3be2d9bb6ea38598ccd30d6bbaa1a5c3a50
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