From: arnd@arndb•de (Arnd Bergmann)
To: linux-arm-kernel@lists•infradead.org
Subject: [PATCH 0/4] Per device coherent DMA map ops
Date: Mon, 20 Aug 2012 20:06:24 +0000 [thread overview]
Message-ID: <201208202006.24851.arnd@arndb.de> (raw)
In-Reply-To: <50324F9A.5000608@gmail.com>
On Monday 20 August 2012, Rob Herring wrote:
> >
> > I like those patches and I would like to take it to my dma-mapping-next tree, but I wonder
> > how to handle merging of the last patch. Arnd, Olof - could You tell me how to do it? I assume
> > that it should be somehow merged by arm-soc tree, so it depends on the earlier patches.
> > Would it be enough if I take them to the topic branch? Then I can continue works on
> > dma-mapping subsystem by merging that topic branch to my dma-mapping-next and you will
> > also take it as a dependency for highbank patches. Am I right?
> >
>
> I'm fine with it all going in thru your tree. Seems a bit silly to deal
> with tracking the dependencies all for 1 patch. The only possible
> conflict I see is with the dts file and some other SATA related changes
> which will go in via the ata tree. But the merge is trivial and the
> conflict will be there either with your tree or arm-soc.
Right. I see no problem having this patch go through the dma-mapping tree.
Arnd
next prev parent reply other threads:[~2012-08-20 20:06 UTC|newest]
Thread overview: 9+ messages / expand[flat|nested] mbox.gz Atom feed top
2012-08-14 3:49 [PATCH 0/4] Per device coherent DMA map ops Rob Herring
2012-08-14 3:49 ` [PATCH 1/4] ARM: add coherent dma ops Rob Herring
2012-08-14 3:49 ` [PATCH 2/4] ARM: add coherent iommu " Rob Herring
2012-08-14 3:49 ` [PATCH 3/4] ARM: kill off arch_is_coherent Rob Herring
2012-08-14 3:49 ` [PATCH 4/4] ARM: highbank: add coherent DMA setup Rob Herring
2012-08-20 14:16 ` [PATCH 0/4] Per device coherent DMA map ops Marek Szyprowski
2012-08-20 14:54 ` Rob Herring
2012-08-20 20:06 ` Arnd Bergmann [this message]
2012-08-21 14:48 ` Marek Szyprowski
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=201208202006.24851.arnd@arndb.de \
--to=arnd@arndb$(echo .)de \
--cc=linux-arm-kernel@lists$(echo .)infradead.org \
/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