Re: linux-next: manual merge of the sched tree

[Ingo Molnar <mingo@elte.hu>]

* Stephen Rothwell <sfr@canb.auug.org.au> wrote:

> diff --git a/arch/x86/mm/kmmio.c b/arch/x86/mm/kmmio.c
> index b65871e..7bfdad7 100644
> --- a/arch/x86/mm/kmmio.c
> +++ b/arch/x86/mm/kmmio.c
> @@ -23,6 +23,7 @@
>  #include <linux/errno.h>
>  #include <asm/debugreg.h>
>  #include <linux/mmiotrace.h>
> +#include <linux/rculist.h>

the same commit existed already for about two months:

------------------->
commit 668a6c3654560aef8741642478973e205a4f02bf
Author: Ingo Molnar <mingo@elte.hu>
Date:   Mon May 19 13:35:24 2008 +0200

    - fix mmioftrace + rcu merge interaction
    
    Signed-off-by: Thomas Gleixner <tglx@linutronix.de>

diff --git a/arch/x86/mm/kmmio.c b/arch/x86/mm/kmmio.c
index b65871e..93d8203 100644
--- a/arch/x86/mm/kmmio.c
+++ b/arch/x86/mm/kmmio.c
@@ -6,6 +6,7 @@
  */
 
 #include <linux/list.h>
+#include <linux/rculist.h>
 #include <linux/spinlock.h>
 #include <linux/hash.h>
 #include <linux/init.h>
<----------------------

so i've merged the tip/tracing/mmiotrace-mergefixups branch into 
tip/tracing/mmiotrace. (after having merged tip/tracing/mmiotrace to 
-rc9 so that rculist.h was present already)

	Ingo