From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Wed, 2 Oct 2024 19:05:13 +0000 (-0700)
Subject: Merge tag 'for-6.12/dm-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/device... 
X-Git-Tag: v6.12-rc2~40
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=359cdf5a328360fdc41e5ca979f22625f4aceb44;p=thirdparty%2Fkernel%2Flinux.git

Merge tag 'for-6.12/dm-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/device-mapper/linux-dm

Pull device mapper fixes from Mikulas Patocka:
 "Revert the patch that made dm-verity restart or panic on I/O errors,
  and instead add new explicit options for people who want that
  behavior"

* tag 'for-6.12/dm-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/device-mapper/linux-dm:
  dm-verity: introduce the options restart_on_error and panic_on_error
  Revert: "dm-verity: restart or panic on an I/O error"
---

359cdf5a328360fdc41e5ca979f22625f4aceb44