Subject: Re: linux-next: manual merge of the kmemcheck tree with the tracing tree

From: Stephen Rothwell <[email-masked]>
Date: Tue, 2 Jun 2009 10:32:16 +1000

Hi Steve,

On Mon, 01 Jun 2009 10:33:19 -0400 Steven Rostedt <[email-masked]> 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                    [email-masked]
http://www.canb.auug.org.au/~sfr/