Adding debian version 4.19.269-1.debian/4.19.269-1

Signed-off-by: Daniel Baumann <daniel.baumann@progress-linux.org>

59 files changed, 95 insertions, 172 deletions

diff --git a/debian/config/alpha/config b/debian/config/alpha/config
index 47a119973..fb192486c 100644
--- a/debian/config/alpha/config
+++ b/debian/config/alpha/config
@@ -1028,4 +1028,3 @@ CONFIG_SND_YMFPCI=m
 ## file: sound/pci/hda/Kconfig
 ##
 CONFIG_SND_HDA_INTEL=m
-
diff --git a/debian/config/alpha/config.alpha-generic b/debian/config/alpha/config.alpha-generic
index d63bf76e6..50398c7a8 100644
--- a/debian/config/alpha/config.alpha-generic
+++ b/debian/config/alpha/config.alpha-generic
@@ -7,4 +7,3 @@
 ## file: arch/alpha/Kconfig.debug
 ##
 # CONFIG_ALPHA_LEGACY_START_ADDRESS is not set
-
diff --git a/debian/config/alpha/config.alpha-smp b/debian/config/alpha/config.alpha-smp
index 19288e398..7b53986db 100644
--- a/debian/config/alpha/config.alpha-smp
+++ b/debian/config/alpha/config.alpha-smp
@@ -13,4 +13,3 @@ CONFIG_NR_CPUS=64
 ## file: drivers/scsi/Kconfig
 ##
 CONFIG_SCSI=y
-
diff --git a/debian/config/amd64/config b/debian/config/amd64/config
index 4ffe17e12..344e9132d 100644
--- a/debian/config/amd64/config
+++ b/debian/config/amd64/config
@@ -246,4 +246,3 @@ CONFIG_ZONE_DEVICE=y
 ## file: security/Kconfig
 ##
 CONFIG_LSM_MMAP_MIN_ADDR=65536
-
diff --git a/debian/config/amd64/config.cloud-amd64 b/debian/config/amd64/config.cloud-amd64
index 4d27bd1db..7f45b0a40 100644
--- a/debian/config/amd64/config.cloud-amd64
+++ b/debian/config/amd64/config.cloud-amd64
@@ -1627,4 +1627,3 @@ CONFIG_SECURITY_INFINIBAND=y
 ## file: sound/Kconfig
 ##
 # CONFIG_SOUND is not set
-
diff --git a/debian/config/arm64/config b/debian/config/arm64/config
index b920d612b..4540d77ef 100644
--- a/debian/config/arm64/config
+++ b/debian/config/arm64/config
@@ -28,25 +28,6 @@ CONFIG_ARM64_ACPI_PARKING_PROTOCOL=y
 CONFIG_COMPAT=y
 
 ##
-## file: arch/arm64/crypto/Kconfig
-##
-CONFIG_ARM64_CRYPTO=y
-CONFIG_CRYPTO_SHA1_ARM64_CE=m
-CONFIG_CRYPTO_SHA2_ARM64_CE=m
-CONFIG_CRYPTO_GHASH_ARM64_CE=m
-CONFIG_CRYPTO_CRC32_ARM64_CE=y
-CONFIG_CRYPTO_AES_ARM64_CE=m
-CONFIG_CRYPTO_AES_ARM64_CE_CCM=m
-CONFIG_CRYPTO_AES_ARM64_CE_BLK=m
-# CONFIG_CRYPTO_AES_ARM64_NEON_BLK is not set
-
-##
-## file: arch/arm64/kvm/Kconfig
-##
-CONFIG_VIRTUALIZATION=y
-CONFIG_KVM=y
-
-##
 ## file: arch/arm64/Kconfig.platforms
 ##
 CONFIG_ARCH_SUNXI=y
@@ -66,6 +47,25 @@ CONFIG_ARCH_XGENE=y
 CONFIG_ARCH_ZYNQMP=y
 
 ##
+## file: arch/arm64/crypto/Kconfig
+##
+CONFIG_ARM64_CRYPTO=y
+CONFIG_CRYPTO_SHA1_ARM64_CE=m
+CONFIG_CRYPTO_SHA2_ARM64_CE=m
+CONFIG_CRYPTO_GHASH_ARM64_CE=m
+CONFIG_CRYPTO_CRC32_ARM64_CE=y
+CONFIG_CRYPTO_AES_ARM64_CE=m
+CONFIG_CRYPTO_AES_ARM64_CE_CCM=m
+CONFIG_CRYPTO_AES_ARM64_CE_BLK=m
+# CONFIG_CRYPTO_AES_ARM64_NEON_BLK is not set
+
+##
+## file: arch/arm64/kvm/Kconfig
+##
+CONFIG_VIRTUALIZATION=y
+CONFIG_KVM=y
+
+##
 ## file: drivers/acpi/Kconfig
 ##
 CONFIG_ACPI=y
@@ -1321,4 +1321,3 @@ CONFIG_SND_SOC_TEGRA_TRIMSLICE=m
 CONFIG_SND_SOC_TEGRA_ALC5632=m
 CONFIG_SND_SOC_TEGRA_MAX98090=m
 CONFIG_SND_SOC_TEGRA_RT5677=m
