public inbox for linux-next@vger.kernel.org 
 help / color / mirror / Atom feed

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, Ben Hutchings <ben@decadent•org.uk>,
	"David S. Miller" <davem@davemloft•net>
Subject: Re: linux-next: manual merge of the firmware tree with the  tree
Date: Mon, 02 Mar 2009 08:31:55 +0100	[thread overview]
Message-ID: <s5h3adw4bys.wl%tiwai@suse.de> (raw)
In-Reply-To: <20090302141106.7e14b17d.sfr@canb.auug.org.au>

At Mon, 2 Mar 2009 14:11:06 +1100,
Stephen Rothwell wrote:
> 
> Hi David,
> 
> Today's linux-next merge of the firmware tree got a conflict in
> firmware/Makefile between commit 06e1f9ffa023c030bc87491e75f625f5da4e7d97
> ("tehuti: Use request_firmware()") from the net tree and commit
> f2fd247da0abaa330c39922aa1f6729eff051f73 ("ALSA: wavefront - Always use 
> request_firmware()") from the firmware tree.
> 
> Just overlapping additions.  I fixed it up (see below) and can carry the
> fix as necessary.
> 
> David, is there any chance that (some of) these changes could be
> distributed to their respective maintainers?

I'm fine to take the sound part patch (it originally came from me ;-)
but I guess it won't help to resolve the conflict with net tree?


thanks,

Takashi

> 
> -- 
> Cheers,
> Stephen Rothwell                    sfr@canb•auug.org.au
> http://www.canb.auug.org.au/~sfr/
> 
> diff --cc firmware/Makefile
> index aa2e02d,bf8445e..0000000
> --- a/firmware/Makefile
> +++ b/firmware/Makefile
> @@@ -49,10 -55,9 +55,11 @@@ fw-shipped-$(CONFIG_SND_SB16_CSP) += sb
>   				     sb16/ima_adpcm_capture.csp
>   fw-shipped-$(CONFIG_SND_YMFPCI) += yamaha/ds1_ctrl.fw yamaha/ds1_dsp.fw \
>   				   yamaha/ds1e_ctrl.fw
> + fw-shipped-$(CONFIG_SND_WAVEFRONT) += yamaha/yss225_registers.bin
>  +fw-shipped-$(CONFIG_TEHUTI) += tehuti/bdx.bin
>   fw-shipped-$(CONFIG_TIGON3) += tigon/tg3.bin tigon/tg3_tso.bin \
>   			       tigon/tg3_tso5.bin
>  +fw-shipped-$(CONFIG_TYPHOON) += 3com/typhoon.bin
>   fw-shipped-$(CONFIG_USB_DABUSB) += dabusb/firmware.fw dabusb/bitstream.bin
>   fw-shipped-$(CONFIG_USB_EMI26) += emi26/loader.fw emi26/firmware.fw \
>   				  emi26/bitstream.fw
> 

next prev parent reply	other threads:[~2009-03-02  7:32 UTC|newest]

Thread overview: 4+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2009-03-02  3:11 linux-next: manual merge of the firmware tree with the tree Stephen Rothwell
2009-03-02  7:31 ` Takashi Iwai [this message]
  -- strict thread matches above, loose matches on Subject: below --
2009-03-02  3:11 Stephen Rothwell
2009-03-02  4:29 ` David Miller

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=s5h3adw4bys.wl%tiwai@suse.de \
    --to=tiwai@suse$(echo .)de \
    --cc=ben@decadent$(echo .)org.uk \
    --cc=davem@davemloft$(echo .)net \
    --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

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox