• Linus Torvalds's avatar
    Merge tag 'for-linus-20191129' of git://git.kernel.dk/linux-block · 31764f1b
    Linus Torvalds authored
    Pull block fixes from Jens Axboe:
     "I wasn't going to send this one off so soon, but unfortunately one of
      the fixes from the previous pull broke the build on some archs. So I'm
      sending this sooner rather than later. This contains:
    
       - Add highmem.h include for io_uring, because of the kmap() additions
         from last round. For some reason the build bot didn't spot this
         even though it sat for days.
    
       - Three minor ';' removals
    
       - Add support for the Beurer CD-on-a-chip device
    
       - Make io_uring work on MMU-less archs"
    
    * tag 'for-linus-20191129' of git://git.kernel.dk/linux-block:
      io_uring: fix missing kmap() declaration on powerpc
      ataflop: Remove unneeded semicolon
      block: sunvdc: Remove unneeded semicolon
      drbd: Remove unneeded semicolon
      io_uring: add mapping support for NOMMU archs
      sr_vendor: support Beurer GL50 evo CD-on-a-chip devices.
      cdrom: respect device capabilities during opening action
    31764f1b
io_uring.c 119 KB