From: David Woodhouse <dwmw2@infradead.org>
To: Takashi Iwai <tiwai@suse.de>
Cc: Stephen Rothwell <sfr@canb.auug.org.au>,
linux-next@vger.kernel.org, Alan Cox <alan@redhat.com>,
Greg Kroah-Hartman <gregkh@suse.de>
Subject: Re: linux-next: firmware merge conflicts
Date: Wed, 04 Jun 2008 10:56:29 +0100 [thread overview]
Message-ID: <1212573389.4042.89.camel@shinybook.infradead.org> (raw)
In-Reply-To: <s5hprqx5z3b.wl%tiwai@suse.de>
On Wed, 2008-06-04 at 11:27 +0200, Takashi Iwai wrote:
> Or just let me know if you guys want to put the changes into sound
> tree. I'm willing to apply them...
Probably best to handle all the "const" changes together.
> > And I can carry the sound/Kconfig fixup.
That conflict is just selecting FW_LOADER unconditionally, and changing
the default of SND_*_FIRMWARE_IN_KERNEL to 'n'. The latter you could do
in the sound tree quite happily. The former too, perhaps -- but then
there's Adrian's patch to make FW_LOADER unconditional if !EMBEDDED
anyway, which I think is probably a good idea.
--
dwmw2
next prev parent reply other threads:[~2008-06-04 9:56 UTC|newest]
Thread overview: 6+ messages / expand[flat|nested] mbox.gz Atom feed top
2008-06-04 6:07 linux-next: firmware merge conflicts Stephen Rothwell
2008-06-04 9:27 ` Takashi Iwai
2008-06-04 9:56 ` David Woodhouse [this message]
2008-06-04 10:50 ` Stephen Rothwell
2008-06-04 10:44 ` Stephen Rothwell
2008-06-04 9:52 ` David Woodhouse
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=1212573389.4042.89.camel@shinybook.infradead.org \
--to=dwmw2@infradead.org \
--cc=alan@redhat.com \
--cc=gregkh@suse.de \
--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;
as well as URLs for NNTP newsgroup(s).