Hi Tomi, On Tue, 9 Apr 2013 13:10:45 +0300 Tomi Valkeinen <[email protected]> wrote: > > I wonder what I should do about this conflict. Both the fix in Linus' > tree and the new code come from fbdev tree (I'm currently handling fbdev > patches), and it feels a bit silly to have conflicts between the fixes > and new commits from the same subsystem tree.
Since you really should have that fix in your -next branch as well (for
testing), I would merge the same branch that Linus merged i.e. I would
merge commit 090da752cdd6 ("video:uvesafb: Fix dereference NULL pointer
code path") since that is already in your tree (presumably as a separate
branch or tag). I would also put a comment in the merge commit itself
explaining why you did it.
> I could just leave the conflict be, or I could merge the fix into the
> fbdev-next branch. Do you know if there's a rule of thumb I should
> follow here?
The normal rule is to leave it to me and Linus, but since both sides of
the conflict came your own tree, I think the above makes more sense.
[cc'd Linus for any conflicting opinion]
--
Cheers,
Stephen Rothwell [email protected]
pgpDaocHi5lRS.pgp
Description: PGP signature
