linux-kernel - Re: linux-next: manual merge of the omap

lists.openwall.net		lists / announce owl-users owl-dev john-users john-dev passwdqc-users yescrypt popa3d-users / oss-security kernel-hardening musl sabotage tlsify passwords / crypt-dev xvendor / Bugtraq Full-Disclosure linux-kernel linux-netdev linux-ext4 linux-hardening linux-cve-announce PHC
Open Source and information security mailing list archives

Hash Suite: Windows password security audit tool. GUI, reports in PDF.

[<prev] [next>] [<thread-prev] [thread-next>] [day] [month] [year] [list]

Date:	Wed, 10 Apr 2013 10:13:17 +1000
From:	Stephen Rothwell <sfr@...b.auug.org.au>
To:	Tomi Valkeinen <tomi.valkeinen@...com>
Cc:	<linux-next@...r.kernel.org>, <linux-kernel@...r.kernel.org>,
	Jingoo Han <jg1.han@...sung.com>,
	Linus <torvalds@...ux-foundation.org>
Subject: Re: linux-next: manual merge of the omap_dss2 tree with Linus' tree

Hi Tomi,

On Tue, 9 Apr 2013 13:10:45 +0300 Tomi Valkeinen <tomi.valkeinen@...com> 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                    sfr@...b.auug.org.au

Content of type "application/pgp-signature" skipped