linux-kernel - Re: linux-next: manual merge of the pm tree with the mips 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: <7356166.EVKMfYyT94@vostro.rjw.lan>
Date:	Thu, 01 May 2014 20:50:18 +0200
From:	"Rafael J. Wysocki" <rjw@...ysocki.net>
To:	Stephen Rothwell <sfr@...b.auug.org.au>
Cc:	Ralf Baechle <ralf@...ux-mips.org>, linux-next@...r.kernel.org,
	linux-kernel@...r.kernel.org, Aaro Koskinen <aaro.koskinen@....fi>,
	Stratos Karafotis <stratosk@...aphore.gr>
Subject: Re: linux-next: manual merge of the pm tree with the mips tree

On Thursday, May 01, 2014 12:09:32 PM Stephen Rothwell wrote:
> 
> --Signature=_Thu__1_May_2014_12_09_32_+1000_d7zY1SkU6vg6nEQn
> Content-Type: text/plain; charset=US-ASCII
> Content-Disposition: inline
> Content-Transfer-Encoding: quoted-printable
> 
> Hi Rafael,
> 
> Today's linux-next merge of the pm tree got a conflict in
> arch/mips/loongson/lemote-2f/clock.c between commit a68ce6507a45
> ("MIPS/loongson2_cpufreq: Fix CPU clock rate setting") from the mips tree
> and commit 4966ee4037fe ("mips: lemote 2f: Use cpufreq_for_each_entry
> macro for iteration") from the pm tree.
> 
> I fixed it up (see below) and can carry the fix as necessary (no action
> is required).

Thanks!

-- 
I speak only for myself.
Rafael J. Wysocki, Intel Open Source Technology Center.
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@...r.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/