diff options
author | Thorsten Leemhuis <fedora@leemhuis.info> | 2020-11-02 19:05:01 +0100 |
---|---|---|
committer | Thorsten Leemhuis <fedora@leemhuis.info> | 2020-11-02 19:05:01 +0100 |
commit | 6426ab2a3e20d5301cd3dcbaa421e7a51ef60577 (patch) | |
tree | 8cef5c1e6893f906aafc254c759c90518c0ee370 /kernel-s390x-rhel.config | |
parent | dd4cdad810c53bc8bc34423ca0c66d5ae9d16c1c (diff) | |
parent | c49d88579875e966e2959d09a17f282dc9876324 (diff) | |
download | kernel-6426ab2a3e20d5301cd3dcbaa421e7a51ef60577.tar.gz kernel-6426ab2a3e20d5301cd3dcbaa421e7a51ef60577.tar.xz kernel-6426ab2a3e20d5301cd3dcbaa421e7a51ef60577.zip |
Merge remote-tracking branch 'origin/master' into rawhide-user-thl-vanilla-fedorakernel-5.10.0-0.rc2.62.vanilla.1.fc33kernel-5.10.0-0.rc2.62.vanilla.1.fc32kernel-5.10.0-0.rc2.62.vanilla.1.fc31
Diffstat (limited to 'kernel-s390x-rhel.config')
-rw-r--r-- | kernel-s390x-rhel.config | 63 |
1 files changed, 31 insertions, 32 deletions
diff --git a/kernel-s390x-rhel.config b/kernel-s390x-rhel.config index d8bca96d2..57f6cd40e 100644 --- a/kernel-s390x-rhel.config +++ b/kernel-s390x-rhel.config @@ -192,6 +192,7 @@ CONFIG_ARM64_AMU_EXTN=y CONFIG_ARM64_BTI=y CONFIG_ARM64_E0PD=y CONFIG_ARM64_ERRATUM_1319367=y +CONFIG_ARM64_ERRATUM_1508412=y CONFIG_ARM64_ERRATUM_1530923=y CONFIG_ARM64_ERRATUM_1542419=y CONFIG_ARM64_USE_LSE_ATOMICS=y @@ -3109,7 +3110,7 @@ CONFIG_NEED_MULTIPLE_NODES=y CONFIG_NET_ACT_BPF=m # CONFIG_NET_ACT_CONNMARK is not set CONFIG_NET_ACT_CSUM=m -CONFIG_NET_ACT_CTINFO=m +# CONFIG_NET_ACT_CTINFO is not set CONFIG_NET_ACT_CT=m CONFIG_NET_ACT_GACT=m # CONFIG_NET_ACT_GATE is not set @@ -3117,28 +3118,28 @@ CONFIG_NET_ACT_GACT=m # CONFIG_NET_ACT_IPT is not set CONFIG_NET_ACT_MIRRED=m CONFIG_NET_ACT_MPLS=m -CONFIG_NET_ACT_NAT=m +# CONFIG_NET_ACT_NAT is not set CONFIG_NET_ACT_PEDIT=m CONFIG_NET_ACT_POLICE=m CONFIG_NET_ACT_SAMPLE=m -CONFIG_NET_ACT_SIMP=m +# CONFIG_NET_ACT_SIMP is not set CONFIG_NET_ACT_SKBEDIT=m -CONFIG_NET_ACT_SKBMOD=m +# CONFIG_NET_ACT_SKBMOD is not set CONFIG_NET_ACT_TUNNEL_KEY=m CONFIG_NET_ACT_VLAN=m # CONFIG_NET_CADENCE is not set CONFIG_NET_CLS_ACT=y -CONFIG_NET_CLS_BASIC=m +# CONFIG_NET_CLS_BASIC is not set CONFIG_NET_CLS_BPF=m CONFIG_NET_CLS_CGROUP=y CONFIG_NET_CLS_FLOWER=m CONFIG_NET_CLS_FLOW=m CONFIG_NET_CLS_FW=m CONFIG_NET_CLS_MATCHALL=m -CONFIG_NET_CLS_ROUTE4=m -CONFIG_NET_CLS_RSVP6=m -CONFIG_NET_CLS_RSVP=m -CONFIG_NET_CLS_TCINDEX=m +# CONFIG_NET_CLS_ROUTE4 is not set +# CONFIG_NET_CLS_RSVP6 is not set +# CONFIG_NET_CLS_RSVP is not set +# CONFIG_NET_CLS_TCINDEX is not set CONFIG_NET_CLS_U32=m CONFIG_NET_CLS=y CONFIG_NETCONSOLE_DYNAMIC=y @@ -3149,16 +3150,14 @@ CONFIG_NET_DEVLINK=y CONFIG_NETDEVSIM=m CONFIG_NET_DROP_MONITOR=y # CONFIG_NET_DSA is not set -# CONFIG_NET_EMATCH_CANID is not set -CONFIG_NET_EMATCH_CMP=m -CONFIG_NET_EMATCH_IPSET=m -# CONFIG_NET_EMATCH_IPT is not set -CONFIG_NET_EMATCH_META=m -CONFIG_NET_EMATCH_NBYTE=m -CONFIG_NET_EMATCH_STACK=32 -CONFIG_NET_EMATCH_TEXT=m -CONFIG_NET_EMATCH_U32=m -CONFIG_NET_EMATCH=y +# CONFIG_NET_EMATCH_CMP is not set +# CONFIG_NET_EMATCH_IPSET is not set +# CONFIG_NET_EMATCH is not set +# CONFIG_NET_EMATCH_META is not set +# CONFIG_NET_EMATCH_NBYTE is not set +# CONFIG_NET_EMATCH_STACK is not set +# CONFIG_NET_EMATCH_TEXT is not set +# CONFIG_NET_EMATCH_U32 is not set CONFIG_NET_FAILOVER=m # CONFIG_NET_FC is not set CONFIG_NETFILTER_ADVANCED=y @@ -3265,15 +3264,15 @@ CONFIG_NET_PKTGEN=m CONFIG_NET_POLL_CONTROLLER=y CONFIG_NET_RX_BUSY_POLL=y # CONFIG_NET_SB1000 is not set -CONFIG_NET_SCH_ATM=m +# CONFIG_NET_SCH_ATM is not set CONFIG_NET_SCH_CAKE=m -CONFIG_NET_SCH_CBQ=m +# CONFIG_NET_SCH_CBQ is not set CONFIG_NET_SCH_CBS=m -CONFIG_NET_SCH_CHOKE=m -CONFIG_NET_SCH_CODEL=m +# CONFIG_NET_SCH_CHOKE is not set +# CONFIG_NET_SCH_CODEL is not set CONFIG_NET_SCH_DEFAULT=y -CONFIG_NET_SCH_DRR=m -CONFIG_NET_SCH_DSMARK=m +# CONFIG_NET_SCH_DRR is not set +# CONFIG_NET_SCH_DSMARK is not set CONFIG_NET_SCHED=y CONFIG_NET_SCH_ETF=m CONFIG_NET_SCH_ETS=m @@ -3282,23 +3281,23 @@ CONFIG_NET_SCH_FQ=m # CONFIG_NET_SCH_FQ_PIE is not set CONFIG_NET_SCH_GRED=m CONFIG_NET_SCH_HFSC=m -CONFIG_NET_SCH_HHF=m +# CONFIG_NET_SCH_HHF is not set CONFIG_NET_SCH_HTB=m CONFIG_NET_SCH_INGRESS=m CONFIG_NET_SCH_MQPRIO=m -CONFIG_NET_SCH_MULTIQ=m +# CONFIG_NET_SCH_MULTIQ is not set CONFIG_NET_SCH_NETEM=m -CONFIG_NET_SCH_PIE=m -CONFIG_NET_SCH_PLUG=m +# CONFIG_NET_SCH_PIE is not set +# CONFIG_NET_SCH_PLUG is not set CONFIG_NET_SCH_PRIO=m -CONFIG_NET_SCH_QFQ=m +# CONFIG_NET_SCH_QFQ is not set CONFIG_NET_SCH_RED=m -CONFIG_NET_SCH_SFB=m +# CONFIG_NET_SCH_SFB is not set CONFIG_NET_SCH_SFQ=m # CONFIG_NET_SCH_SKBPRIO is not set CONFIG_NET_SCH_TAPRIO=m CONFIG_NET_SCH_TBF=m -CONFIG_NET_SCH_TEQL=m +# CONFIG_NET_SCH_TEQL is not set CONFIG_NET_SWITCHDEV=y CONFIG_NET_TC_SKB_EXT=y CONFIG_NET_TEAM=m |