From patchwork Sun Sep 27 02:53:31 2009 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Stephen Rothwell X-Patchwork-Id: 50279 Received: from vger.kernel.org (vger.kernel.org [209.132.176.167]) by demeter.kernel.org (8.14.2/8.14.2) with ESMTP id n8R2rcMR011323 for ; Sun, 27 Sep 2009 02:53:38 GMT Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753219AbZI0Cxd (ORCPT ); Sat, 26 Sep 2009 22:53:33 -0400 Received: (majordomo@vger.kernel.org) by vger.kernel.org id S1753207AbZI0Cxd (ORCPT ); Sat, 26 Sep 2009 22:53:33 -0400 Received: from chilli.pcug.org.au ([203.10.76.44]:34298 "EHLO smtps.tip.net.au" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1753199AbZI0Cxc (ORCPT ); Sat, 26 Sep 2009 22:53:32 -0400 Received: from canb.auug.org.au (ta-1-1.tip.net.au [203.11.71.1]) (using TLSv1 with cipher DHE-RSA-AES256-SHA (256/256 bits)) (No client certificate requested) by smtps.tip.net.au (Postfix) with ESMTPSA id DEA13144001; Sun, 27 Sep 2009 12:53:32 +1000 (EST) Date: Sun, 27 Sep 2009 12:53:31 +1000 From: Stephen Rothwell To: Greg KH , Philipp Reisner Cc: Kamalesh Babulal , linux-next@vger.kernel.org, LKML , linux-kbuild@vger.kernel.org, , Sam Ravnborg Subject: Re: [PATCH] linux-next: 20090926 - drop autoconf.h from DRBD driver Message-Id: <20090927125331.5367db08.sfr@canb.auug.org.au> In-Reply-To: <20090926200839.GA5220@merkur.ravnborg.org> References: <20090926152800.a6568e53.sfr@canb.auug.org.au> <20090926173143.GA5041@linux.vnet.ibm.com> <20090926200839.GA5220@merkur.ravnborg.org> X-Mailer: Sylpheed 2.7.1 (GTK+ 2.18.0; i486-pc-linux-gnu) Mime-Version: 1.0 Sender: linux-kbuild-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kbuild@vger.kernel.org Hi Greg, Philipp, On Sat, 26 Sep 2009 22:08:39 +0200 Sam Ravnborg wrote: > > On Sat, Sep 26, 2009 at 11:01:43PM +0530, Kamalesh Babulal wrote: > > > > next-20090926 allyesconfig build breaks on powerpc, > > > > drivers/block/drbd/drbd_proc.c:26:28: error: linux/autoconf.h: No such file or directory > > make[3]: *** [drivers/block/drbd/drbd_proc.o] Error 1 > > > > dropping autoconf.h from drbd_proc.c helps. The cleanup patch drops the > > unneeded include autoconf.h. > > > > Signed-off-by: Kamalesh Babulal > > I only checked upstream - so this is no big suprise. > As there is no need to explicitly include autoconf.h this > change should be included by the drdb folks even if the > stuff I have does not hit upstream. Maybe we should let them know (cc'd). > Can I ask you to audit the rest of -next for similar issues. > A 'git grep "autoconf\.h"' should be a qucik way to find other > spots to fix up. $ git grep -l -w autoconf.h next-20090926 next-20090926:Documentation/dontdiff next-20090926:Documentation/kbuild/kconfig.txt next-20090926:Makefile next-20090926:arch/m68k/kernel/head.S next-20090926:drivers/block/drbd/drbd_main.c next-20090926:drivers/block/drbd/drbd_nl.c next-20090926:drivers/block/drbd/drbd_proc.c next-20090926:drivers/block/drbd/drbd_receiver.c next-20090926:drivers/block/drbd/drbd_req.c next-20090926:drivers/block/drbd/drbd_req.h next-20090926:drivers/block/drbd/drbd_worker.c next-20090926:drivers/staging/cowloop/cowloop.c next-20090926:drivers/staging/iio/ring_sw.h next-20090926:scripts/basic/fixdep.c next-20090926:scripts/kconfig/confdata.c next-20090926:scripts/mkcompile_h Of these, only the dives/block/drbd and drivers/staging ones are actual includes. So for Greg and Philipp, Sam has added a patch that moves autoconf.h. There is no need to include it anywhere anyway, so the above files need cleaning up. I have appended Kamalesh's patch below. Greg, you may have to write your own :-) diff --git a/drivers/block/drbd/drbd_main.c b/drivers/block/drbd/drbd_main.c index edf0b80..80273f2 100644 --- a/drivers/block/drbd/drbd_main.c +++ b/drivers/block/drbd/drbd_main.c @@ -26,7 +26,6 @@ */ -#include #include #include #include diff --git a/drivers/block/drbd/drbd_nl.c b/drivers/block/drbd/drbd_nl.c index 1927ace..cfde310 100644 --- a/drivers/block/drbd/drbd_nl.c +++ b/drivers/block/drbd/drbd_nl.c @@ -23,7 +23,6 @@ */ -#include #include #include #include diff --git a/drivers/block/drbd/drbd_proc.c b/drivers/block/drbd/drbd_proc.c index 98fcb74..bdd0b49 100644 --- a/drivers/block/drbd/drbd_proc.c +++ b/drivers/block/drbd/drbd_proc.c @@ -23,7 +23,6 @@ */ -#include #include #include diff --git a/drivers/block/drbd/drbd_receiver.c b/drivers/block/drbd/drbd_receiver.c index 63686c4..2f81821 100644 --- a/drivers/block/drbd/drbd_receiver.c +++ b/drivers/block/drbd/drbd_receiver.c @@ -23,7 +23,6 @@ */ -#include #include #include diff --git a/drivers/block/drbd/drbd_req.c b/drivers/block/drbd/drbd_req.c index 0656cf1..1aaa397 100644 --- a/drivers/block/drbd/drbd_req.c +++ b/drivers/block/drbd/drbd_req.c @@ -23,7 +23,6 @@ */ -#include #include #include diff --git a/drivers/block/drbd/drbd_req.h b/drivers/block/drbd/drbd_req.h index d37ab57..f22c1bc 100644 --- a/drivers/block/drbd/drbd_req.h +++ b/drivers/block/drbd/drbd_req.h @@ -25,7 +25,6 @@ #ifndef _DRBD_REQ_H #define _DRBD_REQ_H -#include #include #include diff --git a/drivers/block/drbd/drbd_worker.c b/drivers/block/drbd/drbd_worker.c index 212e954..34a4b3e 100644 --- a/drivers/block/drbd/drbd_worker.c +++ b/drivers/block/drbd/drbd_worker.c @@ -23,7 +23,6 @@ */ -#include #include #include #include diff --git a/drivers/staging/cowloop/cowloop.c b/drivers/staging/cowloop/cowloop.c index a71c743..a21b9b4 100644 --- a/drivers/staging/cowloop/cowloop.c +++ b/drivers/staging/cowloop/cowloop.c @@ -237,10 +237,6 @@ char revision[] = "$Revision: 3.1 $"; /* cowlo_init_module() has #endif #include -#include -#ifndef AUTOCONF_INCLUDED -#include -#endif #include #include #include diff --git a/drivers/staging/iio/ring_sw.h b/drivers/staging/iio/ring_sw.h index ae70ee0..4b0de7c 100644 --- a/drivers/staging/iio/ring_sw.h +++ b/drivers/staging/iio/ring_sw.h @@ -29,7 +29,6 @@ * driver requests - some may support multiple options */ -#include #include "iio.h" #include "ring_generic.h"