From: Linus Torvalds <torvalds@linux-foundation.org>
To: Stephen Rothwell <sfr@canb.auug.org.au>
Cc: Tomi Valkeinen <tomi.valkeinen@ti.com>,
linux-next@vger.kernel.org,
Linux Kernel Mailing List <linux-kernel@vger.kernel.org>,
Jingoo Han <jg1.han@samsung.com>
Subject: Re: linux-next: manual merge of the omap_dss2 tree with Linus' tree
Date: Tue, 9 Apr 2013 17:41:00 -0700 [thread overview]
Message-ID: <CA+55aFxDmLtDkWtyn9atBvaqok+X-CHe593Rj8WN92ZA+iyC6Q@mail.gmail.com> (raw)
In-Reply-To: <20130410101317.0fa466659e2376aada964540@canb.auug.org.au>
On Tue, Apr 9, 2013 at 5:13 PM, Stephen Rothwell <sfr@canb.auug.org.au> wrote:
>
> 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'd actually prefer people *not* do this unless they really have to.
Just fixing a merge conflict is not a good enough reason to add
another merge.
If you really really need the particular fix for some other reason (ie
that bug creates real problems for you and you need the bugfix in
order to test all the other development you've done), then yes, doing
the merge is worth it. But just to resolve a merge conflct early? No.
Linus
next prev parent reply other threads:[~2013-04-10 0:41 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
2013-04-10 0:41 ` Linus Torvalds [this message]
-- 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=CA+55aFxDmLtDkWtyn9atBvaqok+X-CHe593Rj8WN92ZA+iyC6Q@mail.gmail.com \
--to=torvalds@linux-foundation.org \
--cc=jg1.han@samsung.com \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-next@vger.kernel.org \
--cc=sfr@canb.auug.org.au \
--cc=tomi.valkeinen@ti.com \
/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).