public inbox for linux-xfs@vger.kernel.org
 help / color / mirror / Atom feed
From: Dave Chinner <david@fromorbit.com>
To: xfs@oss.sgi.com
Subject: build error in current dev tree
Date: Mon, 18 Oct 2010 23:08:58 +1100	[thread overview]
Message-ID: <20101018120858.GK29677@dastard> (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.
-- 
Dave Chinner
david@fromorbit.com

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

             reply	other threads:[~2010-10-18 12:07 UTC|newest]

Thread overview: 2+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2010-10-18 12:08 Dave Chinner [this message]
2010-10-18 16:01 ` build error in current dev tree Alex Elder

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=20101018120858.GK29677@dastard \
    --to=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