From mboxrd@z Thu Jan  1 00:00:00 1970
From: Takashi Iwai <tiwai@suse.de>
Subject: Re: linux-next: manual merge of the firmware tree
Date: Thu, 26 Jun 2008 15:51:50 +0200
Message-ID: <s5h8wwsqp6x.wl%tiwai@suse.de>
References: <20080626233833.f78fbd36.sfr@canb.auug.org.au>
Mime-Version: 1.0 (generated by SEMI 1.14.6 - "Maruoka")
Content-Type: text/plain; charset=US-ASCII
Return-path: <linux-next-owner@vger.kernel.org>
Received: from mx2.suse.de ([195.135.220.15]:45050 "EHLO mx2.suse.de"
	rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP
	id S1752425AbYFZNvw (ORCPT <rfc822;linux-next@vger.kernel.org>);
	Thu, 26 Jun 2008 09:51:52 -0400
In-Reply-To: <20080626233833.f78fbd36.sfr@canb.auug.org.au>
Sender: linux-next-owner@vger.kernel.org
List-ID: <linux-next.vger.kernel.org>
To: Stephen Rothwell <sfr@canb.auug.org.au>
Cc: David Woodhouse <dwmw2@infradead.org>, linux-next@vger.kernel.org

> Hi David,
> 
> Today's linux-next merge of the firmware tree got conflicts in
> sound/pci/Kconfig between commits 829808ac06b33cdc678ad7dbd628d71d65f8a9c3
> ("[ALSA] Fix AC97 kconfig items") and
> 03cf8be8c43b8c7febc5aacc110fd6a0bff00aa7 ("sound: Convert to menuconfig")
> from the sound tree and commits aee133db3305c4eb85a2d024db613ff44e714f20 ("firmware: convert korg1212 driver to use firmware loader exclusively"), 8fa5ae5506e4a5f69a0c662bc499d8992a2e26c8 ("firmware: convert maestro3 driver to use firmware loader exclusively") and  62bd53e67f6516ce6ec6c3c40db5d8868c7b2487
> ("firmware: convert ymfpci driver to use firmware loader exclusively")
> from the firmware tree.
> 
> I can carry the obvious fixups for these.
> 
> I may have previously reported these (erroneously) against
> sound/Kconfig.

Maybe it's because I rebased the master branch of sound-2.6.git.
Is the fix almost identical with the previous one, I guess?


thanks,

Takashi