Hi Takashi,
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.
--
Cheers,
Stephen Rothwell sfr@xxxxxxxxxxxxxxxx
http://www.canb.auug.org.au/~sfr/
Attachment:
pgpuGdNXuBuVd.pgp
Description: PGP signature
