Embarrasingly I noticed that I need to git add the file when resolving the conflict and manually applying my patch. But then I added the wrong file ... Reported by Thomas Wood. Signed-off-by: Daniel Vetter <daniel.vetter@intel.com>