Merge tag 'io_uring-5.5-2020-01-22' of git://git.kernel.dk/linux-block
authorLinus Torvalds <torvalds@linux-foundation.org>
Wed, 22 Jan 2020 16:30:09 +0000 (08:30 -0800)
committerLinus Torvalds <torvalds@linux-foundation.org>
Wed, 22 Jan 2020 16:30:09 +0000 (08:30 -0800)
commitdbab40bdb42c03ab12096d4aaf2dbef3fb55282c
tree434c8bd1d70fe4d123f2d0e7cdd52b42e48e3e63
parentd96d875ef5dd372f533059a44f98e92de9cf0d42
parent1292e972fff2b2d81e139e0c2fe5f50249e78c58
Merge tag 'io_uring-5.5-2020-01-22' of git://git.kernel.dk/linux-block

Pull io_uring fix from Jens Axboe:
 "This was supposed to have gone in last week, but due to a brain fart
  on my part, I forgot that we made this struct addition in the 5.5
  cycle. So here it is for 5.5, to prevent having a 32 vs 64-bit
  compatability issue with the files_update command"

* tag 'io_uring-5.5-2020-01-22' of git://git.kernel.dk/linux-block:
  io_uring: fix compat for IORING_REGISTER_FILES_UPDATE