linux-kernel - Re: linux-next: manual merge of the clk tree with the arm-soc 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] [thread-next>] [day] [month] [year] [list]

Message-ID: <CACRpkdbf94QG59pvqcN_grCG_tcpri7JyypZ9ZMu3R=LwvSoXw@mail.gmail.com>
Date:	Mon, 10 Sep 2012 08:24:49 -0700
From:	Linus Walleij <linus.walleij@...aro.org>
To:	Stephen Rothwell <sfr@...b.auug.org.au>
Cc:	Mike Turquette <mturquette@...com>, linux-next@...r.kernel.org,
	linux-kernel@...r.kernel.org, Ulf Hansson <ulf.hansson@...aro.org>,
	Loic PALLARDY <loic.pallardy@...com>,
	Olof Johansson <olof@...om.net>, Arnd Bergmann <arnd@...db.de>,
	linux-arm-kernel@...ts.infradead.org
Subject: Re: linux-next: manual merge of the clk tree with the arm-soc tree

On Mon, Sep 10, 2012 at 8:14 AM, Stephen Rothwell <sfr@...b.auug.org.au> wrote:

> Today's linux-next merge of the clk tree got a conflict in
> arch/arm/mach-ux500/clock.c between commit 79964bcd792f ("ARM: ux500:
> Correct Ux500 family names usage") from the arm-soc tree and commit
> ebc96db7632f ("ARM: ux500: Switch to use common clock framework") from
> the clk tree.
>
> The latter removed the file so I did that - there may be more fixup
> required.

This is the correct solution, thanks!

Yours,
Linus Walleij
--
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/