From: Stephen Rothwell <sfr@canb•auug.org.au>
To: Dmitry Eremin-Solenikov <dbaryshkov@gmail•com>
Cc: David Woodhouse <dwmw2@infradead•org>,
linux-next@vger•kernel.org, Eric Miao <eric.miao@marvell•com>,
Russell King <rmk@arm•linux.org.uk>
Subject: Re: linux-next: manual merge of the mtd tree
Date: Thu, 11 Dec 2008 21:23:35 +1100 [thread overview]
Message-ID: <20081211212335.828b902c.sfr@canb.auug.org.au> (raw)
In-Reply-To: <bc64b4640812110211h294707d8ndd58f611152b893d@mail.gmail.com>
[-- Attachment #1: Type: text/plain, Size: 505 bytes --]
Hi Dmitry,
On Thu, 11 Dec 2008 13:11:20 +0300 "Dmitry Eremin-Solenikov" <dbaryshkov@gmail•com> wrote:
>
> Unfortunately those changes are independant, so I don't quite
> understand what to do.
> If you'd prefer, I can provide merged versions of all 3 files, so that
> you can use this
> as merge resolution via git-rerere. Is that suitable for you?
That would be a great help, thanks.
--
Cheers,
Stephen Rothwell sfr@canb•auug.org.au
http://www.canb.auug.org.au/~sfr/
[-- Attachment #2: Type: application/pgp-signature, Size: 197 bytes --]
next prev parent reply other threads:[~2008-12-11 10:23 UTC|newest]
Thread overview: 17+ messages / expand[flat|nested] mbox.gz Atom feed top
2008-12-11 2:43 linux-next: manual merge of the mtd tree Stephen Rothwell
2008-12-11 10:11 ` Dmitry Eremin-Solenikov
2008-12-11 10:23 ` Stephen Rothwell [this message]
2008-12-11 10:32 ` Eric Miao
2008-12-12 10:29 ` Dmitry Eremin-Solenikov
2008-12-12 11:11 ` David Woodhouse
2008-12-12 23:05 ` Stephen Rothwell
2008-12-15 4:15 ` Stephen Rothwell
2009-01-02 2:07 ` Stephen Rothwell
-- strict thread matches above, loose matches on Subject: below --
2008-12-22 6:12 Stephen Rothwell
2008-12-23 4:28 ` Greg KH
2008-11-27 4:15 Stephen Rothwell
2008-11-27 5:25 ` Greg KH
2008-12-10 2:08 ` Stephen Rothwell
2008-12-10 2:27 ` Greg KH
2008-12-10 2:34 ` Stephen Rothwell
2008-12-10 4:04 ` Greg KH
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=20081211212335.828b902c.sfr@canb.auug.org.au \
--to=sfr@canb$(echo .)auug.org.au \
--cc=dbaryshkov@gmail$(echo .)com \
--cc=dwmw2@infradead$(echo .)org \
--cc=eric.miao@marvell$(echo .)com \
--cc=linux-next@vger$(echo .)kernel.org \
--cc=rmk@arm$(echo .)linux.org.uk \
/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