From 729923cf5378459f7b5db2633bbd00d592c9f894 Mon Sep 17 00:00:00 2001 From: Ben Hutchings Date: Wed, 13 Jul 2022 22:35:59 +0200 Subject: [amd64] ata: Enable PATA_LEGACY (Closes: #910010) --- debian/changelog | 1 + debian/config/i386/config | 1 - debian/config/kernelarch-x86/config | 1 + 3 files changed, 2 insertions(+), 1 deletion(-) (limited to 'debian') diff --git a/debian/changelog b/debian/changelog index b2010b2be..fbb069af3 100644 --- a/debian/changelog +++ b/debian/changelog @@ -299,6 +299,7 @@ linux (5.18.8-1) UNRELEASED; urgency=medium * d/salsa-ci.yml: Sync build-script with upstream * d/salsa-ci.yml: Handle APT sources in debian.sources as well as sources.list + * [amd64] ata: Enable PATA_LEGACY (Closes: #910010) [ Vincent Blut ] * [armhf] drivers/crypto/caam: Enable CRYPTO_DEV_FSL_CAAM as module 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 -- cgit v1.2.3 From 63b0231b719b16f40f095e01a1a52d4897e63e87 Mon Sep 17 00:00:00 2001 From: Ben Hutchings Date: Wed, 13 Jul 2022 23:07:11 +0200 Subject: udeb: Add essiv to crypto-modules (Closes: #973378) Since Linux 5.4, the ESSIV algorithm is implemented as a module in the crypto subsystem, rather than built into dm-crypt. DM_CRYPT selects CRYPTO_ESSIV so the new module was included in linux-image packages, but there is no symbol dependency that would pull essiv into the installer. This didn't affect creation of new encrypted volumes in the installer, because ESSIV isn't used in the current encryption configuration, but it does prevent reusing older encrypted volumes there. Add essiv to crypto-modules, and also explicitly enable CRYPTO_ESSIV in the config in case DM_CRYPT ever stops selecting it. --- debian/changelog | 1 + debian/config/config | 1 + debian/installer/modules/crypto-modules | 3 ++- 3 files changed, 4 insertions(+), 1 deletion(-) (limited to 'debian') diff --git a/debian/changelog b/debian/changelog index fbb069af3..3ef21d261 100644 --- a/debian/changelog +++ b/debian/changelog @@ -300,6 +300,7 @@ linux (5.18.8-1) UNRELEASED; urgency=medium * d/salsa-ci.yml: Handle APT sources in debian.sources as well as sources.list * [amd64] ata: Enable PATA_LEGACY (Closes: #910010) + * udeb: Add essiv to crypto-modules (Closes: #973378) [ 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/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 -- cgit v1.2.3 From d1cf3d4d428449d5250c3d55b25452ec384bc95b Mon Sep 17 00:00:00 2001 From: Ben Hutchings Date: Wed, 13 Jul 2022 23:10:28 +0200 Subject: udeb: Add SCSI device handlers to multipath-modules (Closes: #989079) These drivers are needed to make multipath work on certain SCSI targets. --- debian/changelog | 1 + debian/installer/modules/multipath-modules | 1 + 2 files changed, 2 insertions(+) (limited to 'debian') diff --git a/debian/changelog b/debian/changelog index 3ef21d261..9b78183bd 100644 --- a/debian/changelog +++ b/debian/changelog @@ -301,6 +301,7 @@ linux (5.18.8-1) UNRELEASED; urgency=medium sources.list * [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/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/* -- cgit v1.2.3