From: David Miller <davem@davemloft•net>
To: greg@kroah•com
Cc: sfr@canb•auug.org.au, linux-next@vger•kernel.org,
wangchen@cn•fujitsu.com
Subject: Re: linux-next: manual merge of the staging tree
Date: Tue, 09 Dec 2008 13:42:29 -0800 (PST) [thread overview]
Message-ID: <20081209.134229.255864200.davem@davemloft.net> (raw)
In-Reply-To: <20081209154053.GA25934@kroah.com>
From: Greg KH <greg@kroah•com>
Date: Tue, 9 Dec 2008 07:40:53 -0800
> On Mon, Dec 08, 2008 at 11:59:14PM -0800, David Miller wrote:
> > BTW, there is something else we can do.
> >
> > I can pull staging net driver changes into net-next-2.6
> >
> > We can either do it as a one-time thing to alleviate this
> > merge hassle, or we can try and make it a more ongoing
> > merge mechanism.
>
> I doubt you really want to do this, as there are some pretty big
> wireless driver additions in the staging tree right now, some under very
> heavy development.
>
> I have no problem with this kind of merge issues, I'll fix it up on my
> end, don't worry about it.
Ok, I just thought I'd offer :-)
prev parent reply other threads:[~2008-12-09 21:42 UTC|newest]
Thread overview: 7+ messages / expand[flat|nested] mbox.gz Atom feed top
2008-12-08 9:34 linux-next: manual merge of the staging tree Stephen Rothwell
2008-12-08 15:17 ` Greg KH
2008-12-08 20:35 ` David Miller
2008-12-09 3:53 ` Greg KH
2008-12-09 7:59 ` David Miller
2008-12-09 15:40 ` Greg KH
2008-12-09 21:42 ` David Miller [this message]
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=20081209.134229.255864200.davem@davemloft.net \
--to=davem@davemloft$(echo .)net \
--cc=greg@kroah$(echo .)com \
--cc=linux-next@vger$(echo .)kernel.org \
--cc=sfr@canb$(echo .)auug.org.au \
--cc=wangchen@cn$(echo .)fujitsu.com \
/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