Can you rebase your patch on master’s HEAD? This should go away then :).