diff options
author | Thorsten Leemhuis <fedora@leemhuis.info> | 2019-07-25 18:26:02 +0200 |
---|---|---|
committer | Thorsten Leemhuis <fedora@leemhuis.info> | 2019-07-25 18:26:02 +0200 |
commit | 32580b1878578ea9e4efb4a51b828ff140a20fcd (patch) | |
tree | 0a3936c83dd1e9ddebcf4a3c54b9c6a254ebba7e /kernel-ppc64le.config | |
parent | e2d2b61684be20379a9435c2b0b59b601377b63c (diff) | |
parent | cfda0d83c75aeff85481a0eaf38d52e46b3f68a7 (diff) | |
download | kernel-32580b1878578ea9e4efb4a51b828ff140a20fcd.tar.gz kernel-32580b1878578ea9e4efb4a51b828ff140a20fcd.tar.xz kernel-32580b1878578ea9e4efb4a51b828ff140a20fcd.zip |
Merge remote-tracking branch 'origin/master' into rawhide-user-thl-vanilla-fedorakernel-5.3.0-0.rc1.git3.1.vanilla.knurd.1.fc31kernel-5.3.0-0.rc1.git3.1.vanilla.knurd.1.fc30kernel-5.3.0-0.rc1.git3.1.vanilla.knurd.1.fc29
Diffstat (limited to 'kernel-ppc64le.config')
-rw-r--r-- | kernel-ppc64le.config | 83 |
1 files changed, 4 insertions, 79 deletions
diff --git a/kernel-ppc64le.config b/kernel-ppc64le.config index 2b9eb0614..d1118e8b0 100644 --- a/kernel-ppc64le.config +++ b/kernel-ppc64le.config @@ -188,7 +188,6 @@ CONFIG_AR5523=m # CONFIG_ARCH_KS8695 is not set # CONFIG_ARCH_LPC32XX is not set CONFIG_ARCH_MULTIPLATFORM=y -# CONFIG_ARCH_NETX is not set # CONFIG_ARCH_OMAP1 is not set # CONFIG_ARCH_PXA is not set # CONFIG_ARCH_RPC is not set @@ -695,7 +694,6 @@ CONFIG_CHELSIO_T4_DCB=y # CONFIG_CHELSIO_T4_FCOE is not set CONFIG_CHELSIO_T4=m CONFIG_CHELSIO_T4VF=m -CONFIG_CHR_DEV_OSST=m CONFIG_CHR_DEV_SCH=m CONFIG_CHR_DEV_SG=y CONFIG_CHR_DEV_ST=m @@ -703,7 +701,6 @@ CONFIG_CHR_DEV_ST=m CONFIG_CHROME_PLATFORMS=y CONFIG_CHT_DC_TI_PMIC_OPREGION=y CONFIG_CICADA_PHY=m -CONFIG_CIFS_ACL=y CONFIG_CIFS_ALLOW_INSECURE_LEGACY=y # CONFIG_CIFS_DEBUG2 is not set # CONFIG_CIFS_DEBUG_DUMP_KEYS is not set @@ -763,7 +760,6 @@ CONFIG_COMPACTION=y # CONFIG_COMPAT_BRK is not set # CONFIG_COMPILE_TEST is not set CONFIG_CONFIGFS_FS=y -CONFIG_CONFIG_SUNRPC_DISABLE_INSECURE_ENCTYPES=y CONFIG_CONNECTOR=y CONFIG_CONSOLE_LOGLEVEL_DEFAULT=7 CONFIG_CONSOLE_LOGLEVEL_QUIET=3 @@ -962,9 +958,7 @@ CONFIG_DCB=y CONFIG_DE2104X_DSL=0 CONFIG_DE2104X=m CONFIG_DE4X5=m -CONFIG_DE_AOC=y # CONFIG_DEBUG_ATOMIC_SLEEP is not set -# CONFIG_DEBUG_BLK_CGROUP is not set # CONFIG_DEBUG_BLOCK_EXT_DEVT is not set CONFIG_DEBUG_BOOT_PARAMS=y # CONFIG_DEBUG_CREDENTIALS is not set @@ -1752,40 +1746,6 @@ CONFIG_HID_ZEROPLUS=m CONFIG_HID_ZYDACRON=m CONFIG_HIGH_RES_TIMERS=y # CONFIG_HIPPI is not set -CONFIG_HISAX_16_3=y -CONFIG_HISAX_1TR6=y -CONFIG_HISAX_AVM_A1_CS=m -CONFIG_HISAX_AVM_A1_PCMCIA=y -CONFIG_HISAX_BKM_A4T=y -# CONFIG_HISAX_DEBUG is not set -CONFIG_HISAX_DIEHLDIVA=y -CONFIG_HISAX_ELSA_CS=m -CONFIG_HISAX_ELSA=y -CONFIG_HISAX_ENTERNOW_PCI=y -CONFIG_HISAX_EURO=y -CONFIG_HISAX_FRITZ_PCIPNP=m -CONFIG_HISAX_FRITZPCI=y -CONFIG_HISAX_GAZEL=y -CONFIG_HISAX_HFC4S8S=m -CONFIG_HISAX_HFC_PCI=y -CONFIG_HISAX_HFC_SX=y -# CONFIG_HISAX_HFCUSB is not set -CONFIG_HISAX_MAX_CARDS=8 -CONFIG_HISAX_NETJET_U=y -CONFIG_HISAX_NETJET=y -CONFIG_HISAX_NI1=y -CONFIG_HISAX_NICCY=y -CONFIG_HISAX_NO_KEYPAD=y -CONFIG_HISAX_NO_LLC=y -CONFIG_HISAX_NO_SENDCOMPLETE=y -CONFIG_HISAX_S0BOX=y -CONFIG_HISAX_SCT_QUADRO=y -CONFIG_HISAX_SEDLBAUER_CS=m -CONFIG_HISAX_SEDLBAUER=y -CONFIG_HISAX_ST5481=m -CONFIG_HISAX_TELES_CS=m -CONFIG_HISAX_TELESPCI=y -CONFIG_HISAX_W6692=y CONFIG_HIST_TRIGGERS=y # CONFIG_HMC6352 is not set # CONFIG_HMC_DRV is not set @@ -1991,7 +1951,7 @@ CONFIG_IKHEADERS=m # CONFIG_IMA_APPRAISE is not set # CONFIG_IMA_DEFAULT_HASH_SHA1 is not set CONFIG_IMA_DEFAULT_HASH_SHA256=y -# CONFIG_IMA is not set +CONFIG_IMA_KEXEC=y CONFIG_IMA_KEYRINGS_PERMIT_SIGNED_BY_BUILTIN_OR_SECONDARY=y CONFIG_IMA_LSM_RULES=y CONFIG_IMA_MEASURE_PCR_IDX=10 @@ -2000,6 +1960,7 @@ CONFIG_IMA_READ_POLICY=y # CONFIG_IMA_SIG_TEMPLATE is not set # CONFIG_IMA_TEMPLATE is not set CONFIG_IMA_WRITE_POLICY=y +CONFIG_IMA=y # CONFIG_IMG_ASCII_LCD is not set # CONFIG_INA2XX_ADC is not set CONFIG_INET6_AH=m @@ -2031,8 +1992,6 @@ CONFIG_INFINIBAND_ISER=m CONFIG_INFINIBAND_ISERT=m CONFIG_INFINIBAND=m CONFIG_INFINIBAND_MTHCA=m -# CONFIG_INFINIBAND_NES_DEBUG is not set -CONFIG_INFINIBAND_NES=m CONFIG_INFINIBAND_OCRDMA=m CONFIG_INFINIBAND_ON_DEMAND_PAGING=y CONFIG_INFINIBAND_QEDR=m @@ -2200,7 +2159,6 @@ CONFIG_IP_NF_TARGET_TTL=m CONFIG_IP_PIMSM_V1=y CONFIG_IP_PIMSM_V2=y # CONFIG_IP_PNP is not set -CONFIG_IPPP_FILTER=y CONFIG_IP_ROUTE_MULTIPATH=y CONFIG_IP_ROUTE_VERBOSE=y CONFIG_IP_SCTP=m @@ -2313,28 +2271,7 @@ CONFIG_ISCSI_BOOT_SYSFS=m CONFIG_ISCSI_TARGET_CXGB4=m CONFIG_ISCSI_TARGET=m CONFIG_ISCSI_TCP=m -CONFIG_ISDN_AUDIO=y -CONFIG_ISDN_CAPI_CAPI20=m -CONFIG_ISDN_CAPI_CAPIDRV=m -# CONFIG_ISDN_CAPI_CAPIDRV_VERBOSE is not set -CONFIG_ISDN_CAPI=m -CONFIG_ISDN_CAPI_MIDDLEWARE=y -CONFIG_ISDN_DIVERSION=m -CONFIG_ISDN_DRV_AVMB1_AVM_CS=m -CONFIG_ISDN_DRV_AVMB1_B1PCI=m -CONFIG_ISDN_DRV_AVMB1_B1PCIV4=y -CONFIG_ISDN_DRV_AVMB1_B1PCMCIA=m -CONFIG_ISDN_DRV_AVMB1_C4=m -CONFIG_ISDN_DRV_AVMB1_T1PCI=m -CONFIG_ISDN_DRV_GIGASET=m -CONFIG_ISDN_DRV_HISAX=m -CONFIG_ISDN_I4L=m -CONFIG_ISDN_MPP=y -# CONFIG_ISDN_PPP_BSDCOMP is not set -CONFIG_ISDN_PPP_VJ=y -CONFIG_ISDN_PPP=y -CONFIG_ISDN_TTY_FAX=y -CONFIG_ISDN=y +# CONFIG_ISDN is not set # CONFIG_ISI is not set CONFIG_ISL29003=m CONFIG_ISL29020=m @@ -2911,17 +2848,6 @@ CONFIG_MISC_ALCOR_PCI=m CONFIG_MISC_FILESYSTEMS=y CONFIG_MISC_RTSX_PCI=m CONFIG_MISC_RTSX_USB=m -CONFIG_MISDN_AVMFRITZ=m -CONFIG_MISDN_DSP=m -CONFIG_MISDN_HFCMULTI=m -CONFIG_MISDN_HFCPCI=m -CONFIG_MISDN_HFCUSB=m -CONFIG_MISDN_INFINEON=m -CONFIG_MISDN_L1OIP=m -CONFIG_MISDN=m -CONFIG_MISDN_NETJET=m -CONFIG_MISDN_SPEEDFAX=m -CONFIG_MISDN_W6692=m CONFIG_MKISS=m CONFIG_MLX4_CORE_GEN2=y CONFIG_MLX4_CORE=m @@ -3179,7 +3105,6 @@ CONFIG_NET_CLS_CGROUP=y CONFIG_NET_CLS_FLOWER=m CONFIG_NET_CLS_FLOW=m CONFIG_NET_CLS_FW=m -CONFIG_NET_CLS_IND=y CONFIG_NET_CLS_MATCHALL=m CONFIG_NET_CLS_ROUTE4=m CONFIG_NET_CLS_RSVP6=m @@ -5327,7 +5252,7 @@ CONFIG_TCG_NSC=m # CONFIG_TCG_TIS_ST33ZP24_I2C is not set # CONFIG_TCG_TIS_ST33ZP24_SPI is not set CONFIG_TCG_TIS=y -# CONFIG_TCG_TPM is not set +CONFIG_TCG_TPM=y CONFIG_TCG_VTPM_PROXY=m # CONFIG_TCG_XEN is not set CONFIG_TCM_FC=m |