All of lore.kernel.org
 help / color / mirror / Atom feed
From: Andrew Morton <akpm@linux-foundation.org>
To: David Miller <davem@davemloft.net>
Cc: netdev@vger.kernel.org, shemminger@linux-foundation.org,
	chris@zankel.net, geert@linux-m68k.org, jdike@addtoit.com,
	ralf@linux-mips.org, rmk@arm.linux.org.uk, zippel@linux-m68k.org
Subject: Re: [patch 2/2] div64_64: common code
Date: Tue, 6 Mar 2007 16:04:30 -0800	[thread overview]
Message-ID: <20070306160430.d3cf47a8.akpm@linux-foundation.org> (raw)
In-Reply-To: <20070306.152140.105428124.davem@davemloft.net>

On Tue, 06 Mar 2007 15:21:40 -0800 (PST)
David Miller <davem@davemloft.net> wrote:

> From: Andrew Morton <akpm@linux-foundation.org>
> Date: Tue, 6 Mar 2007 14:32:06 -0800
> 
> > ho hum, I didn't know that, so we missed rc2-mm2.
> > 
> > Could I have symlinks in /pub/scm/linux/kernel/git/davem/ to net-latest and
> > sparc-latest please?
> 
> When we are in a merge window, I have only one tree for sparc
> and networking.
> 
> But when we're in RC mode, I've got multiple trees, one each
> for bug fixes and one for stuff which will get submitted in
> the next merge window.
> 
> When Linus pulls in the bug fixes, I rebase the merge window trees so
> that all the fixes get integrated to the merge tree and I can resolve
> any conflicts, if any.
> 
> So, which one(s) do you want? :-)

The merge-window things, generally.

I assume from the above that the merge-window tree doesn't contain the
paterial in the bugfixes tree?  If so, I guess I'd need both.  If not, the
merge-window tree should contain everything?

I dunno - you know your trees better than I.  The bottom line is I want
everything you've got, and it'd be nice to fix this problem where I don't
know that a new tree has been opened up, so I miss it - how can we do this?

  reply	other threads:[~2007-03-07  0:08 UTC|newest]

Thread overview: 7+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2007-03-06 10:42 [patch 2/2] div64_64: common code akpm
2007-03-06 18:11 ` David Miller
2007-03-06 22:32   ` Andrew Morton
2007-03-06 23:21     ` David Miller
2007-03-07  0:04       ` Andrew Morton [this message]
2007-03-06 19:46 ` Ralf Baechle
2007-03-06 21:46   ` 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=20070306160430.d3cf47a8.akpm@linux-foundation.org \
    --to=akpm@linux-foundation.org \
    --cc=chris@zankel.net \
    --cc=davem@davemloft.net \
    --cc=geert@linux-m68k.org \
    --cc=jdike@addtoit.com \
    --cc=netdev@vger.kernel.org \
    --cc=ralf@linux-mips.org \
    --cc=rmk@arm.linux.org.uk \
    --cc=shemminger@linux-foundation.org \
    --cc=zippel@linux-m68k.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.