summaryrefslogtreecommitdiff
path: root/.mailmap
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2019-12-01 18:26:56 -0800
committerLinus Torvalds <torvalds@linux-foundation.org>2019-12-01 18:26:56 -0800
commit31764f1b6d93e126ed341fb600d2765d630e8bf6 (patch)
tree1d003ea367e37d60f6249d527348396baad79554 /.mailmap
parent67b8ed29e0d472bda2f3afe48d6ff99e127eff0c (diff)
parentaa4c3967756c6c576a38a23ac511be211462a6b7 (diff)
Merge tag 'for-linus-20191129' of git://git.kernel.dk/linux-block
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
Diffstat (limited to '.mailmap')
0 files changed, 0 insertions, 0 deletions