zygo: config: build in loop dev

(cherry picked from commit 0d72aad8fdc8e66ef3a34eb19485f59ee2c4649c)
(cherry picked from commit 1ac8abe29462fa192ac57032c785cba321088946)

diff --git a/.config b/.config
index 7fbe8f373cd0d119b3342b7e6835f0dd2bd5db5e..c88f33955329747b21a21b8e922c2c5ed02def75 100644 (file)
--- a/.config
+++ b/.config
@@ -2585,8 +2585,12 @@ CONFIG_ZRAM_DEF_COMP_LZORLE=y
 CONFIG_ZRAM_DEF_COMP="lzo-rle"
 CONFIG_ZRAM_WRITEBACK=y
 CONFIG_ZRAM_MEMORY_TRACKING=y
+<<<<<<< HEAD
 CONFIG_BLK_DEV_UMEM=m
 CONFIG_BLK_DEV_LOOP=m
+=======
+CONFIG_BLK_DEV_LOOP=y
+>>>>>>> 0d72aad8fdc8 (zygo: config: build in loop dev)
 CONFIG_BLK_DEV_LOOP_MIN_COUNT=8
 CONFIG_BLK_DEV_CRYPTOLOOP=m
 CONFIG_BLK_DEV_DRBD=m