-
diff --git a/debian/config/armel/config b/debian/config/armel/config
index ef0b4db29..7f0b40495 100644
--- a/debian/config/armel/config
+++ b/debian/config/armel/config
@@ -7,4 +7,3 @@
 ## file: security/tomoyo/Kconfig
 ##
 # CONFIG_SECURITY_TOMOYO is not set
-
diff --git a/debian/config/armel/config.marvell b/debian/config/armel/config.marvell
index 744271f56..ca3aa7fcf 100644
--- a/debian/config/armel/config.marvell
+++ b/debian/config/armel/config.marvell
@@ -880,4 +880,3 @@ CONFIG_SND_KIRKWOOD_SOC=m
 # CONFIG_RD_LZMA is not set
 # CONFIG_RD_LZO is not set
 # CONFIG_RD_LZ4 is not set
-
diff --git a/debian/config/armel/config.rpi b/debian/config/armel/config.rpi
index 965ed7e5f..263153e5a 100644
--- a/debian/config/armel/config.rpi
+++ b/debian/config/armel/config.rpi
@@ -187,4 +187,3 @@ CONFIG_SND_SOC=y
 ## file: sound/soc/bcm/Kconfig
 ##
 CONFIG_SND_BCM2835_SOC_I2S=y
-
diff --git a/debian/config/armhf/config b/debian/config/armhf/config
index 33591b41d..5d267ce5a 100644
--- a/debian/config/armhf/config
+++ b/debian/config/armhf/config
@@ -1438,4 +1438,3 @@ CONFIG_SND_SOC_TEGRA_TRIMSLICE=m
 CONFIG_SND_SOC_TEGRA_ALC5632=m
 CONFIG_SND_SOC_TEGRA_MAX98090=m
 CONFIG_SND_SOC_TEGRA_RT5677=m
-
diff --git a/debian/config/armhf/config.armmp-lpae b/debian/config/armhf/config.armmp-lpae
index d5045f1ee..d54d1351b 100644
--- a/debian/config/armhf/config.armmp-lpae
+++ b/debian/config/armhf/config.armmp-lpae
@@ -18,4 +18,3 @@ CONFIG_ARM_LPAE=y
 ## file: drivers/iommu/Kconfig
 ##
 CONFIG_ARM_SMMU=y
-
diff --git a/debian/config/config b/debian/config/config
index 65131861e..6d95e2809 100644
--- a/debian/config/config
+++ b/debian/config/config
@@ -3696,7 +3696,7 @@ CONFIG_LED_TRIGGER_PHY=y
 CONFIG_SFP=m
 CONFIG_AMD_PHY=m
 CONFIG_AQUANTIA_PHY=m
-# CONFIG_ASIX_PHY is not set
+# CONFIG_AX88796B_PHY is not set
 CONFIG_AT803X_PHY=m
 # CONFIG_BCM63XX_PHY is not set
 # CONFIG_BCM7XXX_PHY is not set
@@ -4379,18 +4379,6 @@ CONFIG_YENTA_TOSHIBA=y
 # CONFIG_GOLDFISH is not set
 
 ##
-## file: drivers/platform/x86/Kconfig
-##
-CONFIG_ASUS_LAPTOP=m
-CONFIG_FUJITSU_LAPTOP=m
-CONFIG_HP_WMI=m
-CONFIG_MSI_LAPTOP=m
-CONFIG_PANASONIC_LAPTOP=m
-CONFIG_COMPAL_LAPTOP=m
-CONFIG_SONY_LAPTOP=m
-# CONFIG_SAMSUNG_LAPTOP is not set
-
-##
 ## file: drivers/pnp/Kconfig
 ##
 # CONFIG_PNP_DEBUG_MESSAGES is not set
@@ -4611,7 +4599,6 @@ CONFIG_BLK_DEV_SD=m
 CONFIG_CHR_DEV_ST=m
 CONFIG_CHR_DEV_OSST=m
 CONFIG_BLK_DEV_SR=m
-CONFIG_BLK_DEV_SR_VENDOR=y
 CONFIG_CHR_DEV_SG=m
 CONFIG_CHR_DEV_SCH=m
 CONFIG_SCSI_ENCLOSURE=m
@@ -5359,7 +5346,6 @@ CONFIG_USB_EMI62=m
 CONFIG_USB_EMI26=m
 CONFIG_USB_ADUTUX=m
 CONFIG_USB_SEVSEG=m
-CONFIG_USB_RIO500=m
 CONFIG_USB_LEGOTOWER=m
 CONFIG_USB_LCD=m
 CONFIG_USB_CYPRESS_CY7C63=m
@@ -5564,7 +5550,6 @@ CONFIG_BACKLIGHT_WM831X=m
 ##
 ## file: drivers/video/console/Kconfig
 ##
-# CONFIG_VGACON_SOFT_SCROLLBACK is not set
 CONFIG_DUMMY_CONSOLE_COLUMNS=80
 CONFIG_DUMMY_CONSOLE_ROWS=25
 CONFIG_FRAMEBUFFER_CONSOLE=y
@@ -5743,6 +5728,16 @@ CONFIG_MISC_FILESYSTEMS=y
 CONFIG_NETWORK_FILESYSTEMS=y
 
 ##
