Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751618AbZIWEvG (ORCPT ); Wed, 23 Sep 2009 00:51:06 -0400 Received: (majordomo@vger.kernel.org) by vger.kernel.org id S1751400AbZIWEvF (ORCPT ); Wed, 23 Sep 2009 00:51:05 -0400 Received: from chilli.pcug.org.au ([203.10.76.44]:35716 "EHLO smtps.tip.net.au" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751251AbZIWEvE (ORCPT ); Wed, 23 Sep 2009 00:51:04 -0400 Date: Wed, 23 Sep 2009 14:51:00 +1000 From: Stephen Rothwell To: Jens Axboe Cc: linux-next@vger.kernel.org, linux-kernel@vger.kernel.org, Philipp Reisner , , Lars Ellenberg , Christoph Hellwig Subject: linux-next: block tree build failure Message-Id: <20090923145100.1917fdd8.sfr@canb.auug.org.au> X-Mailer: Sylpheed 2.7.1 (GTK+ 2.16.6; i486-pc-linux-gnu) Mime-Version: 1.0 Content-Type: multipart/signed; protocol="application/pgp-signature"; micalg="PGP-SHA1"; boundary="Signature=_Wed__23_Sep_2009_14_51_00_+1000_md+gh/kdb37K7X/P" Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Length: 1486 Lines: 42 --Signature=_Wed__23_Sep_2009_14_51_00_+1000_md+gh/kdb37K7X/P Content-Type: text/plain; charset=US-ASCII Content-Disposition: inline Content-Transfer-Encoding: quoted-printable 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 fil= e 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. --=20 Cheers, Stephen Rothwell sfr@canb.auug.org.au http://www.canb.auug.org.au/~sfr/ --Signature=_Wed__23_Sep_2009_14_51_00_+1000_md+gh/kdb37K7X/P Content-Type: application/pgp-signature -----BEGIN PGP SIGNATURE----- Version: GnuPG v1.4.10 (GNU/Linux) iEYEARECAAYFAkq5qTQACgkQjjKRsyhoI8yIogCfQaEM3VhhBSBedoMUWkUR078q taUAnRAveRPQbl6/T0bYS22PKHQA0USY =QxaM -----END PGP SIGNATURE----- --Signature=_Wed__23_Sep_2009_14_51_00_+1000_md+gh/kdb37K7X/P-- -- 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/