[<prev] [next>] [<thread-prev] [thread-next>] [day] [month] [year] [list]
Message-ID: <20090923071152.GA8000@barkeeper1-xen.linbit>
Date: Wed, 23 Sep 2009 09:11:52 +0200
From: Lars Ellenberg <lars.ellenberg@...bit.com>
To: Stephen Rothwell <sfr@...b.auug.org.au>
Cc: Jens Axboe <jens.axboe@...cle.com>, linux-next@...r.kernel.org,
linux-kernel@...r.kernel.org,
Philipp Reisner <philipp.reisner@...bit.com>,
drbd-dev@...ts.linbit.com, Christoph Hellwig <hch@....de>
Subject: Re: linux-next: block tree build failure
On Wed, Sep 23, 2009 at 02:51:00PM +1000, Stephen Rothwell wrote:
> Hi Jens,
>
> Today's linux-next build (x86_64 allmodconfig) failed like this:
>
> drivers/block/drbd/drbd_tracing.c:29:26: error: linux/marker.h: No such file or directory
>
> Caused by commit 95eaef1cbc63f73df4ff8559dd66b1d29b462535 ("Replaced our
> own tracing stuff with Linux's tracepoints") from the block/drbd trees
> interacting with commit fc5377668c3d808e1d53c4aee152c836f55c3490
> ("tracing: Remove markers") from Linus' tree.
>
> I have no idea what the correct thing to do is here, so I have reverted
> the merge of the drbd tree into the block tree and will have to drop the
> drbd tree for today.
We'll have a look.
A quick fix should be to just disable CONFIG_DRBD_TRACE.
--
: Lars Ellenberg
: LINBIT | Your Way to High Availability
: DRBD/HA support and consulting http://www.linbit.com
DRBD® and LINBIT® are registered trademarks of LINBIT, Austria.
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@...r.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/
Powered by blists - more mailing lists