+## file: fs/Kconfig.binfmt
+##
+CONFIG_BINFMT_ELF=y
+CONFIG_CORE_DUMP_DEFAULT_ELF_HEADERS=y
+CONFIG_BINFMT_SCRIPT=y
+# CONFIG_BINFMT_AOUT is not set
+CONFIG_BINFMT_MISC=m
+CONFIG_COREDUMP=y
+
+##
 ## file: fs/9p/Kconfig
 ##
 CONFIG_9P_FS=m
@@ -5785,16 +5780,6 @@ CONFIG_BEFS_FS=m
 CONFIG_BFS_FS=m
 
 ##
-## file: fs/Kconfig.binfmt
-##
-CONFIG_BINFMT_ELF=y
-CONFIG_CORE_DUMP_DEFAULT_ELF_HEADERS=y
-CONFIG_BINFMT_SCRIPT=y
-# CONFIG_BINFMT_AOUT is not set
-CONFIG_BINFMT_MISC=m
-CONFIG_COREDUMP=y
-
-##
 ## file: fs/btrfs/Kconfig
 ##
 CONFIG_BTRFS_FS=m
@@ -6402,11 +6387,6 @@ CONFIG_MODULE_SIG_SHA256=y
 # CONFIG_TRIM_UNUSED_KSYMS is not set
 
 ##
-## file: kernel/gcov/Kconfig
-##
-# CONFIG_GCOV_KERNEL is not set
-
-##
 ## file: kernel/Kconfig.hz
 ##
 ## choice: Timer frequency
@@ -6417,6 +6397,20 @@ CONFIG_HZ_250=y
 ## end choice
 
 ##
+## file: kernel/Kconfig.preempt
+##
+## choice: Preemption Model
+# CONFIG_PREEMPT_NONE is not set
+CONFIG_PREEMPT_VOLUNTARY=y
+# CONFIG_PREEMPT is not set
+## end choice
+
+##
+## file: kernel/gcov/Kconfig
+##
+# CONFIG_GCOV_KERNEL is not set
+
+##
 ## file: kernel/irq/Kconfig
 ##
 # CONFIG_GENERIC_IRQ_DEBUGFS is not set
@@ -6438,15 +6432,6 @@ CONFIG_PM_ADVANCED_DEBUG=y
 # CONFIG_WQ_POWER_EFFICIENT_DEFAULT is not set
 
 ##
-## file: kernel/Kconfig.preempt
-##
-## choice: Preemption Model
-# CONFIG_PREEMPT_NONE is not set
-CONFIG_PREEMPT_VOLUNTARY=y
-# CONFIG_PREEMPT is not set
-## end choice
-
-##
 ## file: kernel/rcu/Kconfig
 ##
 # CONFIG_RCU_EXPERT is not set
@@ -6595,6 +6580,7 @@ CONFIG_DEBUG_LIST=y
 CONFIG_NOTIFIER_ERROR_INJECTION=m
 CONFIG_PM_NOTIFIER_ERROR_INJECT=m
 # CONFIG_NETDEV_NOTIFIER_ERROR_INJECT is not set
+CONFIG_FUNCTION_ERROR_INJECTION=y
 # CONFIG_FAULT_INJECTION is not set
 # CONFIG_LATENCYTOP is not set
 # CONFIG_DMA_API_DEBUG is not set
@@ -6628,11 +6614,6 @@ CONFIG_STRICT_DEVMEM=y
 CONFIG_IO_STRICT_DEVMEM=y
 
 ##
-## file: lib/fonts/Kconfig
-##
-# CONFIG_FONTS is not set
-
-##
 ## file: lib/Kconfig.kasan
 ##
 # CONFIG_KASAN is not set
@@ -6648,6 +6629,11 @@ CONFIG_IO_STRICT_DEVMEM=y
 # CONFIG_UBSAN is not set
 
 ##
+## file: lib/fonts/Kconfig
+##
+# CONFIG_FONTS is not set
+
+##
 ## file: lib/xz/Kconfig
 ##
 #. These are enabled again by arch config, matching the defaults
@@ -8072,4 +8058,3 @@ CONFIG_RD_LZMA=y
 CONFIG_RD_XZ=y
 CONFIG_RD_LZO=y
 CONFIG_RD_LZ4=y
-
diff --git a/debian/config/defines b/debian/config/defines
index e2c6786e2..74480f0f9 100644
--- a/debian/config/defines
+++ b/debian/config/defines
@@ -1,5 +1,5 @@
 [abi]
-abiname: 22
+abiname: 23
 ignore-changes:
  __cpuhp_*
  bpf_analyzer
diff --git a/debian/config/featureset-rt/config b/debian/config/featureset-rt/config
index 088c60e7f..d6d0ab193 100644
--- a/debian/config/featureset-rt/config
+++ b/debian/config/featureset-rt/config
@@ -29,4 +29,3 @@ CONFIG_HWLAT_TRACER=y
 #. Dropped between 4.9 and 4.11, but might come back
 CONFIG_MISSED_TIMER_OFFSETS_HIST=y
 CONFIG_WAKEUP_LATENCY_HIST=y
-
diff --git a/debian/config/hppa/config b/debian/config/hppa/config
index 0e7aca4b6..1c4b088c8 100644
--- a/debian/config/hppa/config
+++ b/debian/config/hppa/config
@@ -665,4 +665,3 @@ CONFIG_SND_HARMONY=m
 ## file: sound/pci/hda/Kconfig
 ##
 # CONFIG_SND_HDA_INTEL is not set
