From: Stephen Rothwell <sfr@canb•auug.org.au>
To: Ingo Molnar <mingo@elte•hu>
Cc: Thomas Gleixner <tglx@linutronix•de>,
"H. Peter Anvin" <hpa@zytor•com>,
linux-next@vger•kernel.org
Subject: Re: linux-next: manual merge of the sched tree
Date: Tue, 1 Jul 2008 16:00:16 +1000 [thread overview]
Message-ID: <20080701160016.0fa899e4.sfr@canb.auug.org.au> (raw)
In-Reply-To: <20080701055402.GA14658@elte.hu>
[-- Attachment #1: Type: text/plain, Size: 852 bytes --]
Hi Ingo,
On Tue, 1 Jul 2008 07:54:02 +0200 Ingo Molnar <mingo@elte•hu> wrote:
>
> You should be able to check whether we both integrated the conflict the
> same way via checking tip/auto-latest, which is the integration of all
> the auto branches that come from -tip.
>
> All the integration branches of -tip are pushed out at once so
> tip/auto-latest always gives a hint about how to integrate two -tip
> derived topic branches, tip/auto-latest always gives an answer. [ which
> might at times be wrong so it never hurts to double check :-) Note:
> auto-latest also includes some non-linux-next topics - but they dont
> affect the scheduler usually. ]
Good to know, I will fetch it when necessary to check my work.
--
Cheers,
Stephen Rothwell sfr@canb•auug.org.au
http://www.canb.auug.org.au/~sfr/
[-- Attachment #2: Type: application/pgp-signature, Size: 197 bytes --]
next prev parent reply other threads:[~2008-07-01 6:00 UTC|newest]
Thread overview: 26+ messages / expand[flat|nested] mbox.gz Atom feed top
2008-07-01 2:42 linux-next: manual merge of the sched tree Stephen Rothwell
2008-07-01 5:54 ` Ingo Molnar
2008-07-01 6:00 ` Stephen Rothwell [this message]
2008-07-01 6:08 ` Ingo Molnar
-- strict thread matches above, loose matches on Subject: below --
2008-12-22 1:05 Stephen Rothwell
2008-12-22 1:46 ` Paul E. McKenney
2008-12-22 6:35 ` Ingo Molnar
2008-12-30 23:45 ` Stephen Rothwell
2008-11-19 1:27 Stephen Rothwell
2008-11-19 8:45 ` Ingo Molnar
2008-11-19 9:29 ` Stephen Rothwell
2008-07-22 1:58 Stephen Rothwell
2008-07-22 1:54 Stephen Rothwell
2008-07-22 8:28 ` Stephen Rothwell
2008-07-22 9:13 ` Ingo Molnar
2008-07-22 11:07 ` Stephen Rothwell
[not found] <20080711112146.f7f98434.sfr@canb.auug.org.au>
2008-07-11 8:43 ` Ingo Molnar
[not found] <20080707142114.7985a9dd.sfr@canb.auug.org.au>
2008-07-07 6:02 ` Ingo Molnar
2008-07-07 6:16 ` Ingo Molnar
2008-07-07 6:41 ` Stephen Rothwell
2008-07-07 7:04 ` Ingo Molnar
2008-07-07 6:35 ` Stephen Rothwell
[not found] ` <20080707145027.0d83038e.sfr@canb.auug.org.au>
2008-07-07 6:10 ` Ingo Molnar
2008-07-07 6:37 ` Stephen Rothwell
2008-06-25 1:55 Stephen Rothwell
2008-06-25 9:36 ` Ingo Molnar
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=20080701160016.0fa899e4.sfr@canb.auug.org.au \
--to=sfr@canb$(echo .)auug.org.au \
--cc=hpa@zytor$(echo .)com \
--cc=linux-next@vger$(echo .)kernel.org \
--cc=mingo@elte$(echo .)hu \
--cc=tglx@linutronix$(echo .)de \
/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