From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Fri, 18 Nov 2022 21:59:45 +0000 (-0800)
Subject: Merge tag 'block-6.1-2022-11-18' of git://git.kernel.dk/linux
X-Git-Tag: v6.6.17~6162
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=f4408c3dfcbcc7669caa48786973e88635f3d5e8;p=platform%2Fkernel%2Flinux-rpi.git

Merge tag 'block-6.1-2022-11-18' of git://git.kernel.dk/linux

Pull block fixes from Jens Axboe:

 - NVMe pull request via Christoph:
      - Two more bogus nid quirks (Bean Huo, Tiago Dias Ferreira)
      - Memory leak fix in nvmet (Sagi Grimberg)

 - Regression fix for block cgroups pinning the wrong blkcg, causing
   leaks of cgroups and blkcgs (Chris)

 - UAF fix for drbd setup error handling (Dan)

 - Fix DMA alignment propagation in DM (Keith)

* tag 'block-6.1-2022-11-18' of git://git.kernel.dk/linux:
  dm-log-writes: set dma_alignment limit in io_hints
  dm-integrity: set dma_alignment limit in io_hints
  block: make blk_set_default_limits() private
  dm-crypt: provide dma_alignment limit in io_hints
  block: make dma_alignment a stacking queue_limit
  nvmet: fix a memory leak in nvmet_auth_set_key
  nvme-pci: add NVME_QUIRK_BOGUS_NID for Netac NV7000
  drbd: use after free in drbd_create_device()
  nvme-pci: add NVME_QUIRK_BOGUS_NID for Micron Nitro
  blk-cgroup: properly pin the parent in blkcg_css_online
---

f4408c3dfcbcc7669caa48786973e88635f3d5e8