Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752217AbZIWLMY (ORCPT ); Wed, 23 Sep 2009 07:12:24 -0400 Received: (majordomo@vger.kernel.org) by vger.kernel.org id S1751849AbZIWLMX (ORCPT ); Wed, 23 Sep 2009 07:12:23 -0400 Received: from mail09.linbit.com ([212.69.161.110]:47417 "EHLO mail09.linbit.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751717AbZIWLMW (ORCPT ); Wed, 23 Sep 2009 07:12:22 -0400 Date: Wed, 23 Sep 2009 13:12:25 +0200 From: Lars Ellenberg To: Stephen Rothwell , Jens Axboe , linux-next@vger.kernel.org, linux-kernel@vger.kernel.org, Philipp Reisner , drbd-dev@lists.linbit.com, Christoph Hellwig Subject: Re: linux-next: block tree build failure Message-ID: <20090923111225.GC8000@barkeeper1-xen.linbit> Mail-Followup-To: Stephen Rothwell , Jens Axboe , linux-next@vger.kernel.org, linux-kernel@vger.kernel.org, Philipp Reisner , drbd-dev@lists.linbit.com, Christoph Hellwig References: <20090923145100.1917fdd8.sfr@canb.auug.org.au> <20090923071152.GA8000@barkeeper1-xen.linbit> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <20090923071152.GA8000@barkeeper1-xen.linbit> User-Agent: Mutt/1.5.18 (2008-05-17) Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Length: 1607 Lines: 46 On Wed, Sep 23, 2009 at 09:11:52AM +0200, Lars Ellenberg wrote: > 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. Sorry that it took me so long to have that look. We can simply drop that include, we don't even use it. diff --git a/drivers/block/drbd/drbd_tracing.c b/drivers/block/drbd/drbd_tracing.c index aefe986..d18d4f7 100644 --- a/drivers/block/drbd/drbd_tracing.c +++ b/drivers/block/drbd/drbd_tracing.c @@ -26,7 +26,6 @@ #include #include #include -#include #include "drbd_int.h" #include "drbd_tracing.h" #include Will be visible in our tree shortly. Thanks, Lars -- To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/