On Tue, Mar 12, 2013 at 4:12 AM, Jason Cooper <[email protected]> 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 <[email protected]> > > Same here, > > Acked-by: Jason Cooper <[email protected]>
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 -- To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to [email protected] More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/
