linux-kernel - Re: [GIT PULL] clockevents/clocksource : new material for 3.14

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: <52D3A385.8060504@linaro.org>
Date:	Mon, 13 Jan 2014 09:27:49 +0100
From:	Daniel Lezcano <daniel.lezcano@...aro.org>
To:	Ingo Molnar <mingo@...nel.org>
CC:	Thomas Gleixner <tglx@...utronix.de>,
	Axel Lin <axel.lin@...ics.com>,
	Ezequiel Garcia <ezequiel.garcia@...e-electrons.com>,
	Jingoo Han <jg1.han@...sung.com>,
	Laurent Pinchart <laurent.pinchart+renesas@...asonboard.com>,
	Linus Walleij <linus.walleij@...aro.org>,
	Maxime Ripard <maxime.ripard@...e-electrons.com>,
	Michael Opdenacker <michael.opdenacker@...e-electrons.com>,
	Stephen Boyd <sboyd@...eaurora.org>,
	Linux Kernel Mailing List <linux-kernel@...r.kernel.org>,
	"linux-arm-kernel@...ts.infradead.org" 
	<linux-arm-kernel@...ts.infradead.org>
Subject: Re: [GIT PULL] clockevents/clocksource : new material for 3.14

On 01/12/2014 05:33 PM, Ingo Molnar wrote:

[ ... ]

> Pulled into tip:timers/core, thanks Daniel!
>
> Note that there was a conflict in drivers/clocksource/clksrc-of.c,
> caused by interaction with this commit:
>
>    4c4b053235fa clocksource: clksrc-of: Do not drop unheld reference on device node
>
> I've resolved it, but please double check the end result once I've
> pushed it all out.

Done. The resolution is ok.

Thanks !
   -- Daniel


-- 
  <http://www.linaro.org/> Linaro.org │ Open source software for ARM SoCs

Follow Linaro:  <http://www.facebook.com/pages/Linaro> Facebook |
<http://twitter.com/#!/linaroorg> Twitter |
<http://www.linaro.org/linaro-blog/> Blog

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