On 29.11.22 10:08, Hans Verkuil wrote:
On 29/11/2022 09:48, David Hildenbrand wrote:
On 28.11.22 23:59, Andrew Morton wrote:
On Mon, 28 Nov 2022 09:18:47 +0100 David Hildenbrand <david@xxxxxxxxxx> wrote:
Less chances of things going wrong that way.
Just mention in the v2 cover letter that the first patch was added to
make it easy to backport that fix without being hampered by merge
conflicts if it was added after your frame_vector.c patch.
Yes, that's the way I would naturally do, it, however, Andrew prefers
delta updates for minor changes.
@Andrew, whatever you prefer!
I'm inclined to let things sit as they are. Cross-tree conflicts
happen, and Linus handles them. I'll flag this (very simple) conflict
in the pull request, if MM merges second. If v4l merges second then
hopefully they will do the same. But this one is so simple that Linus
hardly needs our help.
It's not about cross-tree conflicts, it's about the fact that my patch is
a fix that needs to be backported to older kernels. It should apply cleanly
to those older kernels if my patch goes in first, but if it is the other way
around I would have to make a new patch for the stable kernels.
IIUC, the conflict will be resolved at merge time and the merge
resolution will be part of the merge commit. It doesn't matter in which
order the patches go upstream, the merge commit resolves the problematic
overlap.
So your patch will be upstream as intended, where it can be cleanly
backported.
Hope I am not twisting reality ;)
--
Thanks,
David / dhildenb