-
diff --git a/debian/config/hppa/config.parisc b/debian/config/hppa/config.parisc
index 9a07c7962..c0a81563c 100644
--- a/debian/config/hppa/config.parisc
+++ b/debian/config/hppa/config.parisc
@@ -23,4 +23,3 @@ CONFIG_TLAN=m
 ##
 CONFIG_PCMCIA_AHA152X=m
 CONFIG_PCMCIA_NINJA_SCSI=m
-
diff --git a/debian/config/hppa/config.parisc-smp b/debian/config/hppa/config.parisc-smp
index 63e47e31a..878125a2f 100644
--- a/debian/config/hppa/config.parisc-smp
+++ b/debian/config/hppa/config.parisc-smp
@@ -24,4 +24,3 @@ CONFIG_TLAN=m
 ##
 CONFIG_PCMCIA_AHA152X=m
 CONFIG_PCMCIA_NINJA_SCSI=m
-
diff --git a/debian/config/hppa/config.parisc64-smp b/debian/config/hppa/config.parisc64-smp
index e39d0c934..1dbd4821a 100644
--- a/debian/config/hppa/config.parisc64-smp
+++ b/debian/config/hppa/config.parisc64-smp
@@ -55,4 +55,3 @@ CONFIG_I2C_ALGOBIT=y
 CONFIG_DISCONTIGMEM_MANUAL=y
 # CONFIG_SPARSEMEM_MANUAL is not set
 ## end choice
-
diff --git a/debian/config/i386/config b/debian/config/i386/config
index 2beee8808..6c392a28b 100644
--- a/debian/config/i386/config
+++ b/debian/config/i386/config
@@ -532,4 +532,3 @@ CONFIG_SND_MSND_CLASSIC=m
 CONFIG_SND_CS5530=m
 CONFIG_SND_CS5535AUDIO=m
 CONFIG_SND_SIS7019=m
-
diff --git a/debian/config/i386/config.686 b/debian/config/i386/config.686
index c9d54a9cc..d86788fb9 100644
--- a/debian/config/i386/config.686
+++ b/debian/config/i386/config.686
@@ -81,4 +81,3 @@ CONFIG_FB_GEODE_GX1=m
 ## file: lib/Kconfig.debug
 ##
 # CONFIG_DEBUG_HIGHMEM is not set
-
diff --git a/debian/config/i386/config.686-pae b/debian/config/i386/config.686-pae
index c5faf6902..8daf2c9e9 100644
--- a/debian/config/i386/config.686-pae
+++ b/debian/config/i386/config.686-pae
@@ -51,4 +51,3 @@ CONFIG_I2C_STUB=m
 ## file: lib/Kconfig.debug
 ##
 # CONFIG_DEBUG_HIGHMEM is not set
-
diff --git a/debian/config/ia64/config b/debian/config/ia64/config
index 9c3948937..c84a4909a 100644
--- a/debian/config/ia64/config
+++ b/debian/config/ia64/config
@@ -841,4 +841,3 @@ CONFIG_SND_YMFPCI=m
 ## file: sound/pci/hda/Kconfig
 ##
 CONFIG_SND_HDA_INTEL=m
-
diff --git a/debian/config/ia64/config.itanium b/debian/config/ia64/config.itanium
index e683b846b..1d1da671f 100644
--- a/debian/config/ia64/config.itanium
+++ b/debian/config/ia64/config.itanium
@@ -8,4 +8,3 @@ CONFIG_ITANIUM=y
 CONFIG_SMP=y
 CONFIG_NR_CPUS=64
 # CONFIG_SCHED_SMT is not set
-
diff --git a/debian/config/ia64/config.mckinley b/debian/config/ia64/config.mckinley
index 6da85354e..581fcde88 100644
--- a/debian/config/ia64/config.mckinley
+++ b/debian/config/ia64/config.mckinley
@@ -8,4 +8,3 @@ CONFIG_MCKINLEY=y
 CONFIG_SMP=y
 CONFIG_NR_CPUS=64
 # CONFIG_SCHED_SMT is not set
-
diff --git a/debian/config/kernelarch-arm/config b/debian/config/kernelarch-arm/config
index fabd666bc..c6ef76765 100644
--- a/debian/config/kernelarch-arm/config
+++ b/debian/config/kernelarch-arm/config
@@ -123,4 +123,3 @@ CONFIG_CPU_THERMAL=y
 ##
 CONFIG_XZ_DEC_ARM=y
 CONFIG_XZ_DEC_ARMTHUMB=y
-
diff --git a/debian/config/kernelarch-mips/config b/debian/config/kernelarch-mips/config
index 63720baaa..fe6434f8f 100644
--- a/debian/config/kernelarch-mips/config
+++ b/debian/config/kernelarch-mips/config
@@ -67,4 +67,3 @@ CONFIG_USB_OHCI_HCD=m
 ##
 CONFIG_SGETMASK_SYSCALL=y
 CONFIG_SYSFS_SYSCALL=y
