From: Alex Elder <aelder@sgi.com>
To: Dave Chinner <david@fromorbit.com>
Cc: xfs@oss.sgi.com
Subject: Re: build error in current dev tree
Date: Mon, 18 Oct 2010 11:01:04 -0500 [thread overview]
Message-ID: <1287417664.2382.24.camel@doink> (raw)
In-Reply-To: <20101018120858.GK29677@dastard>
On Mon, 2010-10-18 at 23:08 +1100, Dave Chinner wrote:
> 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?
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
xfs@oss.sgi.com
http://oss.sgi.com/mailman/listinfo/xfs
prev parent reply other threads:[~2010-10-18 16:00 UTC|newest]
Thread overview: 2+ messages / expand[flat|nested] mbox.gz Atom feed top
2010-10-18 12:08 build error in current dev tree Dave Chinner
2010-10-18 16:01 ` Alex Elder [this message]
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1287417664.2382.24.camel@doink \
--to=aelder@sgi.com \
--cc=david@fromorbit.com \
--cc=xfs@oss.sgi.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox