diff options
author | Thorsten Leemhuis <fedora@leemhuis.info> | 2019-03-06 18:28:32 +0100 |
---|---|---|
committer | Thorsten Leemhuis <fedora@leemhuis.info> | 2019-03-06 18:28:32 +0100 |
commit | aa3eb4405ab04cc137aeb51229bb7f9105866864 (patch) | |
tree | b9995dc03dff2d38e490d31eee0c59970f950406 /kernel-s390x-debug.config | |
parent | 136dab6ff21e844f0cc8ecc25167ec12c1e16393 (diff) | |
parent | 4997df9dcb663da11fbee9e64d8a742aa9eea1e6 (diff) | |
download | kernel-5.1.0-0.rc0.git2.1.vanilla.knurd.1.fc31.tar.gz kernel-5.1.0-0.rc0.git2.1.vanilla.knurd.1.fc31.tar.xz kernel-5.1.0-0.rc0.git2.1.vanilla.knurd.1.fc31.zip |
Merge remote-tracking branch 'origin/master' into rawhide-user-thl-vanilla-fedorakernel-5.1.0-0.rc0.git2.1.vanilla.knurd.1.fc31kernel-5.1.0-0.rc0.git2.1.vanilla.knurd.1.fc30kernel-5.1.0-0.rc0.git2.1.vanilla.knurd.1.fc29kernel-5.1.0-0.rc0.git2.1.vanilla.knurd.1.fc28
Diffstat (limited to 'kernel-s390x-debug.config')
-rw-r--r-- | kernel-s390x-debug.config | 10 |
1 files changed, 9 insertions, 1 deletions
diff --git a/kernel-s390x-debug.config b/kernel-s390x-debug.config index 3e3c82f81..f59e9d32e 100644 --- a/kernel-s390x-debug.config +++ b/kernel-s390x-debug.config @@ -866,6 +866,7 @@ CONFIG_CRYPTO_LZ4HC=m CONFIG_CRYPTO_LZ4=m CONFIG_CRYPTO_LZO=y # CONFIG_CRYPTO_MANAGER_DISABLE_TESTS is not set +# CONFIG_CRYPTO_MANAGER_EXTRA_TESTS is not set CONFIG_CRYPTO_MANAGER=y CONFIG_CRYPTO_MD4=m CONFIG_CRYPTO_MD5=y @@ -1466,6 +1467,9 @@ CONFIG_FSI_MASTER_HUB=m # CONFIG_FSI_SBEFIFO is not set CONFIG_FSI_SCOM=m # CONFIG_FSL_EDMA is not set +# CONFIG_FSL_ENETC is not set +# CONFIG_FSL_ENETC_PTP_CLOCK is not set +# CONFIG_FSL_ENETC_VF is not set # CONFIG_FSL_PQ_MDIO is not set CONFIG_FS_MBCACHE=y CONFIG_FSNOTIFY=y @@ -2641,6 +2645,7 @@ CONFIG_MDIO_BITBANG=m # CONFIG_MDIO_BUS_MUX_GPIO is not set # CONFIG_MDIO_BUS_MUX is not set # CONFIG_MDIO_BUS_MUX_MMIOREG is not set +# CONFIG_MDIO_BUS_MUX_MULTIPLEXER is not set CONFIG_MDIO_DEVICE=y # CONFIG_MDIO_GPIO is not set # CONFIG_MDIO_HISI_FEMAC is not set @@ -2947,6 +2952,7 @@ CONFIG_MSDOS_PARTITION=y # CONFIG_MSM_GCC_8998 is not set CONFIG_MSPRO_BLOCK=m CONFIG_MT7601U=m +CONFIG_MT7603E=m CONFIG_MT76x0E=m CONFIG_MT76x0U=m CONFIG_MT76x2E=m @@ -3069,7 +3075,7 @@ CONFIG_NETCONSOLE_DYNAMIC=y CONFIG_NETCONSOLE=m CONFIG_NET_CORE=y CONFIG_NETDEVICES=y -CONFIG_NET_DEVLINK=m +CONFIG_NET_DEVLINK=y # CONFIG_NETDEVSIM is not set CONFIG_NET_DROP_MONITOR=y CONFIG_NET_DSA_BCM_SF2=m @@ -3720,6 +3726,7 @@ CONFIG_PHY_CADENCE_SIERRA=m CONFIG_PHYLIB=y CONFIG_PHYLINK=m # CONFIG_PHY_MAPPHONE_MDM6600 is not set +# CONFIG_PHY_MVEBU_A38X_COMPHY is not set # CONFIG_PHY_MVEBU_CP110_COMPHY is not set # CONFIG_PHY_OCELOT_SERDES is not set # CONFIG_PHY_PXA_28NM_HSIC is not set @@ -5947,6 +5954,7 @@ CONFIG_WQ_WATCHDOG=y CONFIG_X86_BOOTPARAM_MEMORY_CORRUPTION_CHECK=y CONFIG_X86_MCELOG_LEGACY=y CONFIG_X86_PTDUMP=y +CONFIG_XDP_SOCKETS_DIAG=m CONFIG_XDP_SOCKETS=y # CONFIG_XEN_GRANT_DMA_ALLOC is not set # CONFIG_XEN_PVCALLS_FRONTEND is not set |