From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Sat, 2 Oct 2021 18:00:36 +0000 (-0700)
Subject: Merge tag 'block-5.15-2021-10-01' of git://git.kernel.dk/linux-block
X-Git-Tag: accepted/tizen/unified/20230118.172025~6243
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=ab2a7a35c4e7e848de9a7cf70f36b62584154140;p=platform%2Fkernel%2Flinux-rpi.git

Merge tag 'block-5.15-2021-10-01' of git://git.kernel.dk/linux-block

Pull block fixes from Jens Axboe:
 "A few block fixes for this release:

   - Revert a BFQ commit that causes breakage for people. Unfortunately
     it was auto-selected for stable as well, so now 5.14.7 suffers from
     it too. Hopefully stable will pick up this revert quickly too, so
     we can remove the issue on that end as well.

   - Add a quirk for Apple NVMe controllers, which due to their
     non-compliance broke due to the introduction of command sequences
     (Keith)

   - Use shifts in nbd, fixing a __divdi3 issue (Nick)"

* tag 'block-5.15-2021-10-01' of git://git.kernel.dk/linux-block:
  nbd: use shifts rather than multiplies
  Revert "block, bfq: honor already-setup queue merges"
  nvme: add command id quirk for apple controllers
---

ab2a7a35c4e7e848de9a7cf70f36b62584154140