Merge branch 'jk/stable-prio-queue'

* jk/stable-prio-queue:
t5539: update a flaky test
paint_down_to_common: use prio_queue
prio-queue: make output stable with respect to insertion
prio-queue: factor out compare and swap operations

diff --cc commit.c
Simple merge