>>>>> "Thomas" == Thomas Petazzoni <thomas.petazzoni at free-electrons.com> writes: Hi, > Peter: this means you will get a conflict when merging back next into > master, but it is trivial to resolve (hash file conflict and > <pkg>_VERSION conflict). Yes, no problem - Thanks for handling the patch! -- Bye, Peter Korsgaard