From mboxrd@z Thu Jan 1 00:00:00 1970 From: Olof Johansson Subject: Re: linux-next: manual merge of the akpm tree with the arm-soc tree Date: Tue, 12 Mar 2013 04:37:39 -0700 Message-ID: References: <20130312144714.39749c5b0bd1aea14c4d2ff8@canb.auug.org.au> <20130312062509.GQ21478@lunn.ch> <20130312111246.GD12700@titan.lakedaemon.net> Mime-Version: 1.0 Content-Type: text/plain; charset=ISO-8859-1 Return-path: In-Reply-To: <20130312111246.GD12700@titan.lakedaemon.net> Sender: linux-kernel-owner@vger.kernel.org To: Jason Cooper Cc: Andrew Lunn , Stephen Rothwell , Andrew Morton , linux-next@vger.kernel.org, linux-kernel@vger.kernel.org, Jingoo Han , Arnd Bergmann , linux-arm-kernel@lists.infradead.org List-Id: linux-next.vger.kernel.org On Tue, Mar 12, 2013 at 4:12 AM, Jason Cooper wrote: > On Tue, Mar 12, 2013 at 07:25:09AM +0100, Andrew Lunn wrote: >> On Tue, Mar 12, 2013 at 02:47:14PM +1100, Stephen Rothwell wrote: >> > Hi Andrew, >> > >> > Today's linux-next merge of the akpm tree got a conflict in >> > drivers/rtc/rtc-mv.c between commit 89c58c198b25 ("rtc: rtc-mv: Add >> > support for clk to avoid lockups") from the arm-soc tree and commit "rtc: >> > rtc-mv: use devm_rtc_device_register()" from the akpm tree. >> > >> > I fixed it up (I think - see below) and can carry the fix as necessary >> > (no action is required). >> >> Hi Stephan >> >> Looks O.K. to me. >> >> Acked-by: Andrew Lunn > > Same here, > > Acked-by: Jason Cooper We should make sure that future RTC changes get queued through AKPM and not through us to avoid these kind of conflicts. Same as other driver subsystems.. -Olof