linux-kernel - Re: linux-next: manual merge of the pm 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]

Message-ID: <2220221.lsImPz8V5G@vostro.rjw.lan>
Date:	Wed, 03 Dec 2014 02:45:35 +0100
From:	"Rafael J. Wysocki" <rjw@...ysocki.net>
To:	Stephen Rothwell <sfr@...b.auug.org.au>
Cc:	Russell King <linux@....linux.org.uk>, linux-next@...r.kernel.org,
	linux-kernel@...r.kernel.org,
	Krzysztof Kozlowski <k.kozlowski@...sung.com>
Subject: Re: linux-next: manual merge of the pm tree with the arm tree

On Wednesday, December 03, 2014 12:12:35 PM Stephen Rothwell wrote:
> Hi Rafael,

Hi,

> Today's linux-next merge of the pm tree got a conflict in
> include/linux/pm_runtime.h between commit 3fb1581ea1ab ("ARM: 8199/1:
> PM / Runtime: Add getter for querying the IRQ safe option v12") from
> the arm tree and commit 6d14dd40f550 ("PM: Drop CONFIG_PM_RUNTIME from
> the driver core") from the pm tree.
> 
> I fixed it up (see below) and can carry the fix as necessary (no action
> is required).

Looks OK to me, thanks!

Download attachment "signature.asc" of type "application/pgp-signature" (837 bytes)