linux-kernel - Re: linux-next: manual merge of the slave-dma tree with the arm tree

lists.openwall.net		lists / announce owl-users owl-dev john-users john-dev passwdqc-users yescrypt popa3d-users / oss-security kernel-hardening musl sabotage tlsify passwords / crypt-dev xvendor / Bugtraq Full-Disclosure linux-kernel linux-netdev linux-ext4 linux-hardening linux-cve-announce PHC
Open Source and information security mailing list archives

Hash Suite: Windows password security audit tool. GUI, reports in PDF.

[<prev] [next>] [<thread-prev] [day] [month] [year] [list]

Date:	Wed, 10 Dec 2014 01:08:37 +1100
From:	Stephen Rothwell <sfr@...b.auug.org.au>
To:	Krzysztof Kozlowski <k.kozlowski@...sung.com>
Cc:	Vinod Koul <vinod.koul@...el.com>,
	Russell King <linux@....linux.org.uk>,
	linux-next@...r.kernel.org, linux-kernel@...r.kernel.org,
	Maxime Ripard <maxime.ripard@...e-electrons.com>
Subject: Re: linux-next: manual merge of the slave-dma tree with the arm
 tree

Hi Krzysztof,

On Tue, 09 Dec 2014 14:38:48 +0100 Krzysztof Kozlowski <k.kozlowski@...sung.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@...b.auug.org.au

Content of type "application/pgp-signature" skipped