[Top] [All Lists]

build error in current dev tree

To: xfs@xxxxxxxxxxx
Subject: build error in current dev tree
From: Dave Chinner <david@xxxxxxxxxxxxx>
Date: Mon, 18 Oct 2010 23:08:58 +1100
User-agent: Mutt/1.5.20 (2009-06-14)
Hi Alex,

Can you fix up the current dev tree? When I merge it into
2.6.36-rc8, I get the following error:

  CC      fs/xfs/support/debug.o
  CC      fs/xfs/support/uuid.o
fs/xfs/linux-2.6/xfs_sync.c:671: error: redefinition of 
fs/xfs/linux-2.6/xfs_sync.c:623: note: previous definition of 
‘__xfs_inode_clear_reclaim_tag’ was here

I beleive it's a merge error because you rebased the for-linus
branch to change a commit message for a pull to Linus, and the
linux-next tree is also seeing this problem. Now that commit is in
mainline it is not merging cleanly with the dev branch.  Can you
either commit a fix or rebase the current tree on 2.6.36-rc8?


Dave Chinner

<Prev in Thread] Current Thread [Next in Thread>