It appears as "merged", but it wasn't (bitbucket screw-up).
It was a little broken lately, as I've added some additional functionality, but should be up and running again. I'll update the description after running some basic tests and bringing it up to date with latest code.
gdb.o: In function `gdb_unarm_bkpt':
gdb.c:(.text+0x2ec): undefined reference to `unpatch_memory'
gdb.o: In function `gdb_arm_bkpt':
gdb.c:(.text+0x380): undefined reference to `patch_instruction'
make: *** [magiclantern] Error 1
make: *** [all] Error 2
Did an ugly hack to get it to compile for some lossless compression experiments on the crop_rec_4k branch but thought I'd report it on this PR because it seems to have originated here.
It currently runs just on slave, but we'd like to figure out how to run it on Master too, at some point, as certain features depend on this. So, a tiny step (done after writing the patch manager) was to make sure the master code still builds.