From: David Woodhouse <dwmw2@infradead•org>
To: Stephen Rothwell <sfr@canb•auug.org.au>
Cc: Divy Le Ray <divy@chelsio•com>,
linux-next@vger•kernel.org,
"David S. Miller" <davem@davemloft•net>,
Jaswinder Singh <jaswinder@infradead•org>
Subject: Re: linux-next: manual merge of the firmware tree
Date: Sat, 29 Nov 2008 10:11:45 +0000 [thread overview]
Message-ID: <1227953505.22021.6.camel@macbook.infradead.org> (raw)
In-Reply-To: <20081129114846.4b97cd96.sfr@canb.auug.org.au>
On Sat, 2008-11-29 at 11:48 +1100, Stephen Rothwell wrote:
> On Fri, 28 Nov 2008 16:14:46 -0800 Divy Le Ray <divy@chelsio•com> wrote:
> > I created this situation and apologize for it. I should have sent the
> > patch to the firmware tree maintainer.
No, I think you did the right thing. Thank you for the patch.
> Its not a big issue - the conflict has a very obvious resolution and "git
> rerere" remembers it for me. As far as I know, there is no "firmware
> maintainer" - David just has a git tree that was used when the initial
> conversions were done. Some of those have not yet been finalised and so
> are still in his tree.
I had said that it's time for the 'firmware tree' to be discarded, and
the patches pushed upstream via the appropriate maintainers. The reason
I'd waited was because I'd told DaveM I'd wait for the dust to settle on
the first round of patches before sending the rest.
Now I'm a little concerned about the conflicts in the WHENCE file if we
have patches going through different routes. Perhaps we should stop just
adding stuff at the _end_ and sort it? Or rearrange it differently?
--
David Woodhouse Open Source Technology Centre
David.Woodhouse@intel•com Intel Corporation
next prev parent reply other threads:[~2008-11-29 10:11 UTC|newest]
Thread overview: 28+ messages / expand[flat|nested] mbox.gz Atom feed top
2008-11-28 5:03 linux-next: manual merge of the firmware tree Stephen Rothwell
2008-11-29 0:14 ` Divy Le Ray
2008-11-29 0:48 ` Stephen Rothwell
2008-11-29 10:11 ` David Woodhouse [this message]
-- strict thread matches above, loose matches on Subject: below --
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-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=1227953505.22021.6.camel@macbook.infradead.org \
--to=dwmw2@infradead$(echo .)org \
--cc=davem@davemloft$(echo .)net \
--cc=divy@chelsio$(echo .)com \
--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