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] [day] [month] [year] [list]

Message-ID: <20150203182505.421.11849@quantum>
Date:	Tue, 03 Feb 2015 10:25:05 -0800
From:	Mike Turquette <mturquette@...aro.org>
To:	Stephen Rothwell <sfr@...b.auug.org.au>,
	"Olof Johansson" <olof@...om.net>, "Arnd Bergmann" <arnd@...db.de>,
	linux-arm-kernel@...ts.infradead.org
Cc:	linux-next@...r.kernel.org, linux-kernel@...r.kernel.org,
	"Tero Kristo" <t-kristo@...com>, "Tony Lindgren" <tony@...mide.com>
Subject: Re: linux-next: manual merge of the clk tree with the arm-soc tree

Quoting Stephen Rothwell (2015-02-02 21:31:40)
> Hi Mike,
> 
> Today's linux-next merge of the clk tree got a conflict in
> arch/arm/mach-omap2/cclock3xxx_data.c between commit ca662ee7b8a8
> ("ARM: OMAP2+: Remove unused ti81xx platform init code") from the
> arm-soc tree and commit d6540b193719 ("ARM: OMAP3: remove legacy clock
> data") from the clk tree.
> 
> I fixed it up (the latter removed the file, so I did that) and can
> carry the fix as necessary (no action is required).

That is the correct fix.

Thanks,
Mike

> 
> -- 
> Cheers,
> Stephen Rothwell                    sfr@...b.auug.org.au
--
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/