[PATCH 0/2] Make mock-noinline.py work again