summaryrefslogtreecommitdiff
path: root/profiles/arch
diff options
context:
space:
mode:
Diffstat (limited to 'profiles/arch')
-rw-r--r--profiles/arch/arm64/package.use.mask7
1 files changed, 7 insertions, 0 deletions
diff --git a/profiles/arch/arm64/package.use.mask b/profiles/arch/arm64/package.use.mask
index ae5f9bc1c798..92213a34744d 100644
--- a/profiles/arch/arm64/package.use.mask
+++ b/profiles/arch/arm64/package.use.mask
@@ -1,6 +1,13 @@
# Copyright 1999-2019 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
+<<<<<<< HEAD
+=======
+# Georgy Yakovlev <gyakovlev@gentoo.org> (2019-09-27)
+# some testsuite deps are not keyworded
+sys-fs/zfs test-suite
+
+>>>>>>> next
# Luke Dashjr <luke-jr+gentoobugs@utopios.org> (2019-09-21)
# iasl is keyworded ~arm64
sys-firmware/seabios -debug