From: Takashi Iwai <tiwai@suse•de>
To: Ingo Molnar <mingo@elte•hu>
Cc: Stephen Rothwell <sfr@canb•auug.org.au>,
Thomas Gleixner <tglx@linutronix•de>,
"H. Peter Anvin" <hpa@zytor•com>,
linux-next@vger•kernel.org
Subject: Re: linux-next: timers tree build failure
Date: Wed, 31 Dec 2008 11:57:30 +0100 [thread overview]
Message-ID: <s5h63l0txwl.wl%tiwai@suse.de> (raw)
In-Reply-To: <s5h7i5gtyki.wl%tiwai@suse.de>
At Wed, 31 Dec 2008 11:43:09 +0100,
I wrote:
>
> At Mon, 29 Dec 2008 10:31:25 +0100,
> Ingo Molnar wrote:
> >
> >
> > * Stephen Rothwell <sfr@canb•auug.org.au> 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.
>
> Sorry for late jump-in, as I'm just back from vacation.
>
> The for-next branch of sound.git already includes the fix patch (based
> on tip/timers/hrtimers), so I wonder why a conflict occurred... Is it
> a conflict fix or is your hrtimers branch rebased?
Never mind, I found that Linus already pulled your fix.
Now I'll fix for-next branch on sound.git tree.
thanks,
Takashi
next prev parent reply other threads:[~2008-12-31 10:57 UTC|newest]
Thread overview: 6+ messages / expand[flat|nested] mbox.gz Atom feed top
2008-12-29 2:30 linux-next: timers tree build failure Stephen Rothwell
2008-12-29 9:31 ` Ingo Molnar
2008-12-29 10:14 ` Stephen Rothwell
2008-12-31 10:43 ` Takashi Iwai
2008-12-31 10:57 ` Takashi Iwai [this message]
-- strict thread matches above, loose matches on Subject: below --
2008-10-15 3:31 Stephen Rothwell
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=s5h63l0txwl.wl%tiwai@suse.de \
--to=tiwai@suse$(echo .)de \
--cc=hpa@zytor$(echo .)com \
--cc=linux-next@vger$(echo .)kernel.org \
--cc=mingo@elte$(echo .)hu \
--cc=sfr@canb$(echo .)auug.org.au \
--cc=tglx@linutronix$(echo .)de \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox