From: Ingo Molnar <mingo@elte.hu>
To: Stephen Rothwell <sfr@canb.auug.org.au>
Cc: Jeremy Fitzhardinge <jeremy@goop.org>,
Thomas Gleixner <tglx@linutronix.de>,
"H. Peter Anvin" <hpa@zytor.com>,
linux-next@vger.kernel.org, Steven Rostedt <srostedt@redhat.com>
Subject: Re: linux-next: manual merge of the x86 tree
Date: Tue, 8 Jul 2008 07:39:49 +0200 [thread overview]
Message-ID: <20080708053949.GA19939@elte.hu> (raw)
In-Reply-To: <20080708150103.3d52c0d0.sfr@canb.auug.org.au>
* Stephen Rothwell <sfr@canb.auug.org.au> wrote:
> Hi Jeremy,
>
> On Mon, 07 Jul 2008 20:22:10 -0700 Jeremy Fitzhardinge <jeremy@goop.org> wrote:
> >
> > I must be missing something. Don't all those already come from
> > tip.git pre-merged? Or are you merging various tip.git topic
> > branches yourself? Or are some of these coming from elsewhere?
>
> I merge a set of branches that are specially maintained for linux-next
> (see the Next/Trees file in the linux-next tree). I assume that Linus
> is probably not going to just merge in tip.get in one enormous merge
> ...
correct, but he wont have to do merge conflict resolutions either - i'll
do them when i prepare the pulls for Linus.
Ingo
next prev parent reply other threads:[~2008-07-08 5:40 UTC|newest]
Thread overview: 30+ messages / expand[flat|nested] mbox.gz Atom feed top
2008-07-08 0:56 linux-next: manual merge of the x86 tree Stephen Rothwell
2008-07-08 3:22 ` Jeremy Fitzhardinge
2008-07-08 5:01 ` Stephen Rothwell
2008-07-08 5:28 ` Jeremy Fitzhardinge
2008-07-08 5:39 ` Ingo Molnar [this message]
-- strict thread matches above, loose matches on Subject: below --
2008-10-14 2:23 Stephen Rothwell
2008-09-11 23:37 Stephen Rothwell
2008-09-14 15:16 ` Ingo Molnar
2008-09-14 18:11 ` Stephen Rothwell
2008-09-11 23:34 Stephen Rothwell
2008-09-14 15:18 ` Ingo Molnar
2008-09-14 18:13 ` Stephen Rothwell
2008-09-03 0:57 Stephen Rothwell
2008-09-05 16:00 ` Ingo Molnar
2008-09-02 1:32 Stephen Rothwell
2008-09-05 18:22 ` Ingo Molnar
2008-08-15 3:58 Stephen Rothwell
2008-07-31 2:59 Stephen Rothwell
2008-07-23 2:51 Stephen Rothwell
2008-07-18 2:29 Stephen Rothwell
2008-07-17 1:43 Stephen Rothwell
2008-07-15 2:26 Stephen Rothwell
2008-07-14 1:30 Stephen Rothwell
2008-07-11 1:48 Stephen Rothwell
2008-07-11 1:47 Stephen Rothwell
2008-07-08 0:52 Stephen Rothwell
2008-07-04 3:50 Stephen Rothwell
2008-07-04 3:41 Stephen Rothwell
2008-07-04 9:41 ` Ingo Molnar
2008-06-25 2:28 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=20080708053949.GA19939@elte.hu \
--to=mingo@elte.hu \
--cc=hpa@zytor.com \
--cc=jeremy@goop.org \
--cc=linux-next@vger.kernel.org \
--cc=sfr@canb.auug.org.au \
--cc=srostedt@redhat.com \
--cc=tglx@linutronix.de \
/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.