From: Stephen Rothwell <sfr@canb.auug.org.au>
To: Tomi Valkeinen <tomi.valkeinen@ti.com>
Cc: linux-next@vger.kernel.org, linux-kernel@vger.kernel.org,
Jingoo Han <jg1.han@samsung.com>,
Linus <torvalds@linux-foundation.org>
Subject: Re: linux-next: manual merge of the omap_dss2 tree with Linus' tree
Date: Wed, 10 Apr 2013 10:13:17 +1000 [thread overview]
Message-ID: <20130410101317.0fa466659e2376aada964540@canb.auug.org.au> (raw)
In-Reply-To: <5163E925.4060601@ti.com>
[-- Attachment #1: Type: text/plain, Size: 1184 bytes --]
Hi Tomi,
On Tue, 9 Apr 2013 13:10:45 +0300 Tomi Valkeinen <tomi.valkeinen@ti.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@canb.auug.org.au
[-- Attachment #2: Type: application/pgp-signature, Size: 836 bytes --]
next prev parent reply other threads:[~2013-04-10 0:13 UTC|newest]
Thread overview: 7+ messages / expand[flat|nested] mbox.gz Atom feed top
2013-04-08 4:36 linux-next: manual merge of the omap_dss2 tree with Linus' tree Stephen Rothwell
2013-04-09 10:10 ` Tomi Valkeinen
2013-04-10 0:13 ` Stephen Rothwell [this message]
2013-04-10 0:41 ` Linus Torvalds
-- strict thread matches above, loose matches on Subject: below --
2012-11-26 5:22 Stephen Rothwell
2012-11-27 11:24 ` Tomi Valkeinen
2012-09-07 3:29 Stephen Rothwell
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20130410101317.0fa466659e2376aada964540@canb.auug.org.au \
--to=sfr@canb.auug.org.au \
--cc=jg1.han@samsung.com \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-next@vger.kernel.org \
--cc=tomi.valkeinen@ti.com \
--cc=torvalds@linux-foundation.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).