-
diff --git a/debian/config/kernelarch-mips/config.boston b/debian/config/kernelarch-mips/config.boston
index 20178e150..c3a61f890 100644
--- a/debian/config/kernelarch-mips/config.boston
+++ b/debian/config/kernelarch-mips/config.boston
@@ -69,4 +69,3 @@ CONFIG_SPI_TOPCLIFF_PCH=y
 ## file: drivers/tty/serial/8250/Kconfig
 ##
 CONFIG_SERIAL_OF_PLATFORM=y
-
diff --git a/debian/config/kernelarch-mips/config.loongson-3 b/debian/config/kernelarch-mips/config.loongson-3
index 479be70c1..963f399d1 100644
--- a/debian/config/kernelarch-mips/config.loongson-3
+++ b/debian/config/kernelarch-mips/config.loongson-3
@@ -123,4 +123,3 @@ CONFIG_PREEMPT=y
 ## file: sound/pci/hda/Kconfig
 ##
 CONFIG_SND_HDA_INTEL=m
-
diff --git a/debian/config/kernelarch-mips/config.malta b/debian/config/kernelarch-mips/config.malta
index 57e84bccc..7718eab19 100644
--- a/debian/config/kernelarch-mips/config.malta
+++ b/debian/config/kernelarch-mips/config.malta
@@ -306,7 +306,7 @@ CONFIG_USB_ZD1201=m
 # CONFIG_PCIEPORTBUS is not set
 
 ##
-### file: drivers/power/reset/Kconfig
+## file: drivers/power/reset/Kconfig
 ##
 CONFIG_POWER_RESET_PIIX4_POWEROFF=y
 
@@ -495,4 +495,3 @@ CONFIG_SND_VIA82XX=m
 CONFIG_SND_VIA82XX_MODEM=m
 CONFIG_SND_VX222=m
 CONFIG_SND_YMFPCI=m
-
diff --git a/debian/config/kernelarch-mips/config.mips32r2 b/debian/config/kernelarch-mips/config.mips32r2
index 88f2c05a9..f8de842c7 100644
--- a/debian/config/kernelarch-mips/config.mips32r2
+++ b/debian/config/kernelarch-mips/config.mips32r2
@@ -7,4 +7,3 @@ CONFIG_CPU_MIPS32_R2=y
 ## choice: Kernel code model
 CONFIG_32BIT=y
 ## end choice
-
diff --git a/debian/config/kernelarch-mips/config.mips32r6 b/debian/config/kernelarch-mips/config.mips32r6
index c95ffabb9..1771b56be 100644
--- a/debian/config/kernelarch-mips/config.mips32r6
+++ b/debian/config/kernelarch-mips/config.mips32r6
@@ -7,4 +7,3 @@ CONFIG_CPU_MIPS32_R6=y
 ## choice: Kernel code model
 CONFIG_32BIT=y
 ## end choice
-
diff --git a/debian/config/kernelarch-mips/config.mips64r2 b/debian/config/kernelarch-mips/config.mips64r2
index 1c1bed181..99507b262 100644
--- a/debian/config/kernelarch-mips/config.mips64r2
+++ b/debian/config/kernelarch-mips/config.mips64r2
@@ -7,4 +7,3 @@ CONFIG_CPU_MIPS64_R2=y
 ## choice: Kernel code model
 CONFIG_64BIT=y
 ## end choice
-
diff --git a/debian/config/kernelarch-mips/config.mips64r6 b/debian/config/kernelarch-mips/config.mips64r6
index 2cd32b0b5..1f72d372f 100644
--- a/debian/config/kernelarch-mips/config.mips64r6
+++ b/debian/config/kernelarch-mips/config.mips64r6
@@ -7,4 +7,3 @@ CONFIG_CPU_MIPS64_R6=y
 ## choice: Kernel code model
 CONFIG_64BIT=y
 ## end choice
-
diff --git a/debian/config/kernelarch-mips/config.octeon b/debian/config/kernelarch-mips/config.octeon
index dbd98f0b5..92b41f0f9 100644
--- a/debian/config/kernelarch-mips/config.octeon
+++ b/debian/config/kernelarch-mips/config.octeon
@@ -186,4 +186,3 @@ CONFIG_USB_OCTEON_OHCI=y
 ## choice: Memory model
 CONFIG_SPARSEMEM_MANUAL=y
 ## end choice
-
diff --git a/debian/config/kernelarch-powerpc/config b/debian/config/kernelarch-powerpc/config
index d0e2d4db6..c09806f8a 100644
--- a/debian/config/kernelarch-powerpc/config
+++ b/debian/config/kernelarch-powerpc/config
@@ -944,4 +944,3 @@ CONFIG_SND_HDA_INTEL=m
 ##
 CONFIG_SND_POWERMAC=m
 CONFIG_SND_POWERMAC_AUTO_DRC=y
-
diff --git a/debian/config/kernelarch-powerpc/config-arch-64 b/debian/config/kernelarch-powerpc/config-arch-64
index c60f929ee..1ad6e3e11 100644
--- a/debian/config/kernelarch-powerpc/config-arch-64
+++ b/debian/config/kernelarch-powerpc/config-arch-64
@@ -198,4 +198,3 @@ CONFIG_CPUMASK_OFFSTACK=y
 CONFIG_SPARSEMEM_MANUAL=y
 ## end choice
 CONFIG_SPARSEMEM_VMEMMAP=y
