@jdm @Ms2ger
Use git's path stripping when upstreaming patches.
d9baadd