summaryrefslogtreecommitdiff
path: root/include
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2021-04-03 14:26:47 -0700
committerLinus Torvalds <torvalds@linux-foundation.org>2021-04-03 14:26:47 -0700
commitd83e98f9d8c88cbae1b05fa5751bddfcf0e222b2 (patch)
tree002c25e5248a56e6f3a780c5641c3a86146858f8 /include
parent8e29be3468d4565dd95fbb098df0d7a79ee60d71 (diff)
parente82ad4853948382d37ac512b27a3e70b6f01c103 (diff)
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
Diffstat (limited to 'include')
0 files changed, 0 insertions, 0 deletions