-
diff --git a/debian/config/kernelarch-powerpc/config-arch-64-be b/debian/config/kernelarch-powerpc/config-arch-64-be
index 20099b2fc..363d14c5b 100644
--- a/debian/config/kernelarch-powerpc/config-arch-64-be
+++ b/debian/config/kernelarch-powerpc/config-arch-64-be
@@ -108,4 +108,3 @@ CONFIG_SYSFS_SYSCALL=y
 ##
 CONFIG_SND_PS3=m
 CONFIG_SND_PS3_DEFAULT_START_DELAY=2000
-
diff --git a/debian/config/kernelarch-powerpc/config-arch-64-le b/debian/config/kernelarch-powerpc/config-arch-64-le
index e26064cea..011c77bd1 100644
--- a/debian/config/kernelarch-powerpc/config-arch-64-le
+++ b/debian/config/kernelarch-powerpc/config-arch-64-le
@@ -38,4 +38,3 @@ CONFIG_CPU_FREQ_DEFAULT_GOV_ONDEMAND=y
 ##
 #. See #789070
 # CONFIG_HIBERNATION is not set
-
diff --git a/debian/config/kernelarch-sparc/config b/debian/config/kernelarch-sparc/config
index 2d24a76d3..e59b815b7 100644
--- a/debian/config/kernelarch-sparc/config
+++ b/debian/config/kernelarch-sparc/config
@@ -604,4 +604,3 @@ CONFIG_SND_MAESTRO3=m
 CONFIG_SND_SUN_AMD7930=m
 CONFIG_SND_SUN_CS4231=m
 CONFIG_SND_SUN_DBRI=m
-
diff --git a/debian/config/kernelarch-sparc/config-smp b/debian/config/kernelarch-sparc/config-smp
index f6412c26e..323cbd074 100644
--- a/debian/config/kernelarch-sparc/config-smp
+++ b/debian/config/kernelarch-sparc/config-smp
@@ -4,4 +4,3 @@
 CONFIG_SMP=y
 CONFIG_NR_CPUS=256
 CONFIG_SCHED_SMT=y
-
diff --git a/debian/config/kernelarch-sparc/config-up b/debian/config/kernelarch-sparc/config-up
index 758621713..4ddea7054 100644
--- a/debian/config/kernelarch-sparc/config-up
+++ b/debian/config/kernelarch-sparc/config-up
@@ -2,4 +2,3 @@
 ## file: arch/sparc/Kconfig
 ##
 # CONFIG_SMP is not set
-
diff --git a/debian/config/kernelarch-x86/config b/debian/config/kernelarch-x86/config
index 86fe17162..3a05265c0 100644
--- a/debian/config/kernelarch-x86/config
+++ b/debian/config/kernelarch-x86/config
@@ -2012,11 +2012,6 @@ CONFIG_VMWARE_VMCI_VSOCKETS=m
 CONFIG_HYPERV_VSOCKETS=m
 
 ##
-## file: security/Kconfig
-##
-CONFIG_ALLOW_LOCKDOWN_LIFT_BY_SYSRQ=y
-
-##
 ## file: sound/drivers/Kconfig
 ##
 CONFIG_SND_DUMMY=m
@@ -2133,4 +2128,3 @@ CONFIG_SND_SOC_INTEL_GLK_RT5682_MAX98357A_MACH=m
 ##
 CONFIG_SND_X86=y
 CONFIG_HDMI_LPE_AUDIO=m
-
diff --git a/debian/config/m68k/config b/debian/config/m68k/config
index b251972cf..4a7c552fa 100644
--- a/debian/config/m68k/config
+++ b/debian/config/m68k/config
@@ -610,6 +610,12 @@ CONFIG_FB_ATY=y
 CONFIG_ZORRO_NAMES=y
 
 ##
+## file: fs/Kconfig.binfmt
+##
+CONFIG_BINFMT_ELF=y
+CONFIG_BINFMT_MISC=m
+
+##
 ## file: fs/adfs/Kconfig
 ##
 # CONFIG_ADFS_FS is not set
@@ -630,12 +636,6 @@ CONFIG_ZORRO_NAMES=y
 # CONFIG_BFS_FS is not set
 
 ##
-## file: fs/Kconfig.binfmt
-##
-CONFIG_BINFMT_ELF=y
-CONFIG_BINFMT_MISC=m
-
-##
 ## file: fs/ceph/Kconfig
 ##
 # CONFIG_CEPH_FS is not set
@@ -869,4 +869,3 @@ CONFIG_IPV6=m
 CONFIG_DMASOUND_ATARI=m
 CONFIG_DMASOUND_PAULA=m
 CONFIG_DMASOUND_Q40=m
-
diff --git a/debian/config/mips/config b/debian/config/mips/config
index d91768a35..75aac3081 100644
--- a/debian/config/mips/config
+++ b/debian/config/mips/config
@@ -10,4 +10,3 @@ CONFIG_CPU_BIG_ENDIAN=y
 ## file: drivers/net/ethernet/mellanox/mlx5/core/Kconfig
 ##
 # CONFIG_MLX5_ESWITCH is not set
