From: David Woodhouse <dwmw2@infradead.org>
To: Stephen Rothwell <sfr@canb.auug.org.au>
Cc: Artem Bityutskiy <dedekind1@gmail.com>,
linux-next@vger.kernel.org, linux-kernel@vger.kernel.org,
Sascha Hauer <s.hauer@pengutronix.de>,
Fabio Estevam <fabio.estevam@freescale.com>
Subject: Re: linux-next: manual merge of the l2-mtd tree with Linus' tree
Date: Tue, 29 May 2012 08:42:31 +0100 [thread overview]
Message-ID: <1338277351.11518.141.camel@shinybook.infradead.org> (raw)
In-Reply-To: <20120529124501.38995df01dfaebcbd5f1b869@canb.auug.org.au>
[-- Attachment #1: Type: text/plain, Size: 1135 bytes --]
On Tue, 2012-05-29 at 12:45 +1000, Stephen Rothwell wrote:
> Hi Artem,
>
> On Tue, 29 May 2012 12:33:01 +1000 Stephen Rothwell <sfr@canb.auug.org.au> wrote:
> >
> > This tree (l2-mtd) needs to be updated since most of its patches (but not
> > commits) have been merged into upstream trees. Artem, you and Dave
> > Woodhouse need to discuss your work flow. (Or I just need to remove the
> > l2-mtd tree from linux-next.)
>
> I fact, I screwed up the various merge resolutions that the above mess
> caused, so I just dropped the l2-mtd tree for today. Please fix it up.
That is generally the intention. As discussed when we added the l2-mtd
tree to linux-next, it is operating as my 'patchwork' with Artem's
initial review. So dropping it when it conflicts with the main tree is
what we would expect.
I actually rounded everything up from Artem's tree 2 weeks ago, and
committed it with minor fixes and one rejected patch. Unfortunately,
when 'git push' told me "Everything up-to-date" it was lying, so that
didn't make it onto the *server* until yesterday when I noticed;
apologies for that.
--
dwmw2
[-- Attachment #2: smime.p7s --]
[-- Type: application/x-pkcs7-signature, Size: 6171 bytes --]
next prev parent reply other threads:[~2012-05-29 7:42 UTC|newest]
Thread overview: 13+ messages / expand[flat|nested] mbox.gz Atom feed top
2012-05-29 2:33 linux-next: manual merge of the l2-mtd tree with Linus' tree Stephen Rothwell
2012-05-29 2:38 ` Stephen Rothwell
2012-05-29 2:45 ` Stephen Rothwell
2012-05-29 7:42 ` David Woodhouse [this message]
2012-05-29 8:19 ` Artem Bityutskiy
-- strict thread matches above, loose matches on Subject: below --
2013-03-19 0:19 Stephen Rothwell
2012-12-13 1:37 Stephen Rothwell
2012-12-13 5:38 ` Kumar, Anil
2012-12-13 15:15 ` Murali Karicheri
2012-12-14 13:38 ` Kumar, Anil
2012-01-11 2:38 Stephen Rothwell
2012-01-11 11:15 ` Artem Bityutskiy
2011-12-19 2:57 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=1338277351.11518.141.camel@shinybook.infradead.org \
--to=dwmw2@infradead.org \
--cc=dedekind1@gmail.com \
--cc=fabio.estevam@freescale.com \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-next@vger.kernel.org \
--cc=s.hauer@pengutronix.de \
--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;
as well as URLs for NNTP newsgroup(s).