diff options
author | Thorsten Leemhuis <fedora@leemhuis.info> | 2019-06-04 18:22:55 +0200 |
---|---|---|
committer | Thorsten Leemhuis <fedora@leemhuis.info> | 2019-06-04 18:24:19 +0200 |
commit | 31b649130cf547a67225eef670909b9857e942cf (patch) | |
tree | e258b0516eec15da1b4490315a162f172cca744a /kernel-s390x.config | |
parent | e7ecb81cd06dcbfc053dd563d22fea0ee382aad9 (diff) | |
parent | df15d2b71a4373c57da73a58848ef607d25611a1 (diff) | |
download | kernel-31b649130cf547a67225eef670909b9857e942cf.tar.gz kernel-31b649130cf547a67225eef670909b9857e942cf.tar.xz kernel-31b649130cf547a67225eef670909b9857e942cf.zip |
merge masterkernel-5.2.0-0.rc3.git1.1.vanilla.knurd.1.fc31kernel-5.2.0-0.rc3.git1.1.vanilla.knurd.1.fc30kernel-5.2.0-0.rc3.git1.1.vanilla.knurd.1.fc29
Diffstat (limited to 'kernel-s390x.config')
-rw-r--r-- | kernel-s390x.config | 23 |
1 files changed, 0 insertions, 23 deletions
diff --git a/kernel-s390x.config b/kernel-s390x.config index 1eb9e2e4a..37ddf0387 100644 --- a/kernel-s390x.config +++ b/kernel-s390x.config @@ -324,7 +324,6 @@ CONFIG_BACKLIGHT_ARCXCNN=m CONFIG_BACKLIGHT_CLASS_DEVICE=m # CONFIG_BACKLIGHT_GENERIC is not set # CONFIG_BACKLIGHT_GPIO is not set -CONFIG_BACKLIGHT_LCD_SUPPORT=y # CONFIG_BACKLIGHT_LM3630A is not set # CONFIG_BACKLIGHT_LM3639 is not set CONFIG_BACKLIGHT_LP855X=m @@ -679,7 +678,6 @@ CONFIG_CGROUPS=y # CONFIG_CHARGER_ISP1704 is not set # CONFIG_CHARGER_LP8727 is not set CONFIG_CHARGER_LT3651=m -# CONFIG_CHARGER_LTC3651 is not set # CONFIG_CHARGER_MANAGER is not set CONFIG_CHARGER_MAX77650=m # CONFIG_CHARGER_MAX8903 is not set @@ -690,8 +688,6 @@ CONFIG_CHARGER_UCS1002=m CONFIG_CHARLCD_BL_FLASH=y # CONFIG_CHARLCD_BL_OFF is not set # CONFIG_CHARLCD_BL_ON is not set -# CONFIG_CHASH_SELFTEST is not set -# CONFIG_CHASH_STATS is not set CONFIG_CHECKPOINT_RESTORE=y CONFIG_CHELSIO_IPSEC_INLINE=y CONFIG_CHELSIO_T1_1G=y @@ -1006,7 +1002,6 @@ CONFIG_DEBUG_OBJECTS_ENABLE_DEFAULT=1 # CONFIG_DEBUG_PAGE_REF is not set # CONFIG_DEBUG_PER_CPU_MAPS is not set # CONFIG_DEBUG_PERF_USE_VMALLOC is not set -# CONFIG_DEBUG_PI_LIST is not set # CONFIG_DEBUG_PINCTRL is not set # CONFIG_DEBUG_PLIST is not set CONFIG_DEBUG_RODATA_TEST=y @@ -1433,7 +1428,6 @@ CONFIG_FB_VESA=y CONFIG_FB_VIRTUAL=m # CONFIG_FB_VOODOO1 is not set # CONFIG_FB_VT8623 is not set -CONFIG_FCOE_FNIC=m # CONFIG_FCOE is not set # CONFIG_FDDI is not set # CONFIG_FEALNX is not set @@ -1977,10 +1971,6 @@ CONFIG_INET6_AH=m CONFIG_INET6_ESP=m CONFIG_INET6_ESP_OFFLOAD=m CONFIG_INET6_IPCOMP=m -CONFIG_INET6_XFRM_MODE_BEET=m -CONFIG_INET6_XFRM_MODE_ROUTEOPTIMIZATION=m -CONFIG_INET6_XFRM_MODE_TRANSPORT=m -CONFIG_INET6_XFRM_MODE_TUNNEL=m CONFIG_INET_AH=m CONFIG_INET_DIAG_DESTROY=y CONFIG_INET_DIAG=m @@ -1990,9 +1980,6 @@ CONFIG_INET_IPCOMP=m CONFIG_INET_RAW_DIAG=m CONFIG_INET_TUNNEL=m CONFIG_INET_UDP_DIAG=m -CONFIG_INET_XFRM_MODE_BEET=m -CONFIG_INET_XFRM_MODE_TRANSPORT=m -CONFIG_INET_XFRM_MODE_TUNNEL=m CONFIG_INET=y CONFIG_INFINIBAND_ADDR_TRANS=y # CONFIG_INFINIBAND_BNXT_RE is not set @@ -3048,13 +3035,11 @@ CONFIG_MTD_MAP_BANK_WIDTH_4=y # CONFIG_MTD_NAND_DENALI_DT is not set # CONFIG_MTD_NAND_DENALI_PCI is not set # CONFIG_MTD_NAND_DISKONCHIP is not set -# CONFIG_MTD_NAND_ECC_BCH is not set # CONFIG_MTD_NAND_ECC_SW_BCH is not set # CONFIG_MTD_NAND_ECC_SW_HAMMING_SMC is not set # CONFIG_MTD_NAND_FSL_IFC is not set # CONFIG_MTD_NAND_GPIO is not set # CONFIG_MTD_NAND_HISI504 is not set -# CONFIG_MTD_NAND is not set # CONFIG_MTD_NAND_MESON is not set # CONFIG_MTD_NAND_MXC is not set # CONFIG_MTD_NAND_NANDSIM is not set @@ -3086,7 +3071,6 @@ CONFIG_MTD_UBI_BEB_LIMIT=20 # CONFIG_MTD_UBI_GLUEBI is not set CONFIG_MTD_UBI=m CONFIG_MTD_UBI_WL_THRESHOLD=4096 -# CONFIG_MTK_MMC is not set CONFIG_MULTIPLEXER=m CONFIG_MUX_ADG792A=m # CONFIG_MUX_ADGS1408 is not set @@ -3158,7 +3142,6 @@ CONFIG_NET_DEVLINK=y CONFIG_NET_DROP_MONITOR=y CONFIG_NET_DSA_BCM_SF2=m # CONFIG_NET_DSA_LANTIQ_GSWIP is not set -# CONFIG_NET_DSA_LEGACY is not set CONFIG_NET_DSA_LOOP=m CONFIG_NET_DSA=m CONFIG_NET_DSA_MICROCHIP_KSZ9477=m @@ -3514,8 +3497,6 @@ CONFIG_NF_TABLES=m CONFIG_NF_TABLES_NETDEV=y CONFIG_NF_TABLES_SET=m CONFIG_NFT_BRIDGE_REJECT=m -CONFIG_NFT_CHAIN_ROUTE_IPV4=m -CONFIG_NFT_CHAIN_ROUTE_IPV6=m CONFIG_NFT_COMPAT=m # CONFIG_NFT_CONNLIMIT is not set CONFIG_NFT_COUNTER=m @@ -4003,7 +3984,6 @@ CONFIG_R6040=m CONFIG_R8169=m # CONFIG_R8188EU is not set CONFIG_R8712U=m -CONFIG_R8822BE=m CONFIG_RADIO_ADAPTERS=y CONFIG_RADIO_MAXIRADIO=m CONFIG_RADIO_SAA7706H=m @@ -4409,7 +4389,6 @@ CONFIG_SCSI_IPR_DUMP=y CONFIG_SCSI_IPR=m CONFIG_SCSI_IPR_TRACE=y # CONFIG_SCSI_IPS is not set -CONFIG_SCSI_ISCI=m CONFIG_SCSI_ISCSI_ATTRS=m CONFIG_SCSI_LOGGING=y # CONFIG_SCSI_LOWLEVEL_PCMCIA is not set @@ -5447,7 +5426,6 @@ CONFIG_TRACE_EVAL_MAP_FILE=y # CONFIG_TRACER_SNAPSHOT_PER_CPU_SWAP is not set CONFIG_TRACER_SNAPSHOT=y # CONFIG_TRACE_SINK is not set -# CONFIG_TRACING_EVENTS_GPIO is not set # CONFIG_TRANSPARENT_HUGEPAGE_ALWAYS is not set # CONFIG_TRANSPARENT_HUGEPAGE is not set CONFIG_TRUSTED_KEYS=m @@ -5964,7 +5942,6 @@ CONFIG_VIDEO_USBVISION=m CONFIG_VIDEO_V4L2=m CONFIG_VIDEO_V4L2_SUBDEV_API=y # CONFIG_VIDEO_XILINX is not set -# CONFIG_VIDEO_ZORAN is not set # CONFIG_VIPERBOARD_ADC is not set # CONFIG_VIRT_CPU_ACCOUNTING_GEN is not set CONFIG_VIRT_CPU_ACCOUNTING_NATIVE=y |