[<prev] [next>] [<thread-prev] [thread-next>] [day] [month] [year] [list]
Message-ID: <20140526134052.GA3790@lukather>
Date:	Mon, 26 May 2014 15:40:52 +0200
From:	Maxime Ripard <maxime.ripard@...e-electrons.com>
To:	Daniel Lezcano <daniel.lezcano@...aro.org>,
	Philipp Zabel <p.zabel@...gutronix.de>
Cc:	Stephen Rothwell <sfr@...b.auug.org.au>,
	Thomas Gleixner <tglx@...utronix.de>,
	Ingo Molnar <mingo@...nel.org>,
	Laurent Pinchart <laurent.pinchart+renesas@...asonboard.com>,
	Jingoo Han <jg1.han@...sung.com>,
	Matthew Leach <matthew.leach@....com>,
	Stephen Boyd <sboyd@...eaurora.org>,
	Uwe Kleine-König 
	<u.kleine-koenig@...gutronix.de>,
	Xiubo Li <Li.Xiubo@...escale.com>,
	"Yang,Wei" <Wei.Yang@...driver.com>,
	Linux Kernel Mailing List <linux-kernel@...r.kernel.org>,
	"linux-arm-kernel@...ts.infradead.org" 
	<linux-arm-kernel@...ts.infradead.org>,
	Olof Johansson <olof@...om.net>, Arnd Bergmann <arnd@...db.de>,
	khilman@...aro.org
Subject: Re: [GIT PULL] clockevents: new material for 3.16
On Mon, May 26, 2014 at 11:52:25AM +0200, Daniel Lezcano wrote:
> On 05/26/2014 11:45 AM, Stephen Rothwell wrote:
> >Hi all,
> >
> >On Fri, 23 May 2014 12:22:04 +0200 Daniel Lezcano <daniel.lezcano@...aro.org> wrote:
> >>
> >>        clocksource: sun5i: Add support for reset controller
> >
> >This commit caused a build failure on arm in linux-next today ...
It's weird... of_reset_control_get has been merged in 3.15 by this
commit fc0a5921561c71be2c334a335c1680f7930434d7 ("reset: Add
of_reset_control_get"), and then the commit
b424080a9e086e683ad5fdc624a7cf3c024e0c0f ("reset: Add optional resets
and stubs") removed it, still in 3.15 (probably a mismerge).
Finally, Hans de Goede introduced it back in the following patch:
http://lists.infradead.org/pipermail/linux-arm-kernel/2014-April/246738.html
That should have shown up in one of 3.15-rc's according to:
http://lists.infradead.org/pipermail/linux-arm-kernel/2014-April/252317.html
Philipp, what's going on?
Maxime
-- 
Maxime Ripard, Free Electrons
Embedded Linux, Kernel and Android engineering
http://free-electrons.com
Download attachment "signature.asc" of type "application/pgp-signature" (820 bytes)
Powered by blists - more mailing lists
 
