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:26:44 +0100 [thread overview]
Message-ID: <1343230004.14051.67.camel@shinybook.infradead.org> (raw)
In-Reply-To: <50100EDC.3010109@keymile.com>
[-- Attachment #1: Type: text/plain, Size: 732 bytes --]
On Wed, 2012-07-25 at 17:21 +0200, Gerlando Falauto wrote:
>
> So could someone please spend a few words on what happened in the meantime?
> To me it looks like the l2-mtd tree got rebased at some point, but I'm
> quite at loss about this whole back-and-forth between trees.
> I'm sure a few words could make my life much easier... :-)
There's no need to worry. The l2-mtd tree is rebased on top of the mtd
tree, and contains patches that Artem thinks I'm likely to accept.
I apply them, sometimes with a few minor changes, or I occasionally
reject them. Sometimes if Artem doesn't *immediately* update his tree
after I push changes to mine, a 'conflict' appears between the two. You
can ignore it.
--
dwmw2
[-- Attachment #2: smime.p7s --]
[-- Type: application/x-pkcs7-signature, Size: 6171 bytes --]
next prev parent reply other threads:[~2012-07-25 15:26 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 [this message]
2012-07-25 15:36 ` Gerlando Falauto
2012-07-25 15:39 ` David Woodhouse
-- 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=1343230004.14051.67.camel@shinybook.infradead.org \
--to=dwmw2@infradead$(echo .)org \
--cc=dedekind1@gmail$(echo .)com \
--cc=gerlando.falauto@keymile$(echo .)com \
--cc=linux-kernel@vger$(echo .)kernel.org \
--cc=linux-next@vger$(echo .)kernel.org \
--cc=sfr@canb$(echo .)auug.org.au \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
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