-
diff --git a/debian/config/mips64/config b/debian/config/mips64/config
index 5942c9ab9..1d9268526 100644
--- a/debian/config/mips64/config
+++ b/debian/config/mips64/config
@@ -5,4 +5,3 @@
 CONFIG_CPU_BIG_ENDIAN=y
 # CONFIG_CPU_LITTLE_ENDIAN is not set
 ## end choice
-
diff --git a/debian/config/mips64el/config b/debian/config/mips64el/config
index 4807b611e..9f3326ab0 100644
--- a/debian/config/mips64el/config
+++ b/debian/config/mips64el/config
@@ -9,4 +9,3 @@ CONFIG_CPU_LITTLE_ENDIAN=y
 # CONFIG_CPU_MIPS64_R1 is not set
 CONFIG_CPU_MIPS64_R2=y
 ## end choice
-
diff --git a/debian/config/mips64r6/config b/debian/config/mips64r6/config
index 5942c9ab9..1d9268526 100644
--- a/debian/config/mips64r6/config
+++ b/debian/config/mips64r6/config
@@ -5,4 +5,3 @@
 CONFIG_CPU_BIG_ENDIAN=y
 # CONFIG_CPU_LITTLE_ENDIAN is not set
 ## end choice
-
diff --git a/debian/config/mips64r6el/config b/debian/config/mips64r6el/config
index 7f124deb6..bf12a2398 100644
--- a/debian/config/mips64r6el/config
+++ b/debian/config/mips64r6el/config
@@ -5,4 +5,3 @@
 # CONFIG_CPU_BIG_ENDIAN is not set
 CONFIG_CPU_LITTLE_ENDIAN=y
 ## end choice
-
diff --git a/debian/config/mipsel/config b/debian/config/mipsel/config
index 3a576b57a..9b619c765 100644
--- a/debian/config/mipsel/config
+++ b/debian/config/mipsel/config
@@ -10,4 +10,3 @@ CONFIG_CPU_LITTLE_ENDIAN=y
 ## file: drivers/net/ethernet/mellanox/mlx5/core/Kconfig
 ##
 # CONFIG_MLX5_ESWITCH is not set
-
diff --git a/debian/config/mipsr6/config b/debian/config/mipsr6/config
index 5942c9ab9..1d9268526 100644
--- a/debian/config/mipsr6/config
+++ b/debian/config/mipsr6/config
@@ -5,4 +5,3 @@
 CONFIG_CPU_BIG_ENDIAN=y
 # CONFIG_CPU_LITTLE_ENDIAN is not set
 ## end choice
-
diff --git a/debian/config/mipsr6el/config b/debian/config/mipsr6el/config
index 7f124deb6..bf12a2398 100644
--- a/debian/config/mipsr6el/config
+++ b/debian/config/mipsr6el/config
@@ -5,4 +5,3 @@
 # CONFIG_CPU_BIG_ENDIAN is not set
 CONFIG_CPU_LITTLE_ENDIAN=y
 ## end choice
-
diff --git a/debian/config/powerpc/config.powerpc b/debian/config/powerpc/config.powerpc
index 63a07fb2e..b48d37302 100644
--- a/debian/config/powerpc/config.powerpc
+++ b/debian/config/powerpc/config.powerpc
@@ -5,6 +5,20 @@ CONFIG_HIGHMEM=y
 # CONFIG_ISA is not set
 
 ##
+## file: arch/powerpc/platforms/Kconfig.cputype
+##
+# CONFIG_PPC64 is not set
+## choice: Processor Type
+# CONFIG_PPC_85xx is not set
+# CONFIG_PPC_8xx is not set
+# CONFIG_40x is not set
+# CONFIG_44x is not set
+# CONFIG_E200 is not set
+## end choice
+CONFIG_ALTIVEC=y
+# CONFIG_SMP is not set
+
+##
 ## file: arch/powerpc/platforms/512x/Kconfig
 ##
 # CONFIG_MPC5121_ADS is not set
@@ -24,20 +38,6 @@ CONFIG_PPC_MPC5200_BUGFIX=y
 CONFIG_PPC_CHRP=y
 
 ##
-## file: arch/powerpc/platforms/Kconfig.cputype
-##
-# CONFIG_PPC64 is not set
-## choice: Processor Type
-# CONFIG_PPC_85xx is not set
-# CONFIG_PPC_8xx is not set
-# CONFIG_40x is not set
-# CONFIG_44x is not set
-# CONFIG_E200 is not set
-## end choice
-CONFIG_ALTIVEC=y
-# CONFIG_SMP is not set
-
-##
 ## file: drivers/ata/Kconfig
 ##
 CONFIG_PATA_MPC52xx=m
@@ -110,4 +110,3 @@ CONFIG_FLATMEM_MANUAL=y
 # CONFIG_DISCONTIGMEM_MANUAL is not set
 # CONFIG_SPARSEMEM_MANUAL is not set
 ## end choice
-
diff --git a/debian/config/powerpc/config.powerpc-smp b/debian/config/powerpc/config.powerpc-smp
index dfbaaf6d2..c49683792 100644
--- a/debian/config/powerpc/config.powerpc-smp
+++ b/debian/config/powerpc/config.powerpc-smp
@@ -3,4 +3,3 @@
 ##
 CONFIG_SMP=y
 CONFIG_NR_CPUS=4
