From: Takashi Iwai <tiwai@suse•de>
To: Ingo Molnar <mingo@elte•hu>
Cc: Stephen Rothwell <sfr@canb•auug.org.au>,
linux-next@vger•kernel.org, Peter Zijlstra <peterz@infradead•org>
Subject: Re: linux-next: sound tree build failure
Date: Wed, 17 Dec 2008 08:38:09 +0100 [thread overview]
Message-ID: <s5habavfdzy.wl%tiwai@suse.de> (raw)
In-Reply-To: <20081216205900.GI14787@elte.hu>
At Tue, 16 Dec 2008 21:59:00 +0100,
Ingo Molnar wrote:
>
>
> * Takashi Iwai <tiwai@suse•de> wrote:
>
> > At Mon, 15 Dec 2008 15:43:01 +1100,
> > Stephen Rothwell wrote:
> > >
> > > Hi Takashi,
> > >
> > > 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)
> > >
> > > An interaction between commit bbaf5e97337287479eb78dbc3822d9560bbfd2e2
> > > ("ALSA: Add hrtimer backend for ALSA timer interface") from the sound
> > > tree and commit ca109491f612aab5c8152207631c0444f63da97f ("hrtimer:
> > > removing all ur callback modes") from the timers tree.
> > >
> > > I have added the below fixup for the merge and can carry it as necessary.
> >
> > Thanks, the fix must be correct.
> >
> > I'm not sure what I should do. Putting this fix only for linux-next
> > might be a fix, but this wouldn't work if the affecting patch is changed
> > or dropped.
> >
> > If you can keep this one-liner in your tree, it'd be helpful.
>
> if it becomes a logistical problem, there's a Git approach to resolving
> this: we are keeping those bits separate in tip/timers/hrtimers, so you
> could pull that into the sound tree. Your sound tree would be fully
> combinable in linux-next.
Yes, that'll work. I merged your branch now and created a new branch,
topic/hrtimer-fix, with the conflict and build fixes on sound git
tree. Let's see whether it goes well tomorrow :)
FYI, the hrtimer-related topics on sound git tree
git://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound-2.6.git
are:
topic/snd-hrtimer
topic/pcsp-fix
Thanks,
Takashi
next prev parent reply other threads:[~2008-12-17 7:38 UTC|newest]
Thread overview: 70+ messages / expand[flat|nested] mbox.gz Atom feed top
2008-12-15 4:43 linux-next: sound tree build failure Stephen Rothwell
2008-12-15 7:36 ` Takashi Iwai
2008-12-16 20:59 ` Ingo Molnar
2008-12-17 7:38 ` Takashi Iwai [this message]
-- strict thread matches above, loose matches on Subject: below --
2010-02-02 1:47 Stephen Rothwell
2010-02-02 7:27 ` Takashi Iwai
2010-02-02 10:31 ` Mark Brown
2010-02-02 10:40 ` Takashi Iwai
2010-02-02 10:42 ` Mark Brown
2010-02-02 10:26 ` Mark Brown
2010-02-02 10:37 ` Stephen Rothwell
2010-02-02 10:58 ` Mark Brown
2010-02-02 11:17 ` Stephen Rothwell
2010-02-02 11:34 ` Mark Brown
2010-02-02 11:55 ` Stephen Rothwell
2010-02-02 12:03 ` Mark Brown
2010-02-02 11:50 ` Liam Girdwood
2010-02-02 12:01 ` Stephen Rothwell
2009-10-12 5:08 Stephen Rothwell
2009-10-12 5:34 ` Takashi Iwai
2009-10-02 1:15 Stephen Rothwell
2009-10-02 5:57 ` Takashi Iwai
2009-10-01 1:19 Stephen Rothwell
2009-10-01 6:45 ` Takashi Iwai
2009-10-01 10:31 ` Stephen Rothwell
2009-08-28 1:23 Stephen Rothwell
2009-08-28 5:37 ` Takashi Iwai
2009-08-28 5:47 ` Stephen Rothwell
2009-07-17 1:29 Stephen Rothwell
2009-07-17 4:56 ` Greg KH
2009-07-17 5:32 ` Stephen Rothwell
2009-07-17 16:27 ` Greg KH
2009-07-17 9:27 ` Takashi Iwai
2009-07-17 9:28 ` Mark Brown
2009-07-17 9:31 ` Takashi Iwai
2009-06-04 7:33 Stephen Rothwell
2009-06-04 8:03 ` Takashi Iwai
2009-06-04 8:08 ` Peter Ujfalusi
2009-06-04 8:54 ` Mark Brown
2009-05-20 14:31 Stephen Rothwell
2009-05-20 14:46 ` Takashi Iwai
2009-05-20 14:59 ` Stephen Rothwell
2009-05-20 15:15 ` Takashi Iwai
2009-03-16 10:39 Stephen Rothwell
2009-03-16 10:41 ` Takashi Iwai
2009-03-16 23:02 ` Stephen Rothwell
2009-03-16 10:59 ` Mark Brown
2009-03-16 23:03 ` Stephen Rothwell
2009-02-26 3:07 Stephen Rothwell
2009-02-26 8:46 ` Takashi Iwai
2009-02-26 10:25 ` Mark Brown
2009-02-26 10:31 ` Takashi Iwai
2009-02-03 3:10 Stephen Rothwell
2009-02-03 5:51 ` Takashi Iwai
2009-02-03 14:48 ` Timur Tabi
2008-12-10 5:23 Stephen Rothwell
2008-12-10 6:53 ` Takashi Iwai
2008-12-10 11:47 ` Mark Brown
2008-11-14 3:56 Stephen Rothwell
2008-11-14 6:32 ` Takashi Iwai
2008-11-14 6:58 ` Stephen Rothwell
2008-11-14 7:07 ` Takashi Iwai
2008-11-14 7:14 ` Takashi Iwai
2008-11-14 7:27 ` Stephen Rothwell
2008-11-14 7:41 ` Takashi Iwai
2008-11-14 7:46 ` Stephen Rothwell
2008-10-31 3:41 Stephen Rothwell
2008-10-31 6:39 ` Takashi Iwai
2008-10-31 20:49 ` Troy Kisky
2008-11-01 9:53 ` Takashi Iwai
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=s5habavfdzy.wl%tiwai@suse.de \
--to=tiwai@suse$(echo .)de \
--cc=linux-next@vger$(echo .)kernel.org \
--cc=mingo@elte$(echo .)hu \
--cc=peterz@infradead$(echo .)org \
--cc=sfr@canb$(echo .)auug.org.au \
/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