Hi all,
Please do not add code destined for 2.6.33 into linux-next trees until
(at least) 2.6.32-rc1 is out. This will hopefully give those who have
stuff destined for just after -rc1 a chance.
Changes since 20090925:
We are seeing conflicts resolved and move from one tree to another as
Linus merges them.
My fixes tree contains a build fix for powerpc/kvm.
The arm-current tree lost its conflict.
The sparc-current tree gained a conflict against Linus' tree.
The net-current tree lost its conflicts.
The cifs tree lost its build failures.
The acpi tree gained a build failure so I used the version from
next-20090925.
----------------------------------------------------------------------------
I have created today's linux-next tree at
git://git.kernel.org/pub/scm/linux/kernel/git/next/linux-next.git
(patches at http://www.kernel.org/pub/linux/kernel/v2.6/next/ ). If you
are tracking the linux-next tree using git, you should not use "git pull"
to do so as that will try to merge the new linux-next release with the
old one. You should use "git fetch" as mentioned in the FAQ on the wiki
(see below).
You can see which trees have been included by looking in the Next/Trees
file in the source. There are also quilt-import.log and merge.log files
in the Next directory. Between each merge, the tree was built with
a ppc64_defconfig for powerpc and an allmodconfig for x86_64. After the
final fixups (if any), it is also built with powerpc allnoconfig (32 and
64 bit), ppc44x_defconfig and allyesconfig (minus
CONFIG_PROFILE_ALL_BRANCHES - this fails its final link) and i386, sparc
and sparc64 defconfig. These builds also have
CONFIG_ENABLE_WARN_DEPRECATED, CONFIG_ENABLE_MUST_CHECK and
CONFIG_DEBUG_INFO disabled when necessary.
Below is a summary of the state of the merge.
We are up to 139 trees (counting Linus' and 21 trees of patches pending for
Linus' tree), more are welcome (even if they are currently empty).
Thanks to those who have contributed, and to those who haven't, please do.
Status of my local build tests will be at
http://kisskb.ellerman.id.au/linux-next . If maintainers want to give
advice about cross compilers/configs that work, we are always open to add
more builds.
Thanks to Jan Dittmer for adding the linux-next tree to his build tests
at http://l4x.org/k/ , the guys at http://test.kernel.org/ and Randy
Dunlap for doing many randconfig builds.
There is a wiki covering stuff to do with linux-next at
http://linux.f-seidel.de/linux-next/pmwiki/ . Thanks to Frank Seidel.
--
Cheers,
Stephen Rothwell [email protected]
$ git checkout master
$ git reset --hard stable
Merging origin/master
Merging fixes/fixes
Merging arm-current/master
Merging m68k-current/for-linus
Merging powerpc-merge/merge
Merging sparc-current/master
CONFLICT (content): Merge conflict in arch/sparc/include/asm/vio.h
Merging scsi-rc-fixes/master
Merging net-current/master
Merging sound-current/for-linus
Merging pci-current/for-linus
Merging wireless-current/master
Merging kbuild-current/master
Merging quilt/driver-core.current
Merging quilt/tty.current
Merging quilt/usb.current
CONFLICT (content): Merge conflict in drivers/usb/host/xhci-hcd.c
CONFLICT (content): Merge conflict in drivers/usb/host/xhci-mem.c
CONFLICT (content): Merge conflict in drivers/usb/host/xhci-ring.c
CONFLICT (content): Merge conflict in drivers/usb/host/xhci.h
Merging cpufreq-current/fixes
Merging input-current/for-linus
Merging md-current/for-linus
Merging audit-current/for-linus
Merging crypto-current/master
Merging ide-curent/master
Merging dwmw2/master
Merging arm/devel
Merging davinci/for-next
Merging pxa/for-next
Merging thumb-2/thumb-2
Merging avr32/avr32-arch
Merging blackfin/for-linus
Merging cris/for-next
Merging ia64/test
Merging m68k/for-next
CONFLICT (content): Merge conflict in drivers/rtc/Kconfig
Merging m68knommu/for-next
Merging microblaze/next
Merging mips/mips-for-linux-next
CONFLICT (content): Merge conflict in arch/mips/Kconfig
CONFLICT (add/add): Merge conflict in arch/mips/bcm63xx/Makefile
CONFLICT (add/add): Merge conflict in arch/mips/bcm63xx/boards/board_bcm963xx.c
CONFLICT (delete/modify): arch/mips/lemote/lm2e/Makefile deleted in HEAD and modified in mips/mips-for-linux-next. Version mips/mips-for-linux-next of arch/mips/lemote/lm2e/Makefile left in tree.
CONFLICT (delete/modify): arch/mips/lemote/lm2e/pci.c deleted in HEAD and modified in mips/mips-for-linux-next. Version mips/mips-for-linux-next of arch/mips/lemote/lm2e/pci.c left in tree.
CONFLICT (delete/modify): arch/mips/lemote/lm2e/prom.c deleted in HEAD and modified in mips/mips-for-linux-next. Version mips/mips-for-linux-next of arch/mips/lemote/lm2e/prom.c left in tree.
$ git rm -f arch/mips/lemote/lm2e/Makefile arch/mips/lemote/lm2e/pci.c arch/mips/lemote/lm2e/prom.c
Merging parisc/next
CONFLICT (content): Merge conflict in arch/parisc/include/asm/thread_info.h
CONFLICT (content): Merge conflict in arch/parisc/kernel/entry.S
CONFLICT (content): Merge conflict in arch/parisc/kernel/signal.c
Merging powerpc/next
Merging 4xx/next
Merging galak/next
Merging s390/features
Merging sh/master
Merging sparc/master
Merging xtensa/master
Merging cifs/master
Merging configfs/linux-next
Merging ecryptfs/next
Merging ext3/for_next
Merging ext4/next
Merging fatfs/master
Merging fuse/for-next
Merging gfs2/master
Merging jfs/next
Merging nfs/linux-next
Merging nfsd/nfsd-next
Merging nilfs2/for-next
Merging ocfs2/linux-next
Merging squashfs/master
Merging udf/for_next
Merging v9fs/for-next
Merging ubifs/linux-next
Merging xfs/master
Merging vfs/for-next
Merging pci/linux-next
Merging hid/for-next
Merging quilt/i2c
Merging quilt/jdelvare-hwmon
Merging quilt/kernel-doc
Merging v4l-dvb/master
Merging quota/for_next
Merging kbuild/master
Merging kconfig/for-next
Merging ide/master
Merging libata/NEXT
Merging infiniband/for-next
Merging acpi/test
$ git reset --hard HEAD^
Merging refs/next/20090925/acpi
Merging ieee1394/for-next
Merging ubi/linux-next
Merging kvm/linux-next
Merging dlm/next
Merging scsi/master
Merging async_tx/next
Merging net/master
Merging wireless/master
Merging mtd/master
Merging crypto/master
Merging sound/for-next
Merging cpufreq/next
Merging quilt/rr
Merging mmc/next
Merging input/next
Merging lsm/for-next
Merging block/for-next
CONFLICT (content): Merge conflict in fs/fs-writeback.c
Merging quilt/device-mapper
Merging embedded/master
Merging firmware/master
Merging pcmcia/master
Merging battery/master
Merging leds/for-mm
Merging backlight/for-mm
CONFLICT (content): Merge conflict in drivers/video/backlight/da903x_bl.c
Merging kgdb/kgdb-next
Merging slab/for-next
Merging uclinux/for-next
Merging md/for-next
Merging mfd/for-next
Merging hdlc/hdlc-next
Merging drm/drm-next
Merging voltage/for-next
Merging security-testing/next
Merging lblnet/master
Merging agp/agp-next
Merging uwb/for-upstream
Merging watchdog/master
Merging bdev/master
Merging dwmw2-iommu/master
Merging cputime/cputime
Merging osd/linux-next
Merging jc_docs/docs-next
Merging nommu/master
Merging trivial/for-next
Merging audit/for-next
Merging omap/for-next
Merging quilt/aoe
Merging suspend/linux-next
Merging bluetooth/master
Merging fsnotify/for-next
Merging irda/for-next
Merging hwlat/for-linus
Merging drbd/drbd
Merging kmemleak/kmemleak
Merging tip/auto-latest
Merging oprofile/for-next
Merging percpu/for-next
Merging sfi/sfi-test
Merging asm-generic/next
Merging hwpoison/hwpoison
Merging quilt/driver-core
Merging quilt/tty
Merging quilt/usb
CONFLICT (content): Merge conflict in drivers/usb/serial/sierra.c
Merging quilt/staging
Merging scsi-post-merge/master
CONFLICT (content): Merge conflict in MAINTAINERS
CONFLICT (content): Merge conflict in drivers/scsi/Makefile
CONFLICT (content): Merge conflict in drivers/scsi/fcoe/fcoe.c
CONFLICT (content): Merge conflict in drivers/scsi/fcoe/fcoe.h
CONFLICT (content): Merge conflict in drivers/scsi/libfc/fc_elsct.c
CONFLICT (content): Merge conflict in drivers/scsi/libfc/fc_lport.c
CONFLICT (add/add): Merge conflict in drivers/scsi/pmcraid.c
CONFLICT (content): Merge conflict in include/scsi/fc_encode.h
CONFLICT (content): Merge conflict in include/scsi/libfc.h
CONFLICT (content): Merge conflict in kernel/sysctl.c
Hi Sam,
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 <[email protected]>
--
drivers/block/drbd/drbd_main.c | 1 -
drivers/block/drbd/drbd_nl.c | 1 -
drivers/block/drbd/drbd_proc.c | 1 -
drivers/block/drbd/drbd_receiver.c | 1 -
drivers/block/drbd/drbd_req.c | 1 -
drivers/block/drbd/drbd_req.h | 1 -
drivers/block/drbd/drbd_worker.c | 1 -
drivers/staging/cowloop/cowloop.c | 4 ----
drivers/staging/iio/ring_sw.h | 1 -
9 files changed, 0 insertions(+), 12 deletions(-)
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 <linux/autoconf.h>
#include <linux/module.h>
#include <linux/version.h>
#include <linux/drbd.h>
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 <linux/autoconf.h>
#include <linux/module.h>
#include <linux/drbd.h>
#include <linux/in.h>
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 <linux/autoconf.h>
#include <linux/module.h>
#include <asm/uaccess.h>
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 <linux/autoconf.h>
#include <linux/module.h>
#include <asm/uaccess.h>
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 <linux/autoconf.h>
#include <linux/module.h>
#include <linux/slab.h>
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 <linux/autoconf.h>
#include <linux/module.h>
#include <linux/slab.h>
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 <linux/autoconf.h>
#include <linux/module.h>
#include <linux/version.h>
#include <linux/drbd.h>
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 <linux/types.h>
-#include <linux/autoconf.h>
-#ifndef AUTOCONF_INCLUDED
-#include <linux/config.h>
-#endif
#include <linux/module.h>
#include <linux/version.h>
#include <linux/moduleparam.h>
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 <linux/autoconf.h>
#include "iio.h"
#include "ring_generic.h"
Kamalesh
On Sat, Sep 26, 2009 at 11:01:43PM +0530, Kamalesh Babulal wrote:
> Hi Sam,
>
> 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 <[email protected]>
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.
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.
Patch is:
Acked-by: Sam Ravnborg <[email protected]>
Sam
> --
> drivers/block/drbd/drbd_main.c | 1 -
> drivers/block/drbd/drbd_nl.c | 1 -
> drivers/block/drbd/drbd_proc.c | 1 -
> drivers/block/drbd/drbd_receiver.c | 1 -
> drivers/block/drbd/drbd_req.c | 1 -
> drivers/block/drbd/drbd_req.h | 1 -
> drivers/block/drbd/drbd_worker.c | 1 -
> drivers/staging/cowloop/cowloop.c | 4 ----
> drivers/staging/iio/ring_sw.h | 1 -
> 9 files changed, 0 insertions(+), 12 deletions(-)
>
> 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 <linux/autoconf.h>
> #include <linux/module.h>
> #include <linux/version.h>
> #include <linux/drbd.h>
> 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 <linux/autoconf.h>
> #include <linux/module.h>
> #include <linux/drbd.h>
> #include <linux/in.h>
> 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 <linux/autoconf.h>
> #include <linux/module.h>
>
> #include <asm/uaccess.h>
> 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 <linux/autoconf.h>
> #include <linux/module.h>
>
> #include <asm/uaccess.h>
> 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 <linux/autoconf.h>
> #include <linux/module.h>
>
> #include <linux/slab.h>
> 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 <linux/autoconf.h>
> #include <linux/module.h>
>
> #include <linux/slab.h>
> 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 <linux/autoconf.h>
> #include <linux/module.h>
> #include <linux/version.h>
> #include <linux/drbd.h>
> 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 <linux/types.h>
> -#include <linux/autoconf.h>
> -#ifndef AUTOCONF_INCLUDED
> -#include <linux/config.h>
> -#endif
> #include <linux/module.h>
> #include <linux/version.h>
> #include <linux/moduleparam.h>
> 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 <linux/autoconf.h>
> #include "iio.h"
> #include "ring_generic.h"
>
>
> Kamalesh
>
>
Hi Greg, Philipp,
On Sat, 26 Sep 2009 22:08:39 +0200 Sam Ravnborg <[email protected]> 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 <[email protected]>
>
> 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 :-)
--
Cheers,
Stephen Rothwell [email protected]
http://www.canb.auug.org.au/~sfr/
Date: Sat, 26 Sep 2009 23:01:43 +0530
From: Kamalesh Babulal <[email protected]>
To: [email protected]
Cc: [email protected], LKML <[email protected]>,
[email protected], [email protected]
Subject: [PATCH] linux-next: 20090926 - drop autoconf.h from DRBD driver
Hi Sam,
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 <[email protected]>
Acked-by: Sam Ravnborg <[email protected]>
--
drivers/block/drbd/drbd_main.c | 1 -
drivers/block/drbd/drbd_nl.c | 1 -
drivers/block/drbd/drbd_proc.c | 1 -
drivers/block/drbd/drbd_receiver.c | 1 -
drivers/block/drbd/drbd_req.c | 1 -
drivers/block/drbd/drbd_req.h | 1 -
drivers/block/drbd/drbd_worker.c | 1 -
drivers/staging/cowloop/cowloop.c | 4 ----
drivers/staging/iio/ring_sw.h | 1 -
9 files changed, 0 insertions(+), 12 deletions(-)
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 <linux/autoconf.h>
#include <linux/module.h>
#include <linux/version.h>
#include <linux/drbd.h>
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 <linux/autoconf.h>
#include <linux/module.h>
#include <linux/drbd.h>
#include <linux/in.h>
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 <linux/autoconf.h>
#include <linux/module.h>
#include <asm/uaccess.h>
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 <linux/autoconf.h>
#include <linux/module.h>
#include <asm/uaccess.h>
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 <linux/autoconf.h>
#include <linux/module.h>
#include <linux/slab.h>
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 <linux/autoconf.h>
#include <linux/module.h>
#include <linux/slab.h>
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 <linux/autoconf.h>
#include <linux/module.h>
#include <linux/version.h>
#include <linux/drbd.h>
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 <linux/types.h>
-#include <linux/autoconf.h>
-#ifndef AUTOCONF_INCLUDED
-#include <linux/config.h>
-#endif
#include <linux/module.h>
#include <linux/version.h>
#include <linux/moduleparam.h>
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 <linux/autoconf.h>
#include "iio.h"
#include "ring_generic.h"
On Sun, 27 Sep 2009 12:53:31 +1000 Stephen Rothwell <[email protected]> wrote:
>
> 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 :-)
I should read the patch :-). Greg, obviously Kamalesh's patch hits the
staging files as well.
--
Cheers,
Stephen Rothwell [email protected]
http://www.canb.auug.org.au/~sfr/
* Sam Ravnborg <[email protected]> [2009-09-26 22:08:39]:
> On Sat, Sep 26, 2009 at 11:01:43PM +0530, Kamalesh Babulal wrote:
> > Hi Sam,
> >
> > 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 <[email protected]>
>
> 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.
>
> 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.
Sorry for being lazy here. The cleanup patch already drops
unneeded autoconf.h from next-20090926. Thanks to stephen
for greping through the files.
>
> Patch is:
>
> Acked-by: Sam Ravnborg <[email protected]>
>
> Sam
>
> > --
> > drivers/block/drbd/drbd_main.c | 1 -
> > drivers/block/drbd/drbd_nl.c | 1 -
> > drivers/block/drbd/drbd_proc.c | 1 -
> > drivers/block/drbd/drbd_receiver.c | 1 -
> > drivers/block/drbd/drbd_req.c | 1 -
> > drivers/block/drbd/drbd_req.h | 1 -
> > drivers/block/drbd/drbd_worker.c | 1 -
> > drivers/staging/cowloop/cowloop.c | 4 ----
> > drivers/staging/iio/ring_sw.h | 1 -
> > 9 files changed, 0 insertions(+), 12 deletions(-)
> >
> > 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 <linux/autoconf.h>
> > #include <linux/module.h>
> > #include <linux/version.h>
> > #include <linux/drbd.h>
> > 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 <linux/autoconf.h>
> > #include <linux/module.h>
> > #include <linux/drbd.h>
> > #include <linux/in.h>
> > 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 <linux/autoconf.h>
> > #include <linux/module.h>
> >
> > #include <asm/uaccess.h>
> > 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 <linux/autoconf.h>
> > #include <linux/module.h>
> >
> > #include <asm/uaccess.h>
> > 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 <linux/autoconf.h>
> > #include <linux/module.h>
> >
> > #include <linux/slab.h>
> > 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 <linux/autoconf.h>
> > #include <linux/module.h>
> >
> > #include <linux/slab.h>
> > 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 <linux/autoconf.h>
> > #include <linux/module.h>
> > #include <linux/version.h>
> > #include <linux/drbd.h>
> > 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 <linux/types.h>
> > -#include <linux/autoconf.h>
> > -#ifndef AUTOCONF_INCLUDED
> > -#include <linux/config.h>
> > -#endif
> > #include <linux/module.h>
> > #include <linux/version.h>
> > #include <linux/moduleparam.h>
> > 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 <linux/autoconf.h>
> > #include "iio.h"
> > #include "ring_generic.h"
> >
> >
> > Kamalesh
> >
> >
> --
> To unsubscribe from this list: send the line "unsubscribe linux-next" in
> the body of a message to [email protected]
> More majordomo info at http://vger.kernel.org/majordomo-info.html
Kamalesh
On Sun, Sep 27, 2009 at 12:53:31PM +1000, Stephen Rothwell wrote:
> Hi Greg, Philipp,
>
> On Sat, 26 Sep 2009 22:08:39 +0200 Sam Ravnborg <[email protected]> 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 <[email protected]>
> >
> > 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).
Thanks ;)
owed to our out-of-tree "backwards" compatibility for all 2.6 kernels
back to 2.6.5 (I think...).
includes have been dropped.
--
: 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.