Comment 7 for bug 2045387

You should preserve the origin author of the driver, so you need to use cherry-pick to backport the commit. Then you can add you modification and generate another patch. So, yes, in this case you will generate 2 patches.
I encountered the Makefile conflict while cherry-picking the f81604 driver, it's fine that you didn't encounter that, maybe we just use different codebase.