From: David Woodhouse <dwmw2@infradead.org>
To: Gerlando Falauto <gerlando.falauto@keymile.com>
Cc: Stephen Rothwell <sfr@canb.auug.org.au>,
Artem Bityutskiy <dedekind1@gmail.com>,
"linux-next@vger.kernel.org" <linux-next@vger.kernel.org>,
"linux-kernel@vger.kernel.org" <linux-kernel@vger.kernel.org>
Subject: Re: linux-next: manual merge of the l2-mtd tree with the mtd tree
Date: Wed, 25 Jul 2012 16:39:33 +0100 [thread overview]
Message-ID: <1343230773.9295.3.camel@shinybook.infradead.org> (raw)
In-Reply-To: <5010126D.9030205@keymile.com>
[-- Attachment #1: Type: text/plain, Size: 808 bytes --]
On Wed, 2012-07-25 at 17:36 +0200, Gerlando Falauto wrote:
>
> thanks for your explanation.
> So, is it correct to say that any patch contained within l2-mtd (but
> *NOT* within linux-mtd) will eventually be killed? (Or rather,
> *replaced* by the version eventually applied to linux-mtd)?
Usually, yes. It'll either get applied in some form or other to the
linux-mtd tree, or on the infrequent occasions that Artem merges
something that I object to, the author will get an email from me
explaining *why* it wasn't applied.
Sometimes I *do* just pull everything from Artem's tree, but usually I
don't.
> In other words, when you say "Artem updates his tree", it is
> technically a rebase (so his version of a patch actually looks as if
> never existed), right?
Yes.
--
dwmw2
[-- Attachment #2: smime.p7s --]
[-- Type: application/x-pkcs7-signature, Size: 6171 bytes --]
next prev parent reply other threads:[~2012-07-25 15:39 UTC|newest]
Thread overview: 9+ messages / expand[flat|nested] mbox.gz Atom feed top
2012-07-17 1:00 linux-next: manual merge of the l2-mtd tree with the mtd tree Stephen Rothwell
2012-07-25 15:21 ` Gerlando Falauto
2012-07-25 15:26 ` David Woodhouse
2012-07-25 15:36 ` Gerlando Falauto
2012-07-25 15:39 ` David Woodhouse [this message]
-- strict thread matches above, loose matches on Subject: below --
2013-03-15 0:53 Stephen Rothwell
2013-03-15 0:58 Stephen Rothwell
2013-03-15 8:32 ` Artem Bityutskiy
2016-01-05 2:05 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=1343230773.9295.3.camel@shinybook.infradead.org \
--to=dwmw2@infradead.org \
--cc=dedekind1@gmail.com \
--cc=gerlando.falauto@keymile.com \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-next@vger.kernel.org \
--cc=sfr@canb.auug.org.au \
/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