From: Linus Torvalds Date: Fri, 27 Nov 2020 20:49:01 +0000 (-0800) Subject: Merge tag 'block-5.10-2020-11-27' of git://git.kernel.dk/linux-block X-Git-Tag: howlett/maple_spf/20210104~480 X-Git-Url: https://www.infradead.org/git/?a=commitdiff_plain;h=d021c3e56d48b0a435eab3b3ec99d4e8bf8df2d1;p=users%2Fjedix%2Flinux-maple.git Merge tag 'block-5.10-2020-11-27' of git://git.kernel.dk/linux-block 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 --- d021c3e56d48b0a435eab3b3ec99d4e8bf8df2d1