From: David Woodhouse <dwmw2@infradead•org>
To: Stephen Rothwell <sfr@canb•auug.org.au>
Cc: linux-next@vger•kernel.org,
Jaswinder Singh <jaswinder@infradead•org>,
Chas Williams <chas@cmf•nrl.navy.mil>,
David Miller <davem@davemloft•net>
Subject: Re: linux-next: manual merge of the firmware tree
Date: Mon, 30 Jun 2008 10:24:13 +0100 [thread overview]
Message-ID: <1214817853.10393.330.camel@pmac.infradead.org> (raw)
In-Reply-To: <20080630190907.004cbb79.sfr@canb.auug.org.au>
On Mon, 2008-06-30 at 19:09 +1000, Stephen Rothwell wrote:
> Hi David,
>
> Today's linux-next merge of the firmware tree got a major conflict
> between commit e92481f95375aa2702ea5018b0295792ae0fa9c1 ("atm: [fore200e]
> convert to use request_firmware()") from the net tree and commit
> ef15231d8a30e501b5471ad97a07359e39ceab00 ("fore200e: use request_firmware
> ()") from the firmware tree.
>
> I reverted the latter from the firmware tree for now.
Oops, sorry -- I'd forgotten about that patch, and I let Jaswinder go
ahead and do it again.
I think the reason I didn't apply the patch from Chas to my tree was
because I'm trying to be very careful to preserve functionality -- when
I ask Linus to pull the firmware tree, I still want people to be able to
build in _all_ the firmware they could before.
I'm happy enough to see it done separately though; I'll drop our
fore200e patch from the firmware-2.6.git tree.
--
dwmw2
next prev parent reply other threads:[~2008-06-30 9:24 UTC|newest]
Thread overview: 28+ messages / expand[flat|nested] mbox.gz Atom feed top
2008-06-30 9:09 linux-next: manual merge of the firmware tree Stephen Rothwell
2008-06-30 9:24 ` David Woodhouse [this message]
2008-06-30 9:33 ` 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-26 13:38 Stephen Rothwell
2008-06-26 13:51 ` Takashi Iwai
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
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=1214817853.10393.330.camel@pmac.infradead.org \
--to=dwmw2@infradead$(echo .)org \
--cc=chas@cmf$(echo .)nrl.navy.mil \
--cc=davem@davemloft$(echo .)net \
--cc=jaswinder@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