From: Stephen Rothwell <sfr@canb.auug.org.au>
To: Takashi Iwai <tiwai@suse.de>
Cc: linux-next@vger.kernel.org, Peter Zijlstra <peterz@infradead.org>,
Ingo Molnar <mingo@elte.hu>
Subject: linux-next: manual merge of the sound tree
Date: Mon, 15 Dec 2008 15:25:09 +1100 [thread overview]
Message-ID: <20081215152509.f19ebaeb.sfr@canb.auug.org.au> (raw)
[-- Attachment #1: Type: text/plain, Size: 578 bytes --]
Hi Takashi,
Today's linux-next merge of the sound tree got a conflict in
sound/drivers/pcsp/pcsp.c between commit
ca109491f612aab5c8152207631c0444f63da97f ("hrtimer: removing all ur
callback modes") from the timers tree and commit
8a75f4fb28766878893b4335f4b5743ce9b931fe ("ALSA: pcsp - Use
HRTIMER_CB_IRQSAFE_UNLOCKED") from the sound tree.
The former removed the line that the latter modified. I just removed the
line and can carry this fix as necessary.
--
Cheers,
Stephen Rothwell sfr@canb.auug.org.au
http://www.canb.auug.org.au/~sfr/
[-- Attachment #2: Type: application/pgp-signature, Size: 197 bytes --]
next reply other threads:[~2008-12-15 4:25 UTC|newest]
Thread overview: 12+ messages / expand[flat|nested] mbox.gz Atom feed top
2008-12-15 4:25 Stephen Rothwell [this message]
-- strict thread matches above, loose matches on Subject: below --
2008-09-01 4:20 linux-next: manual merge of the sound tree Stephen Rothwell
2008-09-01 4:36 ` David Miller
2008-09-01 5:53 ` Takashi Iwai
2008-09-01 8:28 ` David Miller
2008-09-01 8:34 ` Takashi Iwai
2008-09-01 9:03 ` Stephen Rothwell
2008-09-01 9:26 ` Takashi Iwai
2008-09-01 9:44 ` David Miller
2008-07-15 5:47 Stephen Rothwell
2008-07-15 6:23 ` Takashi Iwai
2008-07-15 7:15 ` 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=20081215152509.f19ebaeb.sfr@canb.auug.org.au \
--to=sfr@canb.auug.org.au \
--cc=linux-next@vger.kernel.org \
--cc=mingo@elte.hu \
--cc=peterz@infradead.org \
--cc=tiwai@suse.de \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
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