[linux] 01/01: Update config for upstream changes

[debian-kernel at lists.debian.org]

This is an automated email from the git hooks/post-receive script.

ukleinek pushed a commit to branch master
in repository linux.

commit 4d7d15c50a239fe55128e95e63615f3ab1a039fb
Author: Uwe Kleine-König <ukleinek at debian.org>
Date:   Mon Sep 11 10:41:28 2017 +0200

    Update config for upstream changes
    
    BLK_DEV_NVME_SCSI removed in 3f7f25a910ed8988b2a87c1ca2bfee6b4fb83ac7
    CIFS_SMB2 removed in 2a38e12053b760a8f5e85030eb89512660077c15
    FUJITSU_LAPTOP_DEBUG removed in eee77da1a7f02fd114288c4c379fed3d2ca4593d
    MCE_AMD_INJ removed in bc8e80d56c1ecb35e65df392d7601d1427d14efe
    MMC_BLOCK_BOUNCE removed in c3dccb74be28a345a2ebcc224e41b774529b8b8f
    QCA7000_SPI renamed in b2f98200c73cf4bd7c26438490b5a137210e9c7d
    RCU_KTHREAD_PRIO removed in f7a10a975036ef9ca957bfe12ab2d4b1a46cccd1
    SCM_BLOCK_CLUSTER_WRITE removed in 94d26bfcf31244d24fddbe7ba5b0dd17f3c32b11
    SPARSE_RCU_POINTER removed in 41a2901e7d220875752a8c870e0b53288a578c20
    TRACE_ENUM_MAP_FILE renamed in 681bec0367c2606b6154060310a2ffa543175980
    UCSI renamed in 8243edf44152c08c3efa1d551fc48605d674ad18
---
 debian/config/config                | 16 +++++++---------
 debian/config/kernelarch-x86/config |  5 -----
 debian/config/s390x/config          |  1 -
 3 files changed, 7 insertions(+), 15 deletions(-)

diff --git a/debian/config/config b/debian/config/config
index 910183f..543bdcd 100644
--- a/debian/config/config
+++ b/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
@@ -5071,6 +5067,11 @@ 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
 ##
 # CONFIG_USBIP_CORE is not set
@@ -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
 
 ##
@@ -6108,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
diff --git a/debian/config/kernelarch-x86/config b/debian/config/kernelarch-x86/config
index 089b5e9..d87073f 100644
--- a/debian/config/kernelarch-x86/config
+++ b/debian/config/kernelarch-x86/config
@@ -127,11 +127,6 @@ 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
 ##
 CONFIG_XEN=y
diff --git a/debian/config/s390x/config b/debian/config/s390x/config
index dedfdab..67fbe18 100644
--- a/debian/config/s390x/config
+++ b/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

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/kernel/linux.git