Re: [PATCH 0/4] Android Alarm Driver Cleanups (for staging-next/3.5)

From: Greg KH
Date: Fri Apr 20 2012 - 19:43:24 EST


On Fri, Apr 20, 2012 at 03:57:05PM -0700, John Stultz wrote:
> On 04/20/2012 03:08 PM, Greg KH wrote:
> >On Fri, Apr 20, 2012 at 12:31:43PM -0700, John Stultz wrote:
> >>Greg: Would you mind applying this set to staging-next for 3.5?
> >It took some messing with (due to some over-eager people fixing spelling
> >mistakes and compiler warnings that you didn't have in your tree), but
> >I've applied these now. Thanks for doing this work.
> >
> >But, as I already said, this patch set produces some big compiler
> >warnings, can you please fix them up before I get nasty messages from
> >the linux-next maintainer?
> Ok. So I manged to trigger the warning at patch 3/4 too. However,
> patch 4/4 resolves it.

Ah, I didn't notice that, you are right, nice.

> The problem is the android alarm driver and the alarmtimer code have
> a naming collision with "struct alarm", and there were some macros
> (see CONFIG_ANDROID_ALARM_OLDDRV_COMPAT in
> staging/android/android_alarm.h before these patches) that allow a
> easier transition over to the new code for out of tree drivers.
>
> Ideally I would have yanked those macros in 3/4 instead of 4/4. But
> after 4/4 is applied the issue should not longer be present (at
> least I've not been able to trigger it)
>
> Do you want me to respin the last two patches?

No, they are both applied now, so all is good, sorry for the noise.

greg k-h
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/