Merge branch 'misc-drivers' into 'sid'

Add various requested drivers to linux-image and udebs

See merge request kernel-team/linux!510

6 files changed, 8 insertions, 2 deletions

diff --git a/debian/changelog b/debian/changelog
index 950f82cb9..f481357a0 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -302,6 +302,9 @@ linux (5.18.8-1) UNRELEASED; urgency=medium
   * d/tests: Remove obsolete dependencies of python test
   * d/tests: Add kbuild test that builds a trivial OOT module
   * linux-kbuild: Add missing pahole-version.sh script
+  * [amd64] ata: Enable PATA_LEGACY (Closes: #910010)
+  * udeb: Add essiv to crypto-modules (Closes: #973378)
+  * udeb: Add SCSI device handlers to multipath-modules (Closes: #989079)
 
   [ Vincent Blut ]
   * [armhf] drivers/crypto/caam: Enable CRYPTO_DEV_FSL_CAAM as module
diff --git a/debian/config/config b/debian/config/config
index ff21002cf..c225f1e25 100644
--- a/debian/config/config
+++ b/debian/config/config
@@ -103,6 +103,7 @@ CONFIG_CRYPTO_PCBC=m
 CONFIG_CRYPTO_XTS=m
 CONFIG_CRYPTO_KEYWRAP=m
 CONFIG_CRYPTO_ADIANTUM=m
+CONFIG_CRYPTO_ESSIV=m
 CONFIG_CRYPTO_CMAC=m
 CONFIG_CRYPTO_HMAC=m
 CONFIG_CRYPTO_XCBC=m
diff --git a/debian/config/i386/config b/debian/config/i386/config
index 5d652193d..358026d3e 100644
--- a/debian/config/i386/config
+++ b/debian/config/i386/config
@@ -74,7 +74,6 @@ CONFIG_PATA_CS5536=m
 CONFIG_PATA_SC1200=m
 CONFIG_PATA_ISAPNP=m
 CONFIG_PATA_OPTI=m
-CONFIG_PATA_LEGACY=m
 
 ##
 ## file: drivers/atm/Kconfig
diff --git a/debian/config/kernelarch-x86/config b/debian/config/kernelarch-x86/config
index 2f9df848d..a743bd4f0 100644
--- a/debian/config/kernelarch-x86/config
+++ b/debian/config/kernelarch-x86/config
@@ -232,6 +232,7 @@ CONFIG_PATA_MPIIX=m
 CONFIG_PATA_NS87410=m
 CONFIG_PATA_PCMCIA=m
 CONFIG_PATA_RZ1000=m
+CONFIG_PATA_LEGACY=m
 
 ##
 ## file: drivers/atm/Kconfig
diff --git a/debian/installer/modules/crypto-modules b/debian/installer/modules/crypto-modules
index 22460e497..81bbbe53b 100644
--- a/debian/installer/modules/crypto-modules
+++ b/debian/installer/modules/crypto-modules
@@ -10,5 +10,6 @@ ctr
 ecb
 xts
 
-# For LUKS2 in cryptsetup
+# For cryptsetup
 algif_skcipher
+essiv
diff --git a/debian/installer/modules/multipath-modules b/debian/installer/modules/multipath-modules
index 3b96ab99c..2e235994c 100644
--- a/debian/installer/modules/multipath-modules
+++ b/debian/installer/modules/multipath-modules
@@ -1,3 +1,4 @@
 dm-multipath
 dm-round-robin
 dm-service-time
+drivers/scsi/device_handler/*