From: Krzysztof Kozlowski <k.kozlowski@samsung.com>
To: Stephen Rothwell <sfr@canb.auug.org.au>
Cc: Vinod Koul <vinod.koul@intel.com>,
Russell King <linux@arm.linux.org.uk>,
linux-next@vger.kernel.org, linux-kernel@vger.kernel.org,
Maxime Ripard <maxime.ripard@free-electrons.com>
Subject: Re: linux-next: manual merge of the slave-dma tree with the arm tree
Date: Tue, 09 Dec 2014 14:38:48 +0100 [thread overview]
Message-ID: <1418132328.19339.9.camel@AMDC1943> (raw)
In-Reply-To: <20141209140901.685bb382@canb.auug.org.au>
On wto, 2014-12-09 at 14:09 +1100, Stephen Rothwell wrote:
> Hi Vinod,
>
> Today's linux-next merge of the slave-dma tree got a conflict in
> drivers/dma/pl330.c between commits ae43b3289186 ("ARM: 8202/1:
> dmaengine: pl330: Add runtime Power Management support v12") and
> b816ccc5c01f ("ARM: 8206/1: dmaengine: pl330: Add PM sleep support")
> from the arm tree and commits 86e15941d3f5 ("dmaengine: pl330: Split
> device_control") and c9a09dacf851 ("dmaengine: pl330: Declare slave
> capabilities for the generic code") from the slave-dma tree.
>
> I fixed it up (hopefully - see below) and can carry the fix as
> necessary (no action is required).
Looks almost good:
++ pm_runtime_mark_last_busy(pl330->ddma.dev);
++ pm_runtime_put_autosuspend(pl330->ddma.dev);1
^here
However I am looking current next (fetched few minutes ago and the one
visible through gitweb) and I can see only mi changes (related to PM
runtime). It looks like slave-dma changes got lost on the way.
Best regards,
Krzysztof
next prev parent reply other threads:[~2014-12-09 13:38 UTC|newest]
Thread overview: 5+ messages / expand[flat|nested] mbox.gz Atom feed top
2014-12-09 3:09 linux-next: manual merge of the slave-dma tree with the arm tree Stephen Rothwell
2014-12-09 13:38 ` Krzysztof Kozlowski [this message]
2014-12-09 14:08 ` Stephen Rothwell
-- strict thread matches above, loose matches on Subject: below --
2012-07-02 3:16 Stephen Rothwell
2012-07-13 3:09 ` Vinod Koul
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=1418132328.19339.9.camel@AMDC1943 \
--to=k.kozlowski@samsung.com \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-next@vger.kernel.org \
--cc=linux@arm.linux.org.uk \
--cc=maxime.ripard@free-electrons.com \
--cc=sfr@canb.auug.org.au \
--cc=vinod.koul@intel.com \
/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