-
diff --git a/debian/config/powerpcspe/config b/debian/config/powerpcspe/config
index 8d3fcc54a..c02ddfebd 100644
--- a/debian/config/powerpcspe/config
+++ b/debian/config/powerpcspe/config
@@ -6,6 +6,16 @@ CONFIG_CMDLINE_BOOL=y
 CONFIG_CMDLINE="console=ttyS0,115200"
 
 ##
+## file: arch/powerpc/platforms/Kconfig.cputype
+##
+## choice: Processor Type
+CONFIG_PPC_85xx=y
+## end choice
+CONFIG_PHYS_64BIT=y
+CONFIG_SMP=y
+CONFIG_NR_CPUS=4
+
+##
 ## file: arch/powerpc/platforms/85xx/Kconfig
 ##
 CONFIG_MPC8540_ADS=y
@@ -17,17 +27,6 @@ CONFIG_MPC85xx_DS=y
 CONFIG_MPC85xx_RDB=y
 
 ##
-## file: arch/powerpc/platforms/Kconfig.cputype
-##
-## choice: Processor Type
-CONFIG_PPC_85xx=y
-## end choice
-CONFIG_PHYS_64BIT=y
-CONFIG_SMP=y
-CONFIG_NR_CPUS=4
-
-##
 ## file: drivers/gpio/Kconfig
 ##
 CONFIG_GPIOLIB=y
-
diff --git a/debian/config/riscv64/config b/debian/config/riscv64/config
index 26f33338b..5a3bc5c20 100644
--- a/debian/config/riscv64/config
+++ b/debian/config/riscv64/config
@@ -55,4 +55,3 @@ CONFIG_USB_EHCI_HCD=m
 CONFIG_USB_EHCI_HCD_PLATFORM=m
 CONFIG_USB_OHCI_HCD=m
 CONFIG_USB_OHCI_HCD_PLATFORM=m
-
diff --git a/debian/config/s390x/config b/debian/config/s390x/config
index f7dcd7130..c0d782422 100644
--- a/debian/config/s390x/config
+++ b/debian/config/s390x/config
@@ -219,4 +219,3 @@ CONFIG_AFIUCV=m
 ## file: net/llc/Kconfig
 ##
 # CONFIG_LLC2 is not set
-
diff --git a/debian/config/sh4/config b/debian/config/sh4/config
index 453823633..1067255cf 100644
--- a/debian/config/sh4/config
+++ b/debian/config/sh4/config
@@ -52,4 +52,3 @@ CONFIG_HZ_250=y
 ## file: kernel/irq/Kconfig
 ##
 CONFIG_SPARSE_IRQ=y
-
diff --git a/debian/config/sh4/config.sh7751r b/debian/config/sh4/config.sh7751r
index 99c496e93..e776fc808 100644
--- a/debian/config/sh4/config.sh7751r
+++ b/debian/config/sh4/config.sh7751r
@@ -8,6 +8,14 @@ CONFIG_SH_PCLK_FREQ=60000000
 CONFIG_PCI=y
 
 ##
+## file: arch/sh/Kconfig.cpu
+##
+## choice: Endianness selection
+CONFIG_CPU_LITTLE_ENDIAN=y
+## end choice
+CONFIG_SH_FPU=y
+
+##
 ## file: arch/sh/boards/Kconfig
 ##
 CONFIG_SH_RTS7751R2D=y
@@ -18,14 +26,6 @@ CONFIG_SH_RTS7751R2D=y
 CONFIG_RTS7751R2D_PLUS=y
 
 ##
-## file: arch/sh/Kconfig.cpu
-##
-## choice: Endianness selection
-CONFIG_CPU_LITTLE_ENDIAN=y
-## end choice
-CONFIG_SH_FPU=y
-
-##
 ## file: arch/sh/mm/Kconfig
 ##
 CONFIG_MMU=y
@@ -165,4 +165,3 @@ CONFIG_FB_SM501=y
 ## choice: Memory model
 CONFIG_FLATMEM_MANUAL=y
 ## end choice
-
diff --git a/debian/config/sh4/config.sh7785lcr b/debian/config/sh4/config.sh7785lcr
index 6d1175949..26707540b 100644
--- a/debian/config/sh4/config.sh7785lcr
+++ b/debian/config/sh4/config.sh7785lcr
@@ -8,11 +8,6 @@ CONFIG_SH_PCLK_FREQ=50000000
 CONFIG_PCI=y
 
 ##
-## file: arch/sh/boards/Kconfig
-##
-CONFIG_SH_SH7785LCR=y
-
-##
 ## file: arch/sh/Kconfig.cpu
 ##
 ## choice: Endianness selection
@@ -22,6 +17,11 @@ CONFIG_SH_FPU=y
 CONFIG_SH_STORE_QUEUES=y
 
 ##
+## file: arch/sh/boards/Kconfig
+##
+CONFIG_SH_SH7785LCR=y
+
+##
 ## file: arch/sh/mm/Kconfig
 ##
 CONFIG_MMU=y
@@ -219,4 +219,3 @@ CONFIG_SPARSEMEM_MANUAL=y
 ## end choice
 CONFIG_MIGRATION=y
 CONFIG_DEFAULT_MMAP_MIN_ADDR=4096
-