Subject: Re: linux-next: manual merge of the x86 tree

From: Ingo Molnar <[email-masked]>
Date: Fri, 5 Sep 2008 18:00:07 +0200

* Stephen Rothwell <[email-masked]> wrote:

> Hi all,
> 
> Today's linux-next merge of the x86 tree got a conflict in
> include/asm-x86/statfs.h between commit
> e4e2079e475520e02f55f0b225fc044e39a357e0 ("x86_64: Use
> <asm-generic/statfs.h>") from the dwmw2 tree and commit
> 77ef50a522717fa040636ee1017179ceba12ff62 ("x86: consolidate header
> guards") from the x86 tree.
> 
> Trivial fix (see below).  I can carry it.

thanks Stephen!

Since e4e2079e is part of the multi-platform statfs.h cleanups in 
David's tree i guess we'll have to carry the conflict along for a while.

	Ingo