linux-next.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
From: Stephen Rothwell <sfr@canb.auug.org.au>
To: Ingo Molnar <mingo@elte.hu>
Cc: linux-next@vger.kernel.org, Pekka Paalanen <pq@iki.fi>,
	Thomas Gleixner <tglx@linutronix.de>
Subject: Re: linux-next: ftrace build failure
Date: Wed, 28 May 2008 10:44:04 +1000	[thread overview]
Message-ID: <20080528104404.68cd7039.sfr@canb.auug.org.au> (raw)
In-Reply-To: <20080527074310.GA21997@elte.hu>

[-- Attachment #1: Type: text/plain, Size: 1346 bytes --]

Hi Ingo,

On Tue, 27 May 2008 09:43:10 +0200 Ingo Molnar <mingo@elte.hu> wrote:
>
> this is not an 'ftrace build bug', this is an integration artifact of 

I didn't say it was a bug.  My subject line (and I have been writing them
like this since I started linux-next in February) means "The build failed
after I merged the ftrace tree".  Nothing more, nothing less.

> -next. It is fixed in -tip too (which too integrates these topics) in a 
> different branch.

And I said it was a merge artifact.

> it's in a different branch because this is a change only makes sense if 
> the 'tip/core/rcu' and 'tip/auto-ftrace-next' topics are combined - 
> hence it lives in the "tip/auto-test-fixes" (commit 48bd24be18) - and 
> this change was always there as the combined result wouldnt even build 
> without this fix.

Good and correct.

> So this is a true "merge only commit" that cannot live standalone in any 
> of the topic branches it is related to.

Right.  And I am happy to carry the patch if you want me to.
Alternatively, since auto-ftrace-next is really only meant for merging
into linux-next, you could merge core/rcu (in addition to the curent
merge into auto-sched-next) and the fixup into there.

-- 
Cheers,
Stephen Rothwell                    sfr@canb.auug.org.au
http://www.canb.auug.org.au/~sfr/

[-- Attachment #2: Type: application/pgp-signature, Size: 189 bytes --]

      reply	other threads:[~2008-05-28  0:44 UTC|newest]

Thread overview: 3+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2008-05-27  2:56 linux-next: ftrace build failure Stephen Rothwell
2008-05-27  7:43 ` Ingo Molnar
2008-05-28  0:44   ` Stephen Rothwell [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=20080528104404.68cd7039.sfr@canb.auug.org.au \
    --to=sfr@canb.auug.org.au \
    --cc=linux-next@vger.kernel.org \
    --cc=mingo@elte.hu \
    --cc=pq@iki.fi \
    --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 a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).