build error in current dev tree

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

 



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 â__xfs_inode_clear_reclaim_tagâ
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?

Cheers,

Dave.
-- 
Dave Chinner
david@xxxxxxxxxxxxx

_______________________________________________
xfs mailing list
xfs@xxxxxxxxxxx
http://oss.sgi.com/mailman/listinfo/xfs



[Index of Archives]     [Linux XFS Devel]     [Linux Filesystem Development]     [Filesystem Testing]     [Linux USB Devel]     [Linux Audio Users]     [Yosemite News]     [Linux Kernel]     [Linux SCSI]

  Powered by Linux