public inbox for linux-next@vger.kernel.org 
 help / color / mirror / Atom feed
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: Mon, 08 Dec 2008 23:59:14 -0800 (PST)	[thread overview]
Message-ID: <20081208.235914.264894795.davem@davemloft.net> (raw)
In-Reply-To: <20081209035318.GB22596@kroah.com>

From: Greg KH <greg@kroah•com>
Date: Mon, 8 Dec 2008 19:53:18 -0800

> On Mon, Dec 08, 2008 at 12:35:57PM -0800, David Miller wrote:
> > Because I have to do allmodconfig test builds _too_, and the build
> > will fail for me if I do these reverts which really would suck.
> 
> Ok, that's fine, as long as stephen can keep this patch in his tree,
> I'll apply it to mine when you merge with Linus, as the staging tree
> will probably be one of the last things before the next -rc1 window
> closes.

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.

  reply	other threads:[~2008-12-09  7:59 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 [this message]
2008-12-09 15:40         ` Greg KH
2008-12-09 21:42           ` 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=20081208.235914.264894795.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