linux-kernel - Re: linux-next: manual merge of the tegra 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-prev] [day] [month] [year] [list]

Message-ID: <1439364.TRor6Xo8mg@vostro.rjw.lan>
Date:	Wed, 23 Jan 2013 14:50:19 +0100
From:	"Rafael J. Wysocki" <rjw@...k.pl>
To:	Stephen Rothwell <sfr@...b.auug.org.au>
Cc:	Stephen Warren <swarren@...dia.com>,
	Colin Cross <ccross@...roid.com>,
	Olof Johansson <olof@...om.net>, linux-next@...r.kernel.org,
	linux-kernel@...r.kernel.org,
	Mika Westerberg <mika.westerberg@...ux.intel.com>,
	Heikki Krogerus <heikki.krogerus@...ux.intel.com>,
	Prashant Gaikwad <pgaikwad@...dia.com>
Subject: Re: linux-next: manual merge of the tegra tree with the pm tree

On Wednesday, January 23, 2013 04:33:03 PM Stephen Rothwell wrote:
> Hi all,
> 
> Today's linux-next merge of the tegra tree got a conflict in
> drivers/clk/Makefile between commit bd3bffb544b1 ("clk: x86: add support
> for Lynxpoint LPSS clocks") from the pm tree and commit 82f6b0926514
> ("clk: tegra: add Tegra specific clocks") from the tegra tree.
> 
> I fixed it up (see below) and can carry the fix as necessary (no action
> is required).

Thanks for the notice and please carry the fix.

Rafael


-- 
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/