linux-kernel - Re: linux-next: manual merge of the pm tree with the omap 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]

Date:	Mon, 19 Oct 2015 08:16:03 +0100
From:	Marc Zyngier <marc.zyngier@....com>
To:	Stephen Rothwell <sfr@...b.auug.org.au>
Cc:	"Rafael J. Wysocki" <rjw@...ysocki.net>,
	Tony Lindgren <tony@...mide.com>, <linux-next@...r.kernel.org>,
	<linux-kernel@...r.kernel.org>, Felipe Balbi <balbi@...com>
Subject: Re: linux-next: manual merge of the pm tree with the omap tree

On Mon, 19 Oct 2015 11:59:08 +1100
Stephen Rothwell <sfr@...b.auug.org.au> wrote:

Hi Stephen,

> Hi Rafael,
> 
> Today's linux-next merge of the pm tree got a conflict in:
> 
>   arch/arm/mach-omap2/timer.c
> 
> between commits:
> 
>   3afbb9afe2c4 ("arm: omap2: timer: move realtime_counter_init() around")
>   9c46ffcd5214 ("arm: omap2: timer: always call clocksource_of_init() when DT")
> 
> from the omap tree and commit:
> 
>   3722ed2380ad ("clocksource: cosmetic: Drop OF 'dependency' from symbols")
> 
> from the pm tree.
> 
> I fixed it up (see below) and can carry the fix as necessary (no action
> is required).
> 

[...]

Looks great, thanks!

	M.
-- 
Jazz is not dead. It just smells funny.
--
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/