I have some pulls based on rc6, and I prefer to have an explicit backmerge.
Signed-off-by: NDave Airlie <airlied@redhat.com>