build error in current dev tree

DISCUSSION Dave Chinner 2 participants 2 messages Oct 18, 2010

lore

Share & tools

lore

Dave Chinner

author

2010-10-18 12:07 UTC #0 lore raw

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.

Signature · 7 lines

Dave Chinner
[email protected]

_______________________________________________
xfs mailing list
[email protected]
http://oss.sgi.com/mailman/listinfo/xfs

Alex Elder

2010-10-18 16:00 UTC #1 lore raw

Quoted 10 lines · Dave Chinner

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

Quoted 5 lines

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?

I see what you're talking about.

As I recall, 5ae4ef83... (xfs: properly account for reclaimed inodes) didn't apply cleanly to Linus' master because of other recent changes to linux-2.6/xfs_sync.c (possibly the batched per-AG lookup commit e1a48dbec... caused the problem).

It's possible I did not finish out resolving the issue properly. In any case, I'll try to resolve it by re-basing the entire XFS dev tree to v2.6.26-rc8. Christoph had suggested doing that anyway.

Once I've done that people will have to forcibly update their tracking branches; I'll provide info once I've fixed the problem. Thanks a lot for pointing it out.

-Alex

_______________________________________________
xfs mailing list
[email protected]
http://oss.sgi.com/mailman/listinfo/xfs