linux-kernel - linux-next: manual merge of the idle tree with the pm 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-next>] [day] [month] [year] [list]

Message-Id: <20131115122329.1479981f032f0f863c786c84@canb.auug.org.au>
Date:	Fri, 15 Nov 2013 12:23:29 +1100
From:	Stephen Rothwell <sfr@...b.auug.org.au>
To:	Len Brown <lenb@...nel.org>,
	"Rafael J. Wysocki" <rjw@...ysocki.net>
Cc:	linux-next@...r.kernel.org, linux-kernel@...r.kernel.org
Subject: linux-next: manual merge of the idle tree with the pm tree

Hi Len,

Today's linux-next merge of the idle tree got a conflict in
drivers/idle/intel_idle.c between commit fab04b2208dd ("intel_idle:
Support Intel Atom Processor C2000 Product Family") from the pm tree and
commit 0654c50d7a0b ("intel_idle: Support Intel Atom Processor C2000
Product Family") from the idle tree.

I fixed it up (I used the version from the pm tree since it was much
newer) and can carry the fix as necessary (no action is required).

-- 
Cheers,
Stephen Rothwell                    sfr@...b.auug.org.au

Content of type "application/pgp-signature" skipped