From: Stephen Rothwell <sfr@canb.auug.org.au>
To: Krzysztof Kozlowski <k.kozlowski@samsung.com>
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: Wed, 10 Dec 2014 01:08:37 +1100 [thread overview]
Message-ID: <20141210010837.2f83ed79@canb.auug.org.au> (raw)
In-Reply-To: <1418132328.19339.9.camel@AMDC1943>
[-- Attachment #1: Type: text/plain, Size: 825 bytes --]
Hi Krzysztof,
On Tue, 09 Dec 2014 14:38:48 +0100 Krzysztof Kozlowski <k.kozlowski@samsung.com> wrote:
>
> Looks almost good:
> ++ pm_runtime_mark_last_busy(pl330->ddma.dev);
> ++ pm_runtime_put_autosuspend(pl330->ddma.dev);1
> ^here
Thanks for pointing that out, I have fixed it up for tomorrow.
> 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.
Yeah, the slave-dma tree had another build problem so I used the
version of it from the previous day and so this conflict did not
actually occur today after all.
--
Cheers,
Stephen Rothwell sfr@canb.auug.org.au
[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 819 bytes --]
next prev parent reply other threads:[~2014-12-09 14:08 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
2014-12-09 14:08 ` Stephen Rothwell [this message]
-- 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=20141210010837.2f83ed79@canb.auug.org.au \
--to=sfr@canb.auug.org.au \
--cc=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=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