From: Christoph Hellwig <hch@infradead•org>
To: Stephen Rothwell <sfr@canb•auug.org.au>
Cc: David Chinner <david@fromorbit•com>,
xfs-masters@oss•sgi.com, linux-next@vger•kernel.org,
linux-kernel@vger•kernel.org, Alex Elder <aelder@sgi•com>,
Christoph Hellwig <hch@infradead•org>
Subject: Re: linux-next: build failure after merge of the final tree (xfs tree related)
Date: Mon, 15 Aug 2011 10:49:46 -0400 [thread overview]
Message-ID: <20110815144946.GA8256@infradead.org> (raw)
In-Reply-To: <20110815161023.6227665ab11f8a35fd649e3a@canb.auug.org.au>
On Mon, Aug 15, 2011 at 04:10:23PM +1000, Stephen Rothwell wrote:
> Hi all,
>
> After merging the final tree, today's linux-next build (a powerpc server
> config) failed like this:
You'll need the patch below. Can you keep is as a fix-up for now until
Alex returns from his vacation?
---
From: Christoph Hellwig <hch@lst•de>
Subject: [PATCH] xfs: fix tracing builds inside the source tree
The code really requires the current source directory to be in the
header search path. We already do this if building with an object
tree separate from the source, but it needs to be added manually
if building inside the source. The cflags addition for it accidentally
got removed when collapsing the xfs directory structure.
Signed-off-by: Christoph Hellwig <hch@lst•de>
Index: xfs/fs/xfs/Makefile
===================================================================
--- xfs.orig/fs/xfs/Makefile 2011-08-13 06:41:29.586063467 -0700
+++ xfs/fs/xfs/Makefile 2011-08-13 06:41:58.245908204 -0700
@@ -16,6 +16,8 @@
# Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
#
+ccflags-y += -I$(src) # needed for trace events
+
ccflags-$(CONFIG_XFS_DEBUG) += -g
obj-$(CONFIG_XFS_FS) += xfs.o
next prev parent reply other threads:[~2011-08-15 14:49 UTC|newest]
Thread overview: 3+ messages / expand[flat|nested] mbox.gz Atom feed top
2011-08-15 6:10 linux-next: build failure after merge of the final tree (xfs tree related) Stephen Rothwell
2011-08-15 14:49 ` Christoph Hellwig [this message]
2011-08-15 15:27 ` Stephen Rothwell
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=20110815144946.GA8256@infradead.org \
--to=hch@infradead$(echo .)org \
--cc=aelder@sgi$(echo .)com \
--cc=david@fromorbit$(echo .)com \
--cc=linux-kernel@vger$(echo .)kernel.org \
--cc=linux-next@vger$(echo .)kernel.org \
--cc=sfr@canb$(echo .)auug.org.au \
--cc=xfs-masters@oss$(echo .)sgi.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
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