Merge remote-tracking branch 'origin/philip/roller' into naive/roller

pkg/arvo/lib/hood/kiln.hoon

@@ -408,8 +408,6 @@
           .^([rev=@ud @da] %cw /(scot %p our)/[d]/(scot %da now))
       ==
     take-commit:(abed:vats %base)
-  =?  kiln  ?=(^ wef)
-    (bump:vats u.wef (get-unblockers ark.old) force=%.n)
   =.  wef  ~
   abet:kiln
 ::

pkg/base-dev/sur/hood.hoon

@@ -191,7 +191,7 @@
       ==
   ^-  [jolt=(list dude) idle=(list dude)]
   =/  all=(list dude)  (read-bill local)
-  =/  want  (get-apps-want all rein)
+  =/  want  (get-apps-want local all rein)
   =/  have  (get-apps-live local)
   [want (skip have ~(has in (sy want)))]
 ::
@@ -223,9 +223,10 @@
 ::  +get-apps-want: find which apps should be running on a desk
 ::
 ++  get-apps-want
-  |=  [duz=(list dude) =rein]
+  |=  [local=[our=ship =desk now=@da] duz=(list dude) =rein]
   ^-  (list dude)
   ?.  liv.rein  ~
+  ?.  |(=(`zuse+zuse (read-kelvin-local local)) =(%base desk.local))  ~
   =.  duz  (skip duz ~(has in sub.rein))
   =.  duz  (weld duz (skip ~(tap in add.rein) ~(has in (sy duz))))
   duz

pkg/urbit/vere/disk.c

@@ -751,7 +751,7 @@ u3_disk_init(c3_c* pax_c, u3_disk_cb cb_u)
     //  "[..] on 64-bit there is no penalty for making this huge (say 1TB)."
     //
     {
-      #if defined(U3_CPU_aarch64) && defined(U3_OS_linux)
+      #if (defined(U3_CPU_aarch64) && defined(U3_OS_linux)) || defined(U3_OS_mingw)
         const size_t siz_i = 64424509440;
       #else
         const size_t siz_i = 1099511627776;