diff options
| author | Thorsten Leemhuis <fedora@leemhuis.info> | 2020-10-23 06:47:39 +0200 |
|---|---|---|
| committer | Thorsten Leemhuis <fedora@leemhuis.info> | 2020-10-23 06:47:39 +0200 |
| commit | b68976b75474dd67753fb8cb3b50853212d05207 (patch) | |
| tree | c97602401eb5029ff5e0c39b93dd22f82aad55a7 /kernel-s390x-fedora.config | |
| parent | 469f08f37160f604540026f432ca1c40b21f79f2 (diff) | |
| parent | c3c7328894178f97c58afdc7c78101373d869016 (diff) | |
| download | kernel-5.10.0-0.rc0.20201022git96485e446260.51.vanilla.1.fc31.tar.gz kernel-5.10.0-0.rc0.20201022git96485e446260.51.vanilla.1.fc31.tar.xz kernel-5.10.0-0.rc0.20201022git96485e446260.51.vanilla.1.fc31.zip | |
Merge remote-tracking branch 'origin/master' into rawhide-user-thl-vanilla-fedorakernel-5.10.0-0.rc0.20201022git96485e446260.51.vanilla.1.fc34kernel-5.10.0-0.rc0.20201022git96485e446260.51.vanilla.1.fc33kernel-5.10.0-0.rc0.20201022git96485e446260.51.vanilla.1.fc32kernel-5.10.0-0.rc0.20201022git96485e446260.51.vanilla.1.fc31
Diffstat (limited to 'kernel-s390x-fedora.config')
| -rw-r--r-- | kernel-s390x-fedora.config | 10 |
1 files changed, 10 insertions, 0 deletions
diff --git a/kernel-s390x-fedora.config b/kernel-s390x-fedora.config index 7893c4458..9f62505d9 100644 --- a/kernel-s390x-fedora.config +++ b/kernel-s390x-fedora.config @@ -738,6 +738,7 @@ CONFIG_CHARGER_BD99954=m # CONFIG_CHARGER_BQ24735 is not set CONFIG_CHARGER_BQ2515X=m # CONFIG_CHARGER_BQ25890 is not set +# CONFIG_CHARGER_BQ25980 is not set # CONFIG_CHARGER_CROS_USBPD is not set # CONFIG_CHARGER_DETECTOR_MAX14656 is not set # CONFIG_CHARGER_GPIO is not set @@ -1043,6 +1044,7 @@ CONFIG_CRYPTO_XTS=y CONFIG_CRYPTO_XXHASH=y CONFIG_CRYPTO=y CONFIG_CRYPTO_ZSTD=m +# CONFIG_CSD_LOCK_WAIT_DEBUG is not set CONFIG_CTCM=m CONFIG_CUSE=m CONFIG_CW1200=m @@ -1706,6 +1708,7 @@ CONFIG_FTRACE=y CONFIG_FUNCTION_GRAPH_TRACER=y CONFIG_FUNCTION_PROFILER=y CONFIG_FUNCTION_TRACER=y +CONFIG_FUSE_DAX=y CONFIG_FUSE_FS=m CONFIG_FUSION_CTL=m CONFIG_FUSION_FC=m @@ -2052,6 +2055,7 @@ CONFIG_I2C_DIOLAN_U2C=m # CONFIG_I2C_I801 is not set # CONFIG_I2C_ISCH is not set CONFIG_I2C=m +# CONFIG_I2C_MLXBF is not set CONFIG_I2C_MLXCPLD=m # CONFIG_I2C_MUX_GPIO is not set CONFIG_I2C_MUX_GPMUX=m @@ -2079,6 +2083,7 @@ CONFIG_I2C_SI470X=m # CONFIG_I2C_SIS96X is not set CONFIG_I2C_SLAVE_EEPROM=m # CONFIG_I2C_SLAVE is not set +# CONFIG_I2C_SLAVE_TESTUNIT is not set # CONFIG_I2C_SMBUS is not set # CONFIG_I2C_STUB is not set # CONFIG_I2C_TAOS_EVM is not set @@ -4410,6 +4415,7 @@ CONFIG_RCU_CPU_STALL_TIMEOUT=60 CONFIG_RCU_NOCB_CPU=y # CONFIG_RCU_PERF_TEST is not set # CONFIG_RCU_REF_SCALE_TEST is not set +# CONFIG_RCU_SCALE_TEST is not set CONFIG_RCU_TORTURE_TEST=m # CONFIG_RCU_TRACE is not set CONFIG_RC_XBOX_DVD=m @@ -4640,6 +4646,7 @@ CONFIG_RTC_DRV_RS5C372=m CONFIG_RTC_DRV_RV3028=m CONFIG_RTC_DRV_RV3029C2=m CONFIG_RTC_DRV_RV3029_HWMON=y +# CONFIG_RTC_DRV_RV3032 is not set # CONFIG_RTC_DRV_RV8803 is not set CONFIG_RTC_DRV_RX4581=m # CONFIG_RTC_DRV_RX6110 is not set @@ -4742,6 +4749,7 @@ CONFIG_SCD30_CORE=m CONFIG_SCD30_I2C=m CONFIG_SCD30_SERIAL=m # CONFIG_SC_DISPCC_7180 is not set +# CONFIG_SCF_TORTURE_TEST is not set # CONFIG_SC_GPUCC_7180 is not set CONFIG_SCHED_AUTOGROUP=y CONFIG_SCHED_BOOK=y @@ -5677,6 +5685,7 @@ CONFIG_ST_UVIS25_I2C=m CONFIG_ST_UVIS25=m CONFIG_ST_UVIS25_SPI=m # CONFIG_SUN50I_DE2_BUS is not set +# CONFIG_SUN50I_IOMMU is not set CONFIG_SUNDANCE=m # CONFIG_SUNDANCE_MMIO is not set CONFIG_SUNGEM=m @@ -6758,6 +6767,7 @@ CONFIG_XFS_ONLINE_SCRUB=y CONFIG_XFS_POSIX_ACL=y CONFIG_XFS_QUOTA=y # CONFIG_XFS_RT is not set +CONFIG_XFS_SUPPORT_V4=y # CONFIG_XFS_WARN is not set # CONFIG_XIL_AXIS_FIFO is not set # CONFIG_XILINX_AXI_EMAC is not set |