diff options
author | Thorsten Leemhuis <fedora@leemhuis.info> | 2021-06-07 16:03:55 +0200 |
---|---|---|
committer | Thorsten Leemhuis <fedora@leemhuis.info> | 2021-06-07 16:03:55 +0200 |
commit | fea02dbd16c04b9501a97a2e2ed2eb72fb086c76 (patch) | |
tree | 08ceb43378f200003f99397b208fe6de5d25278d /kernel-aarch64-rhel.config | |
parent | 2f00d5d1307017b0c8fb556f78d14749e9b742db (diff) | |
parent | 4bc3c54f38c58c791541b236f9eb475eac98b8bf (diff) | |
download | kernel-fea02dbd16c04b9501a97a2e2ed2eb72fb086c76.tar.gz kernel-fea02dbd16c04b9501a97a2e2ed2eb72fb086c76.tar.xz kernel-fea02dbd16c04b9501a97a2e2ed2eb72fb086c76.zip |
Merge remote-tracking branch 'origin/rawhide' into rawhide-user-thl-vanilla-fedorakernel-5.13.0-0.rc5.38.vanilla.1.fc35kernel-5.13.0-0.rc5.38.vanilla.1.fc34kernel-5.13.0-0.rc5.38.vanilla.1.fc33
Diffstat (limited to 'kernel-aarch64-rhel.config')
-rw-r--r-- | kernel-aarch64-rhel.config | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/kernel-aarch64-rhel.config b/kernel-aarch64-rhel.config index 219c03f07..b7baf5fda 100644 --- a/kernel-aarch64-rhel.config +++ b/kernel-aarch64-rhel.config @@ -870,7 +870,7 @@ CONFIG_CORESIGHT_SINK_ETBV10=m CONFIG_CORESIGHT_SINK_TPIU=m CONFIG_CORESIGHT_SOURCE_ETM4X=m CONFIG_CORESIGHT_STM=m -# CONFIG_CORESIGHT_TRBE is not set +CONFIG_CORESIGHT_TRBE=m CONFIG_CORTINA_PHY=m # CONFIG_COUNTER is not set # CONFIG_CPU5_WDT is not set @@ -2397,6 +2397,7 @@ CONFIG_IONIC=m CONFIG_IOSCHED_BFQ=y # CONFIG_IOSF_MBI_DEBUG is not set # CONFIG_IO_STRICT_DEVMEM is not set +# CONFIG_IO_URING is not set CONFIG_IP6_NF_FILTER=m CONFIG_IP6_NF_IPTABLES=m CONFIG_IP6_NF_MANGLE=m |