diff options
author | Thorsten Leemhuis <fedora@leemhuis.info> | 2017-10-03 10:25:26 +0200 |
---|---|---|
committer | Thorsten Leemhuis <fedora@leemhuis.info> | 2017-10-03 10:25:26 +0200 |
commit | 461ae9c9765c896ea71428af4c4cfa5e466be6a5 (patch) | |
tree | 5ec8151c004b40e2a0800c3bdabd45f27b74bc78 /kernel-s390x-debug.config | |
parent | 2b1c96b22c67343a57481491f8d6f9a2b8a280a7 (diff) | |
parent | 1b6d688c9a535e99e97cb9d5b0d889528d5d11d7 (diff) | |
download | kernel-4.14.0-0.rc3.git0.1.vanilla.knurd.1.fc26.tar.gz kernel-4.14.0-0.rc3.git0.1.vanilla.knurd.1.fc26.tar.xz kernel-4.14.0-0.rc3.git0.1.vanilla.knurd.1.fc26.zip |
Merge remote-tracking branch 'origin/master' into rawhide-user-thl-vanilla-fedorakernel-4.14.0-0.rc3.git0.1.vanilla.knurd.1.fc28kernel-4.14.0-0.rc3.git0.1.vanilla.knurd.1.fc27kernel-4.14.0-0.rc3.git0.1.vanilla.knurd.1.fc26kernel-4.14.0-0.rc3.git0.1.vanilla.knurd.1.fc25
Diffstat (limited to 'kernel-s390x-debug.config')
-rw-r--r-- | kernel-s390x-debug.config | 30 |
1 files changed, 12 insertions, 18 deletions
diff --git a/kernel-s390x-debug.config b/kernel-s390x-debug.config index 9b5f0cc46..917bde643 100644 --- a/kernel-s390x-debug.config +++ b/kernel-s390x-debug.config @@ -182,7 +182,6 @@ CONFIG_ASYNC_RAID6_TEST=m CONFIG_ASYNC_TX_DMA=y CONFIG_AT76C50X_USB=m CONFIG_AT803X_PHY=m -CONFIG_ATA_ACPI=y CONFIG_ATA_BMDMA=y CONFIG_ATA_GENERIC=m CONFIG_ATALK=m @@ -376,7 +375,6 @@ CONFIG_BINFMT_MISC=m CONFIG_BINFMT_SCRIPT=y CONFIG_BLK_CGROUP=y # CONFIG_BLK_CMDLINE_PARSER is not set -# CONFIG_BLK_CPQ_CISS_DA is not set CONFIG_BLK_DEBUG_FS=y # CONFIG_BLK_DEV_3W_XXXX_RAID is not set CONFIG_BLK_DEV_BSGLIB=y @@ -691,7 +689,6 @@ CONFIG_CIFS_STATS=y CONFIG_CIFS_UPCALL=y CONFIG_CIFS_WEAK_PW_HASH=y CONFIG_CIFS_XATTR=y -CONFIG_CISS_SCSI_TAPE=y CONFIG_CLEANCACHE=y # CONFIG_CLK_HSDK is not set # CONFIG_CLK_QORIQ is not set @@ -1525,7 +1522,7 @@ CONFIG_HID_ACRUX=m CONFIG_HID_ALPS=m CONFIG_HID_APPLEIR=m CONFIG_HID_APPLE=m -CONFIG_HID_ASUS=m +# CONFIG_HID_ASUS is not set CONFIG_HID_AUREAL=m CONFIG_HID_BATTERY_STRENGTH=y CONFIG_HID_BELKIN=m @@ -2778,7 +2775,7 @@ CONFIG_MMC_SDRICOH_CS=m # CONFIG_MMC_SPI is not set # CONFIG_MMC_TEST is not set CONFIG_MMC_TIFM_SD=m -CONFIG_MMC_TOSHIBA_PCI=m +# CONFIG_MMC_TOSHIBA_PCI is not set # CONFIG_MMC_USDHI6ROL0 is not set CONFIG_MMC_USHC=m CONFIG_MMC_VIA_SDMMC=m @@ -3480,12 +3477,11 @@ CONFIG_PARMAN=m # CONFIG_PARPORT is not set # CONFIG_PARPORT_PC is not set CONFIG_PARTITION_ADVANCED=y -CONFIG_PATA_ACPI=m CONFIG_PATA_ALI=m CONFIG_PATA_AMD=m -CONFIG_PATA_ARASAN_CF=m +# CONFIG_PATA_ARASAN_CF is not set CONFIG_PATA_ARTOP=m -CONFIG_PATA_ATIIXP=m +# CONFIG_PATA_ATIIXP is not set CONFIG_PATA_ATP867X=m CONFIG_PATA_CMD640_PCI=m CONFIG_PATA_CMD64X=m @@ -3493,7 +3489,7 @@ CONFIG_PATA_CS5520=m CONFIG_PATA_CS5530=m CONFIG_PATA_CS5535=m CONFIG_PATA_CS5536=m -CONFIG_PATA_CYPRESS=m +# CONFIG_PATA_CYPRESS is not set CONFIG_PATA_EFAR=m CONFIG_PATA_HPT366=m CONFIG_PATA_HPT37X=m @@ -3505,27 +3501,27 @@ CONFIG_PATA_IT821X=m CONFIG_PATA_JMICRON=m # CONFIG_PATA_LEGACY is not set CONFIG_PATA_MARVELL=m -CONFIG_PATA_MPIIX=m +# CONFIG_PATA_MPIIX is not set CONFIG_PATA_NETCELL=m CONFIG_PATA_NINJA32=m CONFIG_PATA_NS87410=m CONFIG_PATA_NS87415=m -CONFIG_PATA_OLDPIIX=m +# CONFIG_PATA_OLDPIIX is not set CONFIG_PATA_OPTIDMA=m CONFIG_PATA_OPTI=m CONFIG_PATA_PCMCIA=m CONFIG_PATA_PDC2027X=m CONFIG_PATA_PDC_OLD=m # CONFIG_PATA_RADISYS is not set -CONFIG_PATA_RDC=m +# CONFIG_PATA_RDC is not set # CONFIG_PATA_RZ1000 is not set # CONFIG_PATA_SC1200 is not set -CONFIG_PATA_SCH=m +# CONFIG_PATA_SCH is not set CONFIG_PATA_SERVERWORKS=m CONFIG_PATA_SIL680=m CONFIG_PATA_SIS=m -CONFIG_PATA_TOSHIBA=m -CONFIG_PATA_TRIFLEX=m +# CONFIG_PATA_TOSHIBA is not set +# CONFIG_PATA_TRIFLEX is not set CONFIG_PATA_VIA=m CONFIG_PATA_WINBOND=m # CONFIG_PC104 is not set @@ -4227,7 +4223,6 @@ CONFIG_SENSORS_G762=m CONFIG_SENSORS_GL518SM=m CONFIG_SENSORS_GL520SM=m # CONFIG_SENSORS_GPIO_FAN is not set -CONFIG_SENSORS_HDAPS=m # CONFIG_SENSORS_HIH6130 is not set # CONFIG_SENSORS_HMC5843_I2C is not set # CONFIG_SENSORS_HMC5843 is not set @@ -4826,8 +4821,7 @@ CONFIG_SUNRPC_DEBUG=y CONFIG_SUNRPC_GSS=m CONFIG_SUNRPC=m CONFIG_SUNRPC_XPRT_RDMA=m -CONFIG_SURFACE_3_BUTTON=m -CONFIG_SURFACE3_WMI=m +# CONFIG_SURFACE_3_BUTTON is not set # CONFIG_SUSPEND is not set CONFIG_SWAP=y # CONFIG_SW_SYNC is not set |