Subject: Re: linux-next: timers tree build failure

From: Ingo Molnar <[email-masked]>
Date: Mon, 29 Dec 2008 10:31:25 +0100

* Stephen Rothwell <[email-masked]> wrote:

> Hi all,
> 
> Today's linux-next build (x86_64 allmodconfig) failed like this:
> 
> sound/core/hrtimer.c: In function 'snd_hrtimer_open':
> sound/core/hrtimer.c:60: error: 'struct hrtimer' has no member named 'cb_mode'
> sound/core/hrtimer.c:60: error: 'HRTIMER_CB_IRQSAFE_UNLOCKED' undeclared (first use in this function)
> 
> See below ... the sound tree changes are now in Linus' tree, so this
> needs fixing before the timers tree gets merged.
> 
> I have applied the merge fix below (which is also in the sound tree) to 
> the timers tree for today.

yes, trivial oneliner conflict, i pushed out a new auto-timers-next tree.

	Ingo