From: David Miller <davem@davemloft.net>
To: sfr@canb.auug.org.au
Cc: tiwai@suse.de, linux-next@vger.kernel.org
Subject: Re: linux-next: manual merge of the sound tree
Date: Sun, 31 Aug 2008 21:36:07 -0700 (PDT) [thread overview]
Message-ID: <20080831.213607.09599119.davem@davemloft.net> (raw)
In-Reply-To: <20080901142030.513d82eb.sfr@canb.auug.org.au>
From: Stephen Rothwell <sfr@canb.auug.org.au>
Date: Mon, 1 Sep 2008 14:20:30 +1000
> Today's linux-next merge of the sound tree got a conflict in
> sound/core/memalloc.c between commit
> 759ee81be6d87c150ea2b300c221b4fec8b5f646 ("alsa: Remove special SBUS
> dma support code.") from the sparc tree and commit
> d3acb92557b99feb051ac173d119d06900c364f5 ("ALSA: Kill snd_assert()
> in sound/core/*") from the sound tree.
>
> The former removes code modified by the latter. I just removed the
> code. I will carry the fixup.
Thanks Stephen.
Takashi-san, FYI, in the Sparc tree we have removed all SBUS specific
BUS probing and device code, all drivers are now generic and use plain
linux/dma-mapping.h interfaces.
So the sound layer SBUS code was superfluous and unused, so we
deleted it.
next prev parent reply other threads:[~2008-09-01 4:36 UTC|newest]
Thread overview: 12+ messages / expand[flat|nested] mbox.gz Atom feed top
2008-09-01 4:20 linux-next: manual merge of the sound tree Stephen Rothwell
2008-09-01 4:36 ` David Miller [this message]
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
-- strict thread matches above, loose matches on Subject: below --
2008-12-15 4:25 Stephen Rothwell
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=20080831.213607.09599119.davem@davemloft.net \
--to=davem@davemloft.net \
--cc=linux-next@vger.kernel.org \
--cc=sfr@canb.auug.org.au \
--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