From: Stephen Rothwell <sfr@canb•auug.org.au>
To: Steven Rostedt <srostedt@redhat•com>
Cc: Vegard Nossum <vegard.nossum@gmail•com>,
Pekka Enberg <penberg@cs•helsinki.fi>,
Ingo Molnar <mingo@elte•hu>,
linux-next@vger•kernel.org, linux-kernel@vger•kernel.org
Subject: Re: linux-next: manual merge of the kmemcheck tree with the tracing tree
Date: Tue, 2 Jun 2009 10:32:16 +1000 [thread overview]
Message-ID: <20090602103216.dab209a1.sfr@canb.auug.org.au> (raw)
In-Reply-To: <1243866799.18138.9.camel@localhost.localdomain>
[-- Attachment #1: Type: text/plain, Size: 842 bytes --]
Hi Steve,
On Mon, 01 Jun 2009 10:33:19 -0400 Steven Rostedt <srostedt@redhat•com> wrote:
>
> > + /*
> > + * The actual tail page has moved forward.
> > + */
> > + if (tail < BUF_PAGE_SIZE) {
> > + /* Mark the rest of the page with padding */
> > + event = __rb_page_index(tail_page, tail);
> > ++ kmemcheck_annotate_bitfield(event, bitfield);
>
> Is this...
Just this (since the code was outdented and moved slightly).
> > @@@ -1311,12 -1289,9 +1313,13 @@@
> > return NULL;
> >
> > event = __rb_page_index(tail_page, tail);
> > + kmemcheck_annotate_bitfield(event, bitfield);
>
> and this the only changes you needed to fix?
This one git merged on its own.
The "++" is the clue.
--
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:[~2009-06-02 0:32 UTC|newest]
Thread overview: 8+ messages / expand[flat|nested] mbox.gz Atom feed top
2009-06-01 7:55 linux-next: manual merge of the kmemcheck tree with the tracing tree Stephen Rothwell
2009-06-01 14:33 ` Steven Rostedt
2009-06-02 0:32 ` Stephen Rothwell [this message]
2009-06-01 19:46 ` Ingo Molnar
-- strict thread matches above, loose matches on Subject: below --
2009-06-01 7:55 Stephen Rothwell
2009-03-06 6:27 Stephen Rothwell
2009-03-06 8:14 ` Vegard Nossum
2009-03-06 10:27 ` 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=20090602103216.dab209a1.sfr@canb.auug.org.au \
--to=sfr@canb$(echo .)auug.org.au \
--cc=linux-kernel@vger$(echo .)kernel.org \
--cc=linux-next@vger$(echo .)kernel.org \
--cc=mingo@elte$(echo .)hu \
--cc=penberg@cs$(echo .)helsinki.fi \
--cc=srostedt@redhat$(echo .)com \
--cc=vegard.nossum@gmail$(echo .)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