Merge remote-tracking branch 'alioth/master'

debian/config/amd64/config

@@ -204,7 +204,6 @@ CONFIG_FRAME_WARN=2048
 CONFIG_SPARSEMEM_MANUAL=y
 ## end choice
 CONFIG_SPARSEMEM_VMEMMAP=y
-# CONFIG_MOVABLE_NODE is not set
 CONFIG_ZONE_DEVICE=y
 
 ##

debian/config/config

@@ -2684,7 +2684,6 @@ CONFIG_SENSORS_LIS3_I2C=m
 ## file: drivers/mmc/core/Kconfig
 ##
 CONFIG_MMC_BLOCK_MINORS=256
-CONFIG_MMC_BLOCK_BOUNCE=y
 CONFIG_SDIO_UART=m
 # CONFIG_MMC_TEST is not set
 
@@ -3221,7 +3220,7 @@ CONFIG_QEDE=m
 ## file: drivers/net/ethernet/qualcomm/Kconfig
 ##
 CONFIG_NET_VENDOR_QUALCOMM=y
-# CONFIG_QCA7000 is not set
+# CONFIG_QCA7000_SPI is not set
 # CONFIG_QCOM_EMAC is not set
 
 ##
@@ -3902,7 +3901,6 @@ CONFIG_NVDIMM_DAX=y
 ## file: drivers/nvme/host/Kconfig
 ##
 CONFIG_BLK_DEV_NVME=m
-# CONFIG_BLK_DEV_NVME_SCSI is not set
 CONFIG_NVME_RDMA=m
 
 ##
@@ -4026,7 +4024,6 @@ CONFIG_YENTA_TOSHIBA=y
 ##
 CONFIG_ASUS_LAPTOP=m
 CONFIG_FUJITSU_LAPTOP=m
-# CONFIG_FUJITSU_LAPTOP_DEBUG is not set
 CONFIG_HP_WMI=m
 CONFIG_MSI_LAPTOP=m
 CONFIG_PANASONIC_LAPTOP=m
@@ -4953,7 +4950,6 @@ CONFIG_USB_YUREX=m
 # CONFIG_USB_HSIC_USB4604 is not set
 # CONFIG_USB_LINK_LAYER_TEST is not set
 CONFIG_USB_CHAOSKEY=m
-CONFIG_UCSI=m
 
 ##
 ## file: drivers/usb/misc/sisusbvga/Kconfig
@@ -5070,6 +5066,11 @@ CONFIG_USB_STORAGE_CYPRESS_ATACB=m
 CONFIG_USB_STORAGE_ENE_UB6250=m
 CONFIG_USB_UAS=m
 
+##
+## file: drivers/usb/typec/ucsi/Kconfig
+##
+CONFIG_UCSI_ACPI=m
+
 ##
 ## file: drivers/usb/usbip/Kconfig
 ##
@@ -5375,7 +5376,6 @@ CONFIG_CIFS_DEBUG=y
 # CONFIG_CIFS_DEBUG2 is not set
 CONFIG_CIFS_DFS_UPCALL=y
 CONFIG_CIFS_NFSD_EXPORT=y
-CONFIG_CIFS_SMB2=y
 CONFIG_CIFS_FSCACHE=y
 
 ##
@@ -5841,7 +5841,6 @@ CONFIG_TASK_IO_ACCOUNTING=y
 # CONFIG_RCU_EXPERT is not set
 CONFIG_RCU_FANOUT=32
 CONFIG_RCU_FAST_NO_HZ=y
-CONFIG_RCU_KTHREAD_PRIO=0
 # CONFIG_IKCONFIG is not set
 CONFIG_LOG_BUF_SHIFT=17
 CONFIG_LOG_CPU_MAX_BUF_SHIFT=12
@@ -6020,7 +6019,7 @@ CONFIG_DYNAMIC_FTRACE=y
 # CONFIG_TRACEPOINT_BENCHMARK is not set
 # CONFIG_RING_BUFFER_BENCHMARK is not set
 # CONFIG_RING_BUFFER_STARTUP_TEST is not set
-# CONFIG_TRACE_ENUM_MAP_FILE is not set
+# CONFIG_TRACE_EVAL_MAP_FILE is not set
 CONFIG_TRACING_EVENTS_GPIO=y
 
 ##
@@ -6077,7 +6076,8 @@ CONFIG_DEBUG_MEMORY_INIT=y
 CONFIG_MEMORY_NOTIFIER_ERROR_INJECT=m
 # CONFIG_DEBUG_HIGHMEM is not set
 # CONFIG_KCOV is not set
-CONFIG_LOCKUP_DETECTOR=y
+CONFIG_SOFTLOCKUP_DETECTOR=y
+CONFIG_HARDLOCKUP_DETECTOR=y
 # CONFIG_BOOTPARAM_HARDLOCKUP_PANIC is not set
 # CONFIG_BOOTPARAM_SOFTLOCKUP_PANIC is not set
 CONFIG_DETECT_HUNG_TASK=y
@@ -6107,7 +6107,6 @@ CONFIG_DEBUG_LIST=y
 # CONFIG_DEBUG_SG is not set
 # CONFIG_DEBUG_NOTIFIERS is not set
 # CONFIG_DEBUG_CREDENTIALS is not set
-# CONFIG_SPARSE_RCU_POINTER is not set
 # CONFIG_RCU_PERF_TEST is not set
 # CONFIG_RCU_TORTURE_TEST is not set
 CONFIG_RCU_CPU_STALL_TIMEOUT=21

debian/config/hppa/config

@@ -548,7 +548,8 @@ CONFIG_SYSFS_SYSCALL=y
 ## file: lib/Kconfig.debug
 ##
 CONFIG_DEBUG_STACKOVERFLOW=y
-# CONFIG_LOCKUP_DETECTOR is not set
+# CONFIG_SOFTLOCKUP_DETECTOR is not set
+# CONFIG_HARDLOCKUP_DETECTOR is not set
 
 ##
 ## file: mm/Kconfig

debian/config/kernelarch-x86/config

@@ -126,11 +126,6 @@ CONFIG_KVM_INTEL=m
 CONFIG_KVM_AMD=m
 # CONFIG_KVM_MMU_AUDIT is not set
 
-##
-## file: arch/x86/ras/Kconfig
-##
-# CONFIG_MCE_AMD_INJ is not set
-
 ##
 ## file: arch/x86/xen/Kconfig
 ##

debian/config/s390x/config

@@ -114,7 +114,6 @@ CONFIG_DASD_FBA=m
 CONFIG_DASD_DIAG=m
 # CONFIG_DASD_EER is not set
 CONFIG_SCM_BLOCK=m
-CONFIG_SCM_BLOCK_CLUSTER_WRITE=y
 
 ##
 ## file: drivers/s390/char/Kconfig