From: Takashi Iwai <tiwai@suse•de>
To: Stephen Rothwell <sfr@canb•auug.org.au>
Cc: David Woodhouse <dwmw2@infradead•org>, linux-next@vger•kernel.org
Subject: Re: linux-next: manual merge of the firmware tree
Date: Thu, 26 Jun 2008 15:51:50 +0200 [thread overview]
Message-ID: <s5h8wwsqp6x.wl%tiwai@suse.de> (raw)
In-Reply-To: <20080626233833.f78fbd36.sfr@canb.auug.org.au>
> 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
next prev parent reply other threads:[~2008-06-26 13:51 UTC|newest]
Thread overview: 28+ messages / expand[flat|nested] mbox.gz Atom feed top
2008-06-26 13:38 linux-next: manual merge of the firmware tree Stephen Rothwell
2008-06-26 13:51 ` Takashi Iwai [this message]
2008-06-26 15:42 ` Stephen Rothwell
2008-06-26 15:47 ` David Woodhouse
2008-06-30 9:23 ` Stephen Rothwell
2008-06-30 9:27 ` David Woodhouse
2008-06-30 9:32 ` Stephen Rothwell
-- strict thread matches above, loose matches on Subject: below --
2008-11-28 5:03 Stephen Rothwell
2008-11-29 0:14 ` Divy Le Ray
2008-11-29 0:48 ` Stephen Rothwell
2008-11-29 10:11 ` David Woodhouse
2008-11-25 7:21 Stephen Rothwell
2008-10-15 7:58 Stephen Rothwell
2008-09-01 6:19 Stephen Rothwell
2008-08-28 5:38 Stephen Rothwell
2008-08-28 13:51 ` Takashi Iwai
2008-07-29 4:27 Stephen Rothwell
2008-07-11 6:02 Stephen Rothwell
2008-07-07 16:02 Stephen Rothwell
2008-06-30 9:17 Stephen Rothwell
2008-06-30 9:14 Stephen Rothwell
2008-06-30 9:09 Stephen Rothwell
2008-06-30 9:24 ` David Woodhouse
2008-06-30 9:33 ` Stephen Rothwell
2008-06-24 6:55 Stephen Rothwell
2008-06-24 7:57 ` Stephen Rothwell
2008-06-24 8:04 ` David Woodhouse
2008-06-24 11:20 ` 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=s5h8wwsqp6x.wl%tiwai@suse.de \
--to=tiwai@suse$(echo .)de \
--cc=dwmw2@infradead$(echo .)org \
--cc=linux-next@vger$(echo .)kernel.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