projects / linux.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: a17a3ca 47a8465)
Merge tag 'block-5.10-2020-11-27' of git://git.kernel.dk/linux-block
authorLinus Torvalds <torvalds@linux-foundation.org>
Fri, 27 Nov 2020 20:49:01 +0000 (12:49 -0800)
committerLinus Torvalds <torvalds@linux-foundation.org>
Fri, 27 Nov 2020 20:49:01 +0000 (12:49 -0800)
Pull block fix from Jens Axboe:
 "Just a single fix, for a crash in the keyslot manager"

* tag 'block-5.10-2020-11-27' of git://git.kernel.dk/linux-block:
  block/keyslot-manager: prevent crash when num_slots=1


Trivial merge
ep93xx device tree rework repo: git://git.maquefel.me/linux.git