From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Sat, 3 Apr 2021 21:26:47 +0000 (-0700)
Subject: Merge tag 'io_uring-5.12-2021-04-03' of git://git.kernel.dk/linux-block
X-Git-Url: http://git.maquefel.me/?a=commitdiff_plain;h=d83e98f9d8c88cbae1b05fa5751bddfcf0e222b2;p=linux.git

Merge tag 'io_uring-5.12-2021-04-03' of git://git.kernel.dk/linux-block

POull io_uring fix from Jens Axboe:
 "Just fixing a silly braino in a previous patch, where we'd end up
  failing to compile if CONFIG_BLOCK isn't enabled.

  Not that a lot of people do that, but kernel bot spotted it and it's
  probably prudent to just flush this out now before -rc6.

  Sorry about that, none of my test compile configs have !CONFIG_BLOCK"

* tag 'io_uring-5.12-2021-04-03' of git://git.kernel.dk/linux-block:
  io_uring: fix !CONFIG_BLOCK compilation failure
---

d83e98f9d8c88cbae1b05fa5751bddfcf0e222b2