From: "Dmitry Eremin-Solenikov" <dbaryshkov@gmail•com>
To: Stephen Rothwell <sfr@canb•auug.org.au>
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 13:11:20 +0300 [thread overview]
Message-ID: <bc64b4640812110211h294707d8ndd58f611152b893d@mail.gmail.com> (raw)
In-Reply-To: <20081211134307.b7ce748d.sfr@canb.auug.org.au>
2008/12/11 Stephen Rothwell <sfr@canb•auug.org.au>:
> Hi David,
>
> Today's linux-next merge of the mtd tree got conflicts in
> arch/arm/mach-pxa/corgi.c, arch/arm/mach-pxa/poodle.c and
> arch/arm/mach-pxa/spitz.c between commits
> 4a9295ccb43ead9ec054d0bd374c992c692b2cf4 ("[ARM] pxa/corgi: add physmap
> mapping for ROM"), 431a2cff07446b0325ec063e5b401ca7c11e0058 ("[ARM]
> pxa/poodle: add physmap mapping for ROM") and
> e5d3bf3c106c0557199076a57800adb85206c1ce ("[ARM] pxa/spitz: add physmap
> mapping for ROM") from the arm tree and commit
> 6af7a8eb1eb2b5a0967fccf61e750b085d60ad48 ("[MTD] sharpsl-nand: move
> registration to board code") from the mtd tree.
>
> They seem to be overlapping changes. Can you guys rationalise this,
> please, as I am in no position to fix these conflicts up.
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?
>
> I have dropped the mtd tree for today.
--
With best wishes
Dmitry
next prev parent reply other threads:[~2008-12-11 10:11 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 [this message]
2008-12-11 10:23 ` Stephen Rothwell
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=bc64b4640812110211h294707d8ndd58f611152b893d@mail.gmail.com \
--to=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 \
--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