rebase situation after i did "git rebase origin/master" on configurable-subsystems

gistfile1.txt

* 21bafc4e7 - (HEAD) compile entrypoints, validate and run confprog (5 minutes ago) <Timo Paulssen>
* 80d6bd644 - hook up initial impl of confprog validator & interpreter (9 minutes ago) <Timo Paulssen>
* 85d25935c - WIP on confprogs, start on a parser/compiler (15 minutes ago) <Timo Paulssen>
* 441d77107 - WIP on "confprog" op list changes (29 minutes ago) <Timo Paulssen>
* 92ee9dae7 - confprog: more "junkprint" for debugspam purposes (9 hours ago) <Timo Paulssen>
* f573532fc - count how many frames we didn't enter due to confprog (9 hours ago) <Timo Paulssen>
* fd4e1fd98 - no junk memory reads at end of confprog (9 hours ago) <Timo Paulssen>
* e5a7a47f8 - profiler now considers confprog when entering frames (9 hours ago) <Timo Paulssen>
* c161c26b8 - restore some changes that almost got nuked (9 hours ago) <Timo Paulssen>
* 1a85ced46 - profiler_dynamic and profiler_static example (9 hours ago) <Timo Paulssen>
* 62e120117 - fix 0 literal in confprog parser (9 hours ago) <Timo Paulssen>
* 38ff996a4 - draft support for multi-root call graph (9 hours ago) <Timo Paulssen>
* fd6288aa5 - add heapsnapshot support to confprog (9 hours ago) <Timo Paulssen>
* 687175d70 - add a #define to toggle debugspam from confprog (9 hours ago) <Timo Paulssen>
* c10c8f430 - add more ops to confprog whitelist (9 hours ago) <Timo Paulssen>
* 0b3cb09bb - confprog: add support for "frame" data source (9 hours ago) <Timo Paulssen>
* ced5d5f6e - with lots and lots of hacks, the first useful program! (9 hours ago) <Timo Paulssen>
* 1ee81211d - compile entrypoints, validate and run confprog (9 hours ago) <Timo Paulssen>
* 789db4e23 - hook up initial impl of confprog validator & interpreter (9 hours ago) <Timo Paulssen>
* eda51f6f7 - WIP on confprogs, start on a parser/compiler (9 hours ago) <Timo Paulssen>
* a48b3948f - WIP on "confprog" op list changes (9 hours ago) <Timo Paulssen>
*   e865f43df - (origin/master) Merge pull request #1108 from patzim/no-no-reloc (22 hours ago) <Jonathan Worthington
>
|\  
| * 5f29b094f - Fail when being requested to do a relocatable build and we can't (22 hours ago) <Patrick Böker>
| * b5172363b - Default to doing a non-relocatable build (4 days ago) <Patrick Böker>
| | *   56725b114 - (configurable-subsystems) Merge branch 'configurable-subsystems' of github.com:MoarVM/MoarVM into
 configurable-subsystems (9 hours ago) <Timo Paulssen>
| | |\  
| | | * 7252cb0aa - (origin/configurable-subsystems) restore some changes that almost got nuked (8 days ago) <Timo Pa
ulssen>
| | | * 70042d91a - profiler_dynamic and profiler_static example (8 days ago) <Timo Paulssen>
| | | * 700ac2e64 - fix 0 literal in confprog parser (8 days ago) <Timo Paulssen>
| | | * 36b533914 - draft support for multi-root call graph (8 days ago) <Timo Paulssen>
| | | * a1154bcde - add heapsnapshot support to confprog (8 days ago) <Timo Paulssen>
| | | * 3ec073f6b - add a #define to toggle debugspam from confprog (8 days ago) <Timo Paulssen>
| | | * a75bd02e8 - add more ops to confprog whitelist (8 days ago) <Timo Paulssen>
| | | * 7cb64ae52 - confprog: add support for "frame" data source (2 weeks ago) <Timo Paulssen>
| | | * 498960318 - with lots and lots of hacks, the first useful program! (2 weeks ago) <Timo Paulssen>
| | | * 03759a006 - compile entrypoints, validate and run confprog (2 weeks ago) <Timo Paulssen>
| | | * 4a7f6c23f - hook up initial impl of confprog validator & interpreter (2 weeks ago) <Timo Paulssen>
| | | * 1b4a8b275 - WIP on confprogs, start on a parser/compiler (2 weeks ago) <Timo Paulssen>
| | | * c10a16c28 - WIP on "confprog" op list changes (2 weeks ago) <Timo Paulssen>
| | * | e16a0a4ce - confprog: more "junkprint" for debugspam purposes (3 days ago) <Timo Paulssen>
| | * | b4b9057e6 - count how many frames we didn't enter due to confprog (3 days ago) <Timo Paulssen>
| | * | 24d297f57 - no junk memory reads at end of confprog (3 days ago) <Timo Paulssen>
| | * | 90e4320c9 - profiler now considers confprog when entering frames (3 days ago) <Timo Paulssen>
| | * | a5a0eead6 - restore some changes that almost got nuked (3 days ago) <Timo Paulssen>
| | * | e09746c0e - profiler_dynamic and profiler_static example (3 days ago) <Timo Paulssen>
| | * | c1c4ca29a - fix 0 literal in confprog parser (3 days ago) <Timo Paulssen>
| | * | 76f74ba4d - draft support for multi-root call graph (3 days ago) <Timo Paulssen>
| | * | 0dc0d10c1 - add heapsnapshot support to confprog (3 days ago) <Timo Paulssen>
| | * | 32d402e11 - add a #define to toggle debugspam from confprog (3 days ago) <Timo Paulssen>
| | * | af72d026f - add more ops to confprog whitelist (3 days ago) <Timo Paulssen>
| | * | f2a4a1624 - confprog: add support for "frame" data source (3 days ago) <Timo Paulssen>
| | * | 1a77d63a7 - with lots and lots of hacks, the first useful program! (3 days ago) <Timo Paulssen>
| | * | eca816ee2 - compile entrypoints, validate and run confprog (3 days ago) <Timo Paulssen>
| | * | 93c9afaab - hook up initial impl of confprog validator & interpreter (3 days ago) <Timo Paulssen>
| | * | a38b948e6 - WIP on confprogs, start on a parser/compiler (3 days ago) <Timo Paulssen>
| | * | f00eef94b - WIP on "confprog" op list changes (3 days ago) <Timo Paulssen>
| |/ /  
|/| |   
* | | c20f896f1 - (master) skip numification in mast nodes code (3 days ago) <Timo Paulssen>
* | |   40a98b588 - Merge pull request #1083 from ugexe/patch-17 (3 days ago) <Jonathan Worthington>