* Re: [PATCH] linux-next: 20090926 - drop autoconf.h from DRBD driver
From: Stephen Rothwell @ 2009-09-27 2:53 UTC (permalink / raw)
To: Greg KH, Philipp Reisner
Cc: Kamalesh Babulal, linux-next, LKML, linux-kbuild, drbd-dev,
Sam Ravnborg
In-Reply-To: <20090926200839.GA5220@merkur.ravnborg.org>
Hi Greg, Philipp,
On Sat, 26 Sep 2009 22:08:39 +0200 Sam Ravnborg <sam@ravnborg.org> 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 <kamalesh@linux.vnet.ibm.com>
>
> 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 sfr@canb.auug.org.au
http://www.canb.auug.org.au/~sfr/
Date: Sat, 26 Sep 2009 23:01:43 +0530
From: Kamalesh Babulal <kamalesh@linux.vnet.ibm.com>
To: sam@ravnborg.org
Cc: linux-next@vger.kernel.org, LKML <linux-kernel@vger.kernel.org>,
linux-kbuild@vger.kernel.org, sfr@canb.auug.org.au
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 <kamalesh@linux.vnet.ibm.com>
Acked-by: Sam Ravnborg <sam@ravnborg.org>
--
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"
^ permalink raw reply related
* Re: [PATCH] linux-next: 20090926 - drop autoconf.h from DRBD driver
From: Stephen Rothwell @ 2009-09-27 2:59 UTC (permalink / raw)
To: Greg KH, Philipp Reisner
Cc: linux-kbuild-u79uwXL29TY76Z2rM5mHXA, LKML, Kamalesh Babulal,
linux-next-u79uwXL29TY76Z2rM5mHXA, Sam Ravnborg,
drbd-dev-cunTk1MwBs8qoQakbn7OcQ
In-Reply-To: <20090927125331.5367db08.sfr-3FnU+UHB4dNDw9hX6IcOSA@public.gmane.org>
[-- Attachment #1.1: Type: text/plain, Size: 590 bytes --]
On Sun, 27 Sep 2009 12:53:31 +1000 Stephen Rothwell <sfr-3FnU+UHB4dNDw9hX6IcOSA@public.gmane.org> 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 sfr-3FnU+UHB4dNDw9hX6IcOSA@public.gmane.org
http://www.canb.auug.org.au/~sfr/
[-- Attachment #1.2: Type: application/pgp-signature, Size: 198 bytes --]
[-- Attachment #2: Type: text/plain, Size: 169 bytes --]
_______________________________________________
drbd-dev mailing list
drbd-dev-cunTk1MwBs8qoQakbn7OcQ@public.gmane.org
http://lists.linbit.com/mailman/listinfo/drbd-dev
^ permalink raw reply
* Re: linux-next: manual merge of the sparc-current tree with Linus' tree
From: David Miller @ 2009-09-27 3:20 UTC (permalink / raw)
To: sfr; +Cc: linux-next, linux-kernel, JBeulich, akpm
In-Reply-To: <20090926110158.0fcd2763.sfr@canb.auug.org.au>
From: Stephen Rothwell <sfr@canb.auug.org.au>
Date: Sat, 26 Sep 2009 11:01:58 +1000
> Today's linux-next merge of the sparc-current tree got a conflict in
> arch/sparc/include/asm/vio.h between commit
> 8c87df457cb58fe75b9b893007917cf8095660a0 ("BUILD_BUG_ON(): fix it and a
> couple of bogus uses of it") from Linus' tree and commit
> 87ba00515657eede6077fa195ca6592b98cc31e3 ("sparc64: vio: Kill BUILD_BUG_ON
> () in vio_dring_avail()") from the sparc-current tree.
>
> I just used the sparc-current version for today.
Thanks Stephen. When Linus pulled in my tree he resolved the
merge conflict and thus you shouldn't have to deal with this
any more either.
^ permalink raw reply
* Re: [PATCH] linux-next: 20090926 - drop autoconf.h from DRBD driver
From: Kamalesh Babulal @ 2009-09-27 5:43 UTC (permalink / raw)
To: Sam Ravnborg; +Cc: linux-next, LKML, linux-kbuild, sfr
In-Reply-To: <20090926200839.GA5220@merkur.ravnborg.org>
* Sam Ravnborg <sam@ravnborg.org> [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 <kamalesh@linux.vnet.ibm.com>
>
> 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 <sam@ravnborg.org>
>
> 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 majordomo@vger.kernel.org
> More majordomo info at http://vger.kernel.org/majordomo-info.html
Kamalesh
^ permalink raw reply
* linux-next: Tree for September 27
From: Stephen Rothwell @ 2009-09-27 5:47 UTC (permalink / raw)
To: linux-next; +Cc: LKML
[-- Attachment #1: Type: text/plain, Size: 8482 bytes --]
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 20090926:
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 sparc-current tree lost its conflict.
The acpi tree lost its build failure.
The backlight tree lost its conflict.
I added a patch to remove includes of autoconf.h that were causing some
build failures.
----------------------------------------------------------------------------
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 sfr@canb.auug.org.au
$ 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
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
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
CONFLICT (content): Merge conflict in mm/page-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
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 arch/x86/kernel/early_printk.c
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 (add/add): Merge conflict in drivers/scsi/pmcraid.h
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
Applying: linux-next: 20090926 - drop autoconf.h from DRBD driver
[-- Attachment #2: Type: application/pgp-signature, Size: 198 bytes --]
^ permalink raw reply
* linux-next: scsi tree boot filure
From: Stephen Rothwell @ 2009-09-27 6:43 UTC (permalink / raw)
To: James Bottomley; +Cc: linux-next, LKML, James Smart
[-- Attachment #1: Type: text/plain, Size: 5630 bytes --]
Hi James,
next-20090926 does not boot on some of my PowerPC partitions:
calling .ibmvscsi_module_init+0x0/0xb8 @ 1
ibmvscsi 30000028: SRP_VERSION: 16.a
scsi0 : IBM POWER Virtual SCSI Adapter 1.5.8
ibmvscsi 30000028: partner initialization complete
ibmvscsi 30000028: host srp version: 16.a, host partition 1-Didgo-VIOS (1), OS 3, max io 1048576
ibmvscsi 30000028: Client reserve enabled
ibmvscsi 30000028: sent SRP login
ibmvscsi 30000028: SRP_LOGIN succeeded
Unable to handle kernel paging request for data at address 0x00000058
Faulting instruction address: 0xc0000000003a6280
Oops: Kernel access of bad area, sig: 11 [#1]
SMP NR_CPUS=128 NUMA pSeries
Modules linked in:
NIP: c0000000003a6280 LR: c0000000003a63b4 CTR: 0000000000000000
REGS: c00000007c3f3020 TRAP: 0300 Not tainted (2.6.31-autokern1)
MSR: 8000000000009032 <EE,ME,IR,DR> CR: 24002042 XER: 00000001
DAR: 0000000000000058, DSISR: 0000000040000000
TASK = c00000007c3e8000[1] 'swapper' THREAD: c00000007c3f0000 CPU: 3
GPR00: 0000000000000000 c00000007c3f32a0 c000000000bc5390 c000000000a76420
GPR04: c000000000b97818 c0000000015abc70 0000000000000000 c00000007c81c918
GPR08: c00000007c81c888 0000000002000000 0000000000000002 c0000000014ecbcc
GPR12: 0000000024000042 c000000000c1ea80 0000000003500000 c00000000074af10
GPR16: c000000000749588 0000000000000000 0000000000000000 0000000000000000
GPR20: c00000007c3f3600 c000000079074c00 c00000007c81c000 0000000002f1f8e0
GPR24: 0000000000000000 0000000000000000 0000000000000000 c000000079074c28
GPR28: c00000007c81c000 0000000000000000 c000000000b353f0 c000000000b97818
NIP [c0000000003a6280] .__scsi_alloc_queue+0x2c/0x13c
LR [c0000000003a63b4] .scsi_alloc_queue+0x24/0x84
Call Trace:
[c00000007c3f32a0] [c00000007c3f3330] 0xc00000007c3f3330 (unreliable)
[c00000007c3f3330] [c0000000003a63b4] .scsi_alloc_queue+0x24/0x84
[c00000007c3f33b0] [c0000000003a8f78] .scsi_alloc_sdev+0x198/0x2ac
[c00000007c3f3470] [c0000000003a9450] .scsi_probe_and_add_lun+0x130/0xaac
[c00000007c3f3580] [c0000000003aa20c] .__scsi_scan_target+0xf4/0x5fc
[c00000007c3f36a0] [c0000000003aa768] .scsi_scan_channel+0x54/0xd0
[c00000007c3f3740] [c0000000003aa8b0] .scsi_scan_host_selected+0xcc/0x144
[c00000007c3f37f0] [c0000000003d5264] .ibmvscsi_probe+0x590/0x6e4
[c00000007c3f38c0] [c000000000021e88] .vio_bus_probe+0x84/0xb0
[c00000007c3f3960] [c00000000037cbac] .driver_probe_device+0xfc/0x1c0
[c00000007c3f39f0] [c00000000037cd04] .__driver_attach+0x94/0xd8
[c00000007c3f3a80] [c00000000037b9f8] .bus_for_each_dev+0x84/0xdc
[c00000007c3f3b30] [c00000000037c954] .driver_attach+0x28/0x40
[c00000007c3f3bb0] [c00000000037c290] .bus_add_driver+0x148/0x314
[c00000007c3f3c60] [c00000000037d1b0] .driver_register+0xd4/0x1a8
[c00000007c3f3d10] [c000000000021cbc] .vio_register_driver+0x40/0x5c
[c00000007c3f3da0] [c00000000084f418] .ibmvscsi_module_init+0x80/0xb8
[c00000007c3f3e30] [c0000000000094c8] .do_one_initcall+0x9c/0x1cc
[c00000007c3f3ee0] [c000000000822cc0] .kernel_init+0x21c/0x298
[c00000007c3f3f90] [c000000000026cb8] .kernel_thread+0x54/0x70
Instruction dump:
4e800020 7c0802a6 fb81ffe0 fbe1fff8 fba1ffe8 7c7c1b78 f8010010 f821ff71
7c9f2378 eba302a0 48000008 ebbd0000 <e81d0058> 7fa3eb78 2fa00000 419efff0
---[ end trace 18604a042ee6e0ba ]---
Kernel panic - not syncing: Attempted to kill init!
Call Trace:
[c00000007c3f2c80] [c00000000001024c] .show_stack+0x70/0x184 (unreliable)
[c00000007c3f2d30] [c00000000006a410] .panic+0x80/0x1b4
[c00000007c3f2dd0] [c00000000006eca4] .do_exit+0x84/0x728
[c00000007c3f2e90] [c000000000024d2c] .die+0x24c/0x27c
[c00000007c3f2f30] [c0000000000330c8] .bad_page_fault+0xb8/0xd4
[c00000007c3f2fb0] [c0000000000051dc] handle_page_fault+0x3c/0x74
--- Exception: 300 at .__scsi_alloc_queue+0x2c/0x13c
LR = .scsi_alloc_queue+0x24/0x84
[c00000007c3f32a0] [c00000007c3f3330] 0xc00000007c3f3330 (unreliable)
[c00000007c3f3330] [c0000000003a63b4] .scsi_alloc_queue+0x24/0x84
[c00000007c3f33b0] [c0000000003a8f78] .scsi_alloc_sdev+0x198/0x2ac
[c00000007c3f3470] [c0000000003a9450] .scsi_probe_and_add_lun+0x130/0xaac
[c00000007c3f3580] [c0000000003aa20c] .__scsi_scan_target+0xf4/0x5fc
[c00000007c3f36a0] [c0000000003aa768] .scsi_scan_channel+0x54/0xd0
[c00000007c3f3740] [c0000000003aa8b0] .scsi_scan_host_selected+0xcc/0x144
[c00000007c3f37f0] [c0000000003d5264] .ibmvscsi_probe+0x590/0x6e4
[c00000007c3f38c0] [c000000000021e88] .vio_bus_probe+0x84/0xb0
[c00000007c3f3960] [c00000000037cbac] .driver_probe_device+0xfc/0x1c0
[c00000007c3f39f0] [c00000000037cd04] .__driver_attach+0x94/0xd8
[c00000007c3f3a80] [c00000000037b9f8] .bus_for_each_dev+0x84/0xdc
[c00000007c3f3b30] [c00000000037c954] .driver_attach+0x28/0x40
[c00000007c3f3bb0] [c00000000037c290] .bus_add_driver+0x148/0x314
[c00000007c3f3c60] [c00000000037d1b0] .driver_register+0xd4/0x1a8
[c00000007c3f3d10] [c000000000021cbc] .vio_register_driver+0x40/0x5c
[c00000007c3f3da0] [c00000000084f418] .ibmvscsi_module_init+0x80/0xb8
[c00000007c3f3e30] [c0000000000094c8] .do_one_initcall+0x9c/0x1cc
[c00000007c3f3ee0] [c000000000822cc0] .kernel_init+0x21c/0x298
[c00000007c3f3f90] [c000000000026cb8] .kernel_thread+0x54/0x70
Rebooting in 180 seconds..
I have bisected this down to commit
4acd10521ee002137b5d6791e234d7110033c782 ("[SCSI] scsi_lib_dma.c : fix
bug /w dma maps on virtual vc ports") which was added between
next-20090925 and next-20090926.
Reverting that single commit from next-20090926 allows it to boot.
--
Cheers,
Stephen Rothwell sfr@canb.auug.org.au
http://www.canb.auug.org.au/~sfr/
[-- Attachment #2: Type: application/pgp-signature, Size: 198 bytes --]
^ permalink raw reply
* Re: linux-next: acpi tree build failure
From: Len Brown @ 2009-09-27 7:54 UTC (permalink / raw)
To: Crane Cai; +Cc: Bjorn Helgaas, Stephen Rothwell, linux-next, linux-kernel
In-Reply-To: <20090927012716.GB10173@crane-desktop>
> > > drivers/i2c/busses/i2c-scmi.c: In function 'acpi_smbus_cmi_add':
> > > drivers/i2c/busses/i2c-scmi.c:374: error: implicit declaration of function 'acpi_device_uid'
> > > drivers/i2c/busses/i2c-scmi.c:374: warning: format '%s' expects type 'char *', but argument 5 has type 'int'
> > >
> > > Caused by commit 6622d8cee73a26bce958484065c8f0e704911a62 ("ACPI: remove
> > > acpi_device_uid() and related stuff") interacting with commit
> > > dc9854212e0d7318d7133697906d98b78f3088b6 ("i2c: Add driver for SMBus
> > > Control Method Interface") recently added to Linus' tree.
> > >
> > > I have used the version of the acpi tree from next-20090925 for today.
> >
> > I think we should use the following patch to remove the usage of
> > acpi_device_uid(). Crane, do you agree, or is there some special
> > reason you need it here?
> I agree.
Thanks Crane, upstream now includes Bjorn's patch.
-Len Brown, Intel Open Source Technology Center
^ permalink raw reply
* Re: linux-next: scsi tree boot filure
From: Stephen Rothwell @ 2009-09-28 4:07 UTC (permalink / raw)
To: James Bottomley; +Cc: linux-next, LKML, James Smart
In-Reply-To: <20090927164314.9377c24c.sfr@canb.auug.org.au>
[-- Attachment #1: Type: text/plain, Size: 550 bytes --]
Hi James,
On Sun, 27 Sep 2009 16:43:14 +1000 Stephen Rothwell <sfr@canb.auug.org.au> wrote:
>
> I have bisected this down to commit
> 4acd10521ee002137b5d6791e234d7110033c782 ("[SCSI] scsi_lib_dma.c : fix
> bug /w dma maps on virtual vc ports") which was added between
> next-20090925 and next-20090926.
>
> Reverting that single commit from next-20090926 allows it to boot.
I have reverted this commit from linux-next today.
--
Cheers,
Stephen Rothwell sfr@canb.auug.org.au
http://www.canb.auug.org.au/~sfr/
[-- Attachment #2: Type: application/pgp-signature, Size: 198 bytes --]
^ permalink raw reply
* linux-next: Tree for September 28
From: Stephen Rothwell @ 2009-09-28 4:21 UTC (permalink / raw)
To: linux-next; +Cc: LKML
[-- Attachment #1: Type: text/plain, Size: 8251 bytes --]
Hi all,
Changes since 20090927:
My fixes tree contains a build fix for powerpc/kvm.
I reverted a commit from the scsi tree that causes a boot failure.
I added a patch to remove includes of autoconf.h that were causing some
build failures.
----------------------------------------------------------------------------
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 sfr@canb.auug.org.au
$ 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
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
Merging ieee1394/for-next
Merging ubi/linux-next
Merging kvm/linux-next
Merging dlm/next
Merging scsi/master
$ git am -3 ../patches/0001-Revert-SCSI-scsi_lib_dma.c-fix-bug-w-dma-maps-on-vir.patch
Applying: Revert "[SCSI] scsi_lib_dma.c : fix bug /w dma maps on virtual vc ports"
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
CONFLICT (content): Merge conflict in mm/page-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
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 arch/x86/kernel/early_printk.c
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/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 (add/add): Merge conflict in drivers/scsi/pmcraid.h
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
Applying: linux-next: 20090926 - drop autoconf.h from DRBD driver
[-- Attachment #2: Type: application/pgp-signature, Size: 198 bytes --]
^ permalink raw reply
* [PATCH -next] sh: fix up the machtypes.h move.
From: Paul Mundt @ 2009-09-28 7:33 UTC (permalink / raw)
To: Sam Ravnborg; +Cc: linux-next
rts7751r2d PCI support is referencing the old asm/ version.
Signed-off-by: Paul Mundt <lethal@linux-sh.org>
---
arch/sh/drivers/pci/fixups-rts7751r2d.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/arch/sh/drivers/pci/fixups-rts7751r2d.c b/arch/sh/drivers/pci/fixups-rts7751r2d.c
index 052b354..7898f14 100644
--- a/arch/sh/drivers/pci/fixups-rts7751r2d.c
+++ b/arch/sh/drivers/pci/fixups-rts7751r2d.c
@@ -15,7 +15,7 @@
#include <mach/lboxre2.h>
#include <mach/r2d.h>
#include "pci-sh4.h"
-#include <asm/machtypes.h>
+#include <generated/machtypes.h>
#define PCIMCR_MRSET_OFF 0xBFFFFFFF
#define PCIMCR_RFSH_OFF 0xFFFFFFFB
^ permalink raw reply related
* Re: [PATCH -next] sh: fix up the machtypes.h move.
From: Sam Ravnborg @ 2009-09-28 7:49 UTC (permalink / raw)
To: Paul Mundt; +Cc: linux-next
In-Reply-To: <20090928073327.GC6668@linux-sh.org>
On Mon, Sep 28, 2009 at 04:33:27PM +0900, Paul Mundt wrote:
> rts7751r2d PCI support is referencing the old asm/ version.
>
> Signed-off-by: Paul Mundt <lethal@linux-sh.org>
Thanks.
Linus did not take this patchset before -rc1 :-(
So I think it may have to wait until next merge window in which case
I will submit the sh specific bits to you with this patch included.
Sam
^ permalink raw reply
* Re: [Drbd-dev] [PATCH] linux-next: 20090926 - drop autoconf.h from DRBD driver
From: Lars Ellenberg @ 2009-09-28 8:50 UTC (permalink / raw)
To: Stephen Rothwell
Cc: Greg KH, Philipp Reisner, linux-kbuild, LKML, Kamalesh Babulal,
linux-next, Sam Ravnborg, drbd-dev
In-Reply-To: <20090927125331.5367db08.sfr@canb.auug.org.au>
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 <sam@ravnborg.org> 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 <kamalesh@linux.vnet.ibm.com>
> >
> > 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.
--
To unsubscribe from this list: send the line "unsubscribe linux-kbuild" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
^ permalink raw reply
* Re: linux-next: scsi tree boot filure
From: James Bottomley @ 2009-09-28 14:54 UTC (permalink / raw)
To: Stephen Rothwell; +Cc: linux-next, LKML, James Smart, linux-scsi
In-Reply-To: <20090927164314.9377c24c.sfr@canb.auug.org.au>
linux-scsi added to cc
On Sun, 2009-09-27 at 16:43 +1000, Stephen Rothwell wrote:
> Hi James,
>
> next-20090926 does not boot on some of my PowerPC partitions:
>
> calling .ibmvscsi_module_init+0x0/0xb8 @ 1
> ibmvscsi 30000028: SRP_VERSION: 16.a
> scsi0 : IBM POWER Virtual SCSI Adapter 1.5.8
> ibmvscsi 30000028: partner initialization complete
> ibmvscsi 30000028: host srp version: 16.a, host partition 1-Didgo-VIOS (1), OS 3, max io 1048576
> ibmvscsi 30000028: Client reserve enabled
> ibmvscsi 30000028: sent SRP login
> ibmvscsi 30000028: SRP_LOGIN succeeded
> Unable to handle kernel paging request for data at address 0x00000058
> Faulting instruction address: 0xc0000000003a6280
> Oops: Kernel access of bad area, sig: 11 [#1]
> SMP NR_CPUS=128 NUMA pSeries
> Modules linked in:
> NIP: c0000000003a6280 LR: c0000000003a63b4 CTR: 0000000000000000
> REGS: c00000007c3f3020 TRAP: 0300 Not tainted (2.6.31-autokern1)
> MSR: 8000000000009032 <EE,ME,IR,DR> CR: 24002042 XER: 00000001
> DAR: 0000000000000058, DSISR: 0000000040000000
> TASK = c00000007c3e8000[1] 'swapper' THREAD: c00000007c3f0000 CPU: 3
> GPR00: 0000000000000000 c00000007c3f32a0 c000000000bc5390 c000000000a76420
> GPR04: c000000000b97818 c0000000015abc70 0000000000000000 c00000007c81c918
> GPR08: c00000007c81c888 0000000002000000 0000000000000002 c0000000014ecbcc
> GPR12: 0000000024000042 c000000000c1ea80 0000000003500000 c00000000074af10
> GPR16: c000000000749588 0000000000000000 0000000000000000 0000000000000000
> GPR20: c00000007c3f3600 c000000079074c00 c00000007c81c000 0000000002f1f8e0
> GPR24: 0000000000000000 0000000000000000 0000000000000000 c000000079074c28
> GPR28: c00000007c81c000 0000000000000000 c000000000b353f0 c000000000b97818
> NIP [c0000000003a6280] .__scsi_alloc_queue+0x2c/0x13c
> LR [c0000000003a63b4] .scsi_alloc_queue+0x24/0x84
> Call Trace:
> [c00000007c3f32a0] [c00000007c3f3330] 0xc00000007c3f3330 (unreliable)
> [c00000007c3f3330] [c0000000003a63b4] .scsi_alloc_queue+0x24/0x84
> [c00000007c3f33b0] [c0000000003a8f78] .scsi_alloc_sdev+0x198/0x2ac
> [c00000007c3f3470] [c0000000003a9450] .scsi_probe_and_add_lun+0x130/0xaac
> [c00000007c3f3580] [c0000000003aa20c] .__scsi_scan_target+0xf4/0x5fc
> [c00000007c3f36a0] [c0000000003aa768] .scsi_scan_channel+0x54/0xd0
> [c00000007c3f3740] [c0000000003aa8b0] .scsi_scan_host_selected+0xcc/0x144
> [c00000007c3f37f0] [c0000000003d5264] .ibmvscsi_probe+0x590/0x6e4
> [c00000007c3f38c0] [c000000000021e88] .vio_bus_probe+0x84/0xb0
> [c00000007c3f3960] [c00000000037cbac] .driver_probe_device+0xfc/0x1c0
> [c00000007c3f39f0] [c00000000037cd04] .__driver_attach+0x94/0xd8
> [c00000007c3f3a80] [c00000000037b9f8] .bus_for_each_dev+0x84/0xdc
> [c00000007c3f3b30] [c00000000037c954] .driver_attach+0x28/0x40
> [c00000007c3f3bb0] [c00000000037c290] .bus_add_driver+0x148/0x314
> [c00000007c3f3c60] [c00000000037d1b0] .driver_register+0xd4/0x1a8
> [c00000007c3f3d10] [c000000000021cbc] .vio_register_driver+0x40/0x5c
> [c00000007c3f3da0] [c00000000084f418] .ibmvscsi_module_init+0x80/0xb8
> [c00000007c3f3e30] [c0000000000094c8] .do_one_initcall+0x9c/0x1cc
> [c00000007c3f3ee0] [c000000000822cc0] .kernel_init+0x21c/0x298
> [c00000007c3f3f90] [c000000000026cb8] .kernel_thread+0x54/0x70
> Instruction dump:
> 4e800020 7c0802a6 fb81ffe0 fbe1fff8 fba1ffe8 7c7c1b78 f8010010 f821ff71
> 7c9f2378 eba302a0 48000008 ebbd0000 <e81d0058> 7fa3eb78 2fa00000 419efff0
> ---[ end trace 18604a042ee6e0ba ]---
> Kernel panic - not syncing: Attempted to kill init!
> Call Trace:
> [c00000007c3f2c80] [c00000000001024c] .show_stack+0x70/0x184 (unreliable)
> [c00000007c3f2d30] [c00000000006a410] .panic+0x80/0x1b4
> [c00000007c3f2dd0] [c00000000006eca4] .do_exit+0x84/0x728
> [c00000007c3f2e90] [c000000000024d2c] .die+0x24c/0x27c
> [c00000007c3f2f30] [c0000000000330c8] .bad_page_fault+0xb8/0xd4
> [c00000007c3f2fb0] [c0000000000051dc] handle_page_fault+0x3c/0x74
> --- Exception: 300 at .__scsi_alloc_queue+0x2c/0x13c
> LR = .scsi_alloc_queue+0x24/0x84
> [c00000007c3f32a0] [c00000007c3f3330] 0xc00000007c3f3330 (unreliable)
> [c00000007c3f3330] [c0000000003a63b4] .scsi_alloc_queue+0x24/0x84
> [c00000007c3f33b0] [c0000000003a8f78] .scsi_alloc_sdev+0x198/0x2ac
> [c00000007c3f3470] [c0000000003a9450] .scsi_probe_and_add_lun+0x130/0xaac
> [c00000007c3f3580] [c0000000003aa20c] .__scsi_scan_target+0xf4/0x5fc
> [c00000007c3f36a0] [c0000000003aa768] .scsi_scan_channel+0x54/0xd0
> [c00000007c3f3740] [c0000000003aa8b0] .scsi_scan_host_selected+0xcc/0x144
> [c00000007c3f37f0] [c0000000003d5264] .ibmvscsi_probe+0x590/0x6e4
> [c00000007c3f38c0] [c000000000021e88] .vio_bus_probe+0x84/0xb0
> [c00000007c3f3960] [c00000000037cbac] .driver_probe_device+0xfc/0x1c0
> [c00000007c3f39f0] [c00000000037cd04] .__driver_attach+0x94/0xd8
> [c00000007c3f3a80] [c00000000037b9f8] .bus_for_each_dev+0x84/0xdc
> [c00000007c3f3b30] [c00000000037c954] .driver_attach+0x28/0x40
> [c00000007c3f3bb0] [c00000000037c290] .bus_add_driver+0x148/0x314
> [c00000007c3f3c60] [c00000000037d1b0] .driver_register+0xd4/0x1a8
> [c00000007c3f3d10] [c000000000021cbc] .vio_register_driver+0x40/0x5c
> [c00000007c3f3da0] [c00000000084f418] .ibmvscsi_module_init+0x80/0xb8
> [c00000007c3f3e30] [c0000000000094c8] .do_one_initcall+0x9c/0x1cc
> [c00000007c3f3ee0] [c000000000822cc0] .kernel_init+0x21c/0x298
> [c00000007c3f3f90] [c000000000026cb8] .kernel_thread+0x54/0x70
> Rebooting in 180 seconds..
>
> I have bisected this down to commit
> 4acd10521ee002137b5d6791e234d7110033c782 ("[SCSI] scsi_lib_dma.c : fix
> bug /w dma maps on virtual vc ports") which was added between
> next-20090925 and next-20090926.
>
> Reverting that single commit from next-20090926 allows it to boot.
OK, so my strongest suspicion is that the SCSI device is parented to
some IBM specific device that has no type. This is causing SCSI to
wander up the tree until it hits a NULL device and panics on the deref.
Does this incremental diff fix it?
James
---
diff --git a/include/scsi/scsi_host.h b/include/scsi/scsi_host.h
index 2977806..9d5bfdc 100644
--- a/include/scsi/scsi_host.h
+++ b/include/scsi/scsi_host.h
@@ -718,7 +718,7 @@ static inline struct Scsi_Host *dev_to_shost(struct device *dev)
*/
static inline struct device *dev_to_nonscsi_dev(struct device *dev)
{
- while (dev->type == NULL || scsi_is_host_device(dev))
+ while (dev->parent && (dev->type == NULL || scsi_is_host_device(dev)))
dev = dev->parent;
return dev;
}
^ permalink raw reply related
* Re: linux-next: scsi tree boot filure
From: Andrew Vasquez @ 2009-09-28 19:08 UTC (permalink / raw)
To: James Bottomley
Cc: Stephen Rothwell, linux-next@vger.kernel.org, LKML, James Smart,
linux-scsi
In-Reply-To: <1254149694.4302.57.camel@mulgrave.site>
On Mon, 28 Sep 2009, James Bottomley wrote:
> linux-scsi added to cc
>
> On Sun, 2009-09-27 at 16:43 +1000, Stephen Rothwell wrote:
> > Hi James,
> >
> > next-20090926 does not boot on some of my PowerPC partitions:
> >
> > calling .ibmvscsi_module_init+0x0/0xb8 @ 1
> > ibmvscsi 30000028: SRP_VERSION: 16.a
> > scsi0 : IBM POWER Virtual SCSI Adapter 1.5.8
> > ibmvscsi 30000028: partner initialization complete
> > ibmvscsi 30000028: host srp version: 16.a, host partition 1-Didgo-VIOS (1), OS 3, max io 1048576
> > ibmvscsi 30000028: Client reserve enabled
> > ibmvscsi 30000028: sent SRP login
> > ibmvscsi 30000028: SRP_LOGIN succeeded
> > Unable to handle kernel paging request for data at address 0x00000058
> > Faulting instruction address: 0xc0000000003a6280
> > Oops: Kernel access of bad area, sig: 11 [#1]
> > SMP NR_CPUS=128 NUMA pSeries
> > Modules linked in:
> > NIP: c0000000003a6280 LR: c0000000003a63b4 CTR: 0000000000000000
> > REGS: c00000007c3f3020 TRAP: 0300 Not tainted (2.6.31-autokern1)
> > MSR: 8000000000009032 <EE,ME,IR,DR> CR: 24002042 XER: 00000001
> > DAR: 0000000000000058, DSISR: 0000000040000000
> > TASK = c00000007c3e8000[1] 'swapper' THREAD: c00000007c3f0000 CPU: 3
> > GPR00: 0000000000000000 c00000007c3f32a0 c000000000bc5390 c000000000a76420
> > GPR04: c000000000b97818 c0000000015abc70 0000000000000000 c00000007c81c918
> > GPR08: c00000007c81c888 0000000002000000 0000000000000002 c0000000014ecbcc
> > GPR12: 0000000024000042 c000000000c1ea80 0000000003500000 c00000000074af10
> > GPR16: c000000000749588 0000000000000000 0000000000000000 0000000000000000
> > GPR20: c00000007c3f3600 c000000079074c00 c00000007c81c000 0000000002f1f8e0
> > GPR24: 0000000000000000 0000000000000000 0000000000000000 c000000079074c28
> > GPR28: c00000007c81c000 0000000000000000 c000000000b353f0 c000000000b97818
> > NIP [c0000000003a6280] .__scsi_alloc_queue+0x2c/0x13c
> > LR [c0000000003a63b4] .scsi_alloc_queue+0x24/0x84
> > Call Trace:
> > [c00000007c3f32a0] [c00000007c3f3330] 0xc00000007c3f3330 (unreliable)
> > [c00000007c3f3330] [c0000000003a63b4] .scsi_alloc_queue+0x24/0x84
> > [c00000007c3f33b0] [c0000000003a8f78] .scsi_alloc_sdev+0x198/0x2ac
> > [c00000007c3f3470] [c0000000003a9450] .scsi_probe_and_add_lun+0x130/0xaac
> > [c00000007c3f3580] [c0000000003aa20c] .__scsi_scan_target+0xf4/0x5fc
> > [c00000007c3f36a0] [c0000000003aa768] .scsi_scan_channel+0x54/0xd0
> > [c00000007c3f3740] [c0000000003aa8b0] .scsi_scan_host_selected+0xcc/0x144
> > [c00000007c3f37f0] [c0000000003d5264] .ibmvscsi_probe+0x590/0x6e4
> > [c00000007c3f38c0] [c000000000021e88] .vio_bus_probe+0x84/0xb0
> > [c00000007c3f3960] [c00000000037cbac] .driver_probe_device+0xfc/0x1c0
> > [c00000007c3f39f0] [c00000000037cd04] .__driver_attach+0x94/0xd8
> > [c00000007c3f3a80] [c00000000037b9f8] .bus_for_each_dev+0x84/0xdc
> > [c00000007c3f3b30] [c00000000037c954] .driver_attach+0x28/0x40
> > [c00000007c3f3bb0] [c00000000037c290] .bus_add_driver+0x148/0x314
> > [c00000007c3f3c60] [c00000000037d1b0] .driver_register+0xd4/0x1a8
> > [c00000007c3f3d10] [c000000000021cbc] .vio_register_driver+0x40/0x5c
> > [c00000007c3f3da0] [c00000000084f418] .ibmvscsi_module_init+0x80/0xb8
> > [c00000007c3f3e30] [c0000000000094c8] .do_one_initcall+0x9c/0x1cc
> > [c00000007c3f3ee0] [c000000000822cc0] .kernel_init+0x21c/0x298
> > [c00000007c3f3f90] [c000000000026cb8] .kernel_thread+0x54/0x70
> > Instruction dump:
> > 4e800020 7c0802a6 fb81ffe0 fbe1fff8 fba1ffe8 7c7c1b78 f8010010 f821ff71
> > 7c9f2378 eba302a0 48000008 ebbd0000 <e81d0058> 7fa3eb78 2fa00000 419efff0
> > ---[ end trace 18604a042ee6e0ba ]---
> > Kernel panic - not syncing: Attempted to kill init!
> > Call Trace:
> > [c00000007c3f2c80] [c00000000001024c] .show_stack+0x70/0x184 (unreliable)
> > [c00000007c3f2d30] [c00000000006a410] .panic+0x80/0x1b4
> > [c00000007c3f2dd0] [c00000000006eca4] .do_exit+0x84/0x728
> > [c00000007c3f2e90] [c000000000024d2c] .die+0x24c/0x27c
> > [c00000007c3f2f30] [c0000000000330c8] .bad_page_fault+0xb8/0xd4
> > [c00000007c3f2fb0] [c0000000000051dc] handle_page_fault+0x3c/0x74
> > --- Exception: 300 at .__scsi_alloc_queue+0x2c/0x13c
> > LR = .scsi_alloc_queue+0x24/0x84
> > [c00000007c3f32a0] [c00000007c3f3330] 0xc00000007c3f3330 (unreliable)
> > [c00000007c3f3330] [c0000000003a63b4] .scsi_alloc_queue+0x24/0x84
> > [c00000007c3f33b0] [c0000000003a8f78] .scsi_alloc_sdev+0x198/0x2ac
> > [c00000007c3f3470] [c0000000003a9450] .scsi_probe_and_add_lun+0x130/0xaac
> > [c00000007c3f3580] [c0000000003aa20c] .__scsi_scan_target+0xf4/0x5fc
> > [c00000007c3f36a0] [c0000000003aa768] .scsi_scan_channel+0x54/0xd0
> > [c00000007c3f3740] [c0000000003aa8b0] .scsi_scan_host_selected+0xcc/0x144
> > [c00000007c3f37f0] [c0000000003d5264] .ibmvscsi_probe+0x590/0x6e4
> > [c00000007c3f38c0] [c000000000021e88] .vio_bus_probe+0x84/0xb0
> > [c00000007c3f3960] [c00000000037cbac] .driver_probe_device+0xfc/0x1c0
> > [c00000007c3f39f0] [c00000000037cd04] .__driver_attach+0x94/0xd8
> > [c00000007c3f3a80] [c00000000037b9f8] .bus_for_each_dev+0x84/0xdc
> > [c00000007c3f3b30] [c00000000037c954] .driver_attach+0x28/0x40
> > [c00000007c3f3bb0] [c00000000037c290] .bus_add_driver+0x148/0x314
> > [c00000007c3f3c60] [c00000000037d1b0] .driver_register+0xd4/0x1a8
> > [c00000007c3f3d10] [c000000000021cbc] .vio_register_driver+0x40/0x5c
> > [c00000007c3f3da0] [c00000000084f418] .ibmvscsi_module_init+0x80/0xb8
> > [c00000007c3f3e30] [c0000000000094c8] .do_one_initcall+0x9c/0x1cc
> > [c00000007c3f3ee0] [c000000000822cc0] .kernel_init+0x21c/0x298
> > [c00000007c3f3f90] [c000000000026cb8] .kernel_thread+0x54/0x70
> > Rebooting in 180 seconds..
> >
> > I have bisected this down to commit
> > 4acd10521ee002137b5d6791e234d7110033c782 ("[SCSI] scsi_lib_dma.c : fix
> > bug /w dma maps on virtual vc ports") which was added between
> > next-20090925 and next-20090926.
> >
> > Reverting that single commit from next-20090926 allows it to boot.
>
> OK, so my strongest suspicion is that the SCSI device is parented to
> some IBM specific device that has no type. This is causing SCSI to
> wander up the tree until it hits a NULL device and panics on the deref.
Hmm, doesn't appear to be something specific to an 'IBM device', as
I'm seeing the same thing with qla2xxx registerting rports to the
FC-transport:
Sep 28 11:40:21 elab52 kernel: [ 174.440129] BUG: unable to handle kernel NULL pointer dereference at 0000000000000058
Sep 28 11:40:21 elab52 kernel: [ 174.440280] IP: [<ffffffff81270dc3>] __scsi_alloc_queue+0x23/0x160
Sep 28 11:40:21 elab52 kernel: [ 174.440380] PGD 0
Sep 28 11:40:21 elab52 kernel: [ 174.440481] Oops: 0000 [#1] SMP DEBUG_PAGEALLOC
Sep 28 11:40:21 elab52 kernel: [ 174.440643] last sysfs file: /sys/devices/system/cpu/cpu7/cache/index2/shared_cpu_map
Sep 28 11:40:21 elab52 kernel: [ 174.440722] CPU 6
Sep 28 11:40:21 elab52 kernel: [ 174.440809] Modules linked in: qla2xxx scsi_transport_fc [last unloaded: scsi_transport_fc]
Sep 28 11:40:21 elab52 kernel: [ 174.441031] Pid: 7079, comm: scsi_wq_0 Not tainted 2.6.32-rc2 #6 ProLiant DL370 G6
Sep 28 11:40:21 elab52 kernel: [ 174.441108] RIP: 0010:[<ffffffff81270dc3>] [<ffffffff81270dc3>] __scsi_alloc_queue+0x23/0x160
Sep 28 11:40:21 elab52 kernel: [ 174.441225] RSP: 0018:ffff8801a4135b10 EFLAGS: 00010246
Sep 28 11:40:21 elab52 kernel: [ 174.441284] RAX: ffff880199b26e18 RBX: 0000000000000000 RCX: 0000000000000000
Sep 28 11:40:21 elab52 kernel: [ 174.442962] RDX: ffffffff815dd880 RSI: ffffffff81270840 RDI: ffff8801a66947f0
Sep 28 11:40:21 elab52 kernel: [ 174.443025] RBP: ffff8801a4135b30 R08: 0000000000000000 R09: ffff8801a54027f0
Sep 28 11:40:21 elab52 kernel: [ 174.443088] R10: ffff8801a78036c0 R11: ffff8801a7ab4ef0 R12: ffffffff81270840
Sep 28 11:40:21 elab52 kernel: [ 174.443151] R13: ffff8801a66947f0 R14: ffff8801a66947f0 R15: 0000000000000000
Sep 28 11:40:21 elab52 kernel: [ 174.443215] FS: 0000000000000000(0000) GS:ffff8800282c0000(0000) knlGS:0000000000000000
Sep 28 11:40:21 elab52 kernel: [ 174.443294] CS: 0010 DS: 0018 ES: 0018 CR0: 000000008005003b
Sep 28 11:40:21 elab52 kernel: [ 174.443355] CR2: 0000000000000058 CR3: 0000000001001000 CR4: 00000000000006e0
Sep 28 11:40:21 elab52 kernel: [ 174.443418] DR0: 0000000000000000 DR1: 0000000000000000 DR2: 0000000000000000
Sep 28 11:40:21 elab52 kernel: [ 174.443481] DR3: 0000000000000000 DR6: 00000000ffff0ff0 DR7: 0000000000000400
Sep 28 11:40:21 elab52 kernel: [ 174.443544] Process scsi_wq_0 (pid: 7079, threadinfo ffff8801a4134000, task ffff8801a1e55968)
Sep 28 11:40:21 elab52 kernel: [ 174.443623] Stack:
Sep 28 11:40:21 elab52 kernel: [ 174.443676] ffff8801a4135b50 ffff8801a54027f0 ffff880199b26df0 ffff880199b26e18
Sep 28 11:40:21 elab52 kernel: [ 174.443846] <0> ffff8801a4135b50 ffffffff81270f18 ffff8801a4135b50 ffff8801a54027f0
Sep 28 11:40:21 elab52 kernel: [ 174.444176] <0> ffff8801a4135b90 ffffffff812730df ffffffff00000010 0000000000000000
Sep 28 11:40:21 elab52 kernel: [ 174.444476] Call Trace:
Sep 28 11:40:21 elab52 kernel: [ 174.444533] [<ffffffff81270f18>] scsi_alloc_queue+0x18/0x70
Sep 28 11:40:21 elab52 kernel: [ 174.444595] [<ffffffff812730df>] scsi_alloc_sdev+0x17f/0x250
Sep 28 11:40:21 elab52 kernel: [ 174.444656] [<ffffffff81273dda>] scsi_probe_and_add_lun+0xa0a/0xe60
Sep 28 11:40:21 elab52 kernel: [ 174.444720] [<ffffffff811bd58a>] ? kobject_get+0x1a/0x30
Sep 28 11:40:21 elab52 kernel: [ 174.444798] [<ffffffff8136e5b9>] ? mutex_unlock+0x9/0x10
Sep 28 11:40:21 elab52 kernel: [ 174.444860] [<ffffffff812430b4>] ? attribute_container_add_device+0x74/0x1a0
Sep 28 11:40:21 elab52 kernel: [ 174.444925] [<ffffffff811bd58a>] ? kobject_get+0x1a/0x30
Sep 28 11:40:21 elab52 kernel: [ 174.444986] [<ffffffff8123c4d4>] ? get_device+0x14/0x20
Sep 28 11:40:21 elab52 kernel: [ 174.445047] [<ffffffff81272f12>] ? scsi_alloc_target+0x2a2/0x2f0
Sep 28 11:40:21 elab52 kernel: [ 174.445110] [<ffffffff812745a7>] __scsi_scan_target+0xe7/0x740
Sep 28 11:40:21 elab52 kernel: [ 174.445173] [<ffffffff810cd201>] ? kfree_debugcheck+0x11/0x30
Sep 28 11:40:21 elab52 kernel: [ 174.445235] [<ffffffff810cd457>] ? cache_free_debugcheck+0x237/0x380
Sep 28 11:40:21 elab52 kernel: [ 174.445298] [<ffffffff812732e2>] ? scsi_complete_async_scans+0xc2/0x180
Sep 28 11:40:21 elab52 kernel: [ 174.445363] [<ffffffff81040b80>] ? default_wake_function+0x0/0x10
Sep 28 11:40:21 elab52 kernel: [ 174.445426] [<ffffffff81275333>] scsi_scan_target+0xc3/0xd0
Sep 28 11:40:21 elab52 kernel: [ 174.445490] [<ffffffffa0010a60>] ? fc_scsi_scan_rport+0x0/0xc0 [scsi_transport_fc]
Sep 28 11:40:21 elab52 kernel: [ 174.445570] [<ffffffffa0010b17>] fc_scsi_scan_rport+0xb7/0xc0 [scsi_transport_fc]
Sep 28 11:40:21 elab52 kernel: [ 174.445652] [<ffffffff8105d1f6>] worker_thread+0x156/0x210
Sep 28 11:40:21 elab52 kernel: [ 174.445714] [<ffffffff81061b60>] ? autoremove_wake_function+0x0/0x40
Sep 28 11:40:21 elab52 kernel: [ 174.445777] [<ffffffff8105d0a0>] ? worker_thread+0x0/0x210
Sep 28 11:40:21 elab52 kernel: [ 174.445839] [<ffffffff81061796>] kthread+0x96/0xb0
Sep 28 11:40:21 elab52 kernel: [ 174.445903] [<ffffffff8100c31a>] child_rip+0xa/0x20
Sep 28 11:40:21 elab52 kernel: [ 174.445963] [<ffffffff81061700>] ? kthread+0x0/0xb0
Sep 28 11:40:21 elab52 kernel: [ 174.446023] [<ffffffff8100c310>] ? child_rip+0x0/0x20
Sep 28 11:40:21 elab52 kernel: [ 174.446082] Code: ff ff 66 0f 1f 44 00 00 55 48 89 e5 41 55 49 89 fd 41 54 49 89 f4 53 48 83 ec 08 48 8b 9f d8 01 00 00 eb 07 0f 1f 40 00 48 8b 1b <48> 83 7b 58 00 74 f6 48 89 df e8 4e 9c ff ff 85 c0 75 ea 31 f6
Sep 28 11:40:21 elab52 kernel: [ 174.448539] RIP [<ffffffff81270dc3>] __scsi_alloc_queue+0x23/0x160
Sep 28 11:40:22 elab52 kernel: [ 174.448637] RSP <ffff8801a4135b10>
Sep 28 11:40:22 elab52 kernel: [ 174.448693] CR2: 0000000000000058
Sep 28 11:40:22 elab52 kernel: [ 174.448817] ---[ end trace d6870c1a1052d6c8 ]---
> Does this incremental diff fix it?
>
> James
>
> ---
>
> diff --git a/include/scsi/scsi_host.h b/include/scsi/scsi_host.h
> index 2977806..9d5bfdc 100644
> --- a/include/scsi/scsi_host.h
> +++ b/include/scsi/scsi_host.h
> @@ -718,7 +718,7 @@ static inline struct Scsi_Host *dev_to_shost(struct device *dev)
> */
> static inline struct device *dev_to_nonscsi_dev(struct device *dev)
> {
> - while (dev->type == NULL || scsi_is_host_device(dev))
> + while (dev->parent && (dev->type == NULL || scsi_is_host_device(dev)))
> dev = dev->parent;
> return dev;
> }
Yes, your fix has kicked the tires enough to get the cart moving again.
Thanks, AV
^ permalink raw reply
* Re: linux-next: tree build failure
From: Hollis Blanchard @ 2009-09-29 0:00 UTC (permalink / raw)
To: Stephen Rothwell
Cc: ppc-dev, linux-next-u79uwXL29TY76Z2rM5mHXA,
linux-kernel-u79uwXL29TY76Z2rM5mHXA, Jan Beulich, Andrew Morton,
kvm-ppc-u79uwXL29TY76Z2rM5mHXA
In-Reply-To: <20090924152102.8d7d40cf.sfr-3FnU+UHB4dNDw9hX6IcOSA@public.gmane.org>
On Thu, 2009-09-24 at 15:21 +1000, Stephen Rothwell wrote:
> Hi all,
>
> Today's linux-next build (powerpc ppc44x_defconfig) failed like this:
>
> In file included from arch/powerpc/kvm/booke.c:31:
> arch/powerpc/kvm/timing.h: In function 'kvmppc_account_exit_stat':
> arch/powerpc/kvm/timing.h:51: error: bit-field '<anonymous>' width not an integer constant
> In file included from arch/powerpc/kvm/booke.h:26,
> from arch/powerpc/kvm/booke_emulate.c:23:
> arch/powerpc/kvm/timing.h: In function 'kvmppc_account_exit_stat':
> arch/powerpc/kvm/timing.h:51: error: bit-field '<anonymous>' width not an integer constant
>
> Presumably caused by commit 8c87df457cb58fe75b9b893007917cf8095660a0
> ("BUILD_BUG_ON(): fix it and a couple of bogus uses of it").
First, I think there is a real bug here, and the code should read like
this (to match the comment):
/* type has to be known at build time for optimization */
- BUILD_BUG_ON(__builtin_constant_p(type));
+ BUILD_BUG_ON(!__builtin_constant_p(type));
However, I get the same build error *both* ways, i.e.
__builtin_constant_p(type) evaluates to both 0 and 1? Either that, or
the new BUILD_BUG_ON() macro isn't working...
> I applied the following patch for today. This inline function is
> only called from one place in one file ...
It's also called via kvmppc_account_exit() from a number of places.
--
Hollis Blanchard
IBM Linux Technology Center
--
To unsubscribe from this list: send the line "unsubscribe kvm-ppc" in
the body of a message to majordomo-u79uwXL29TY76Z2rM5mHXA@public.gmane.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
^ permalink raw reply
* Re: linux-next: scsi tree boot filure
From: Stephen Rothwell @ 2009-09-29 1:27 UTC (permalink / raw)
To: James Bottomley; +Cc: linux-next, LKML, James Smart, linux-scsi
In-Reply-To: <1254149694.4302.57.camel@mulgrave.site>
[-- Attachment #1: Type: text/plain, Size: 8207 bytes --]
Hi James,
On Mon, 28 Sep 2009 14:54:54 +0000 James Bottomley <James.Bottomley@suse.de> wrote:
>
> On Sun, 2009-09-27 at 16:43 +1000, Stephen Rothwell wrote:
> >
> > next-20090926 does not boot on some of my PowerPC partitions:
> >
> > calling .ibmvscsi_module_init+0x0/0xb8 @ 1
> > ibmvscsi 30000028: SRP_VERSION: 16.a
> > scsi0 : IBM POWER Virtual SCSI Adapter 1.5.8
> > ibmvscsi 30000028: partner initialization complete
> > ibmvscsi 30000028: host srp version: 16.a, host partition 1-Didgo-VIOS (1), OS 3, max io 1048576
> > ibmvscsi 30000028: Client reserve enabled
> > ibmvscsi 30000028: sent SRP login
> > ibmvscsi 30000028: SRP_LOGIN succeeded
> > Unable to handle kernel paging request for data at address 0x00000058
> > Faulting instruction address: 0xc0000000003a6280
> > Oops: Kernel access of bad area, sig: 11 [#1]
> > SMP NR_CPUS=128 NUMA pSeries
> > Modules linked in:
> > NIP: c0000000003a6280 LR: c0000000003a63b4 CTR: 0000000000000000
> > REGS: c00000007c3f3020 TRAP: 0300 Not tainted (2.6.31-autokern1)
> > MSR: 8000000000009032 <EE,ME,IR,DR> CR: 24002042 XER: 00000001
> > DAR: 0000000000000058, DSISR: 0000000040000000
> > TASK = c00000007c3e8000[1] 'swapper' THREAD: c00000007c3f0000 CPU: 3
> > GPR00: 0000000000000000 c00000007c3f32a0 c000000000bc5390 c000000000a76420
> > GPR04: c000000000b97818 c0000000015abc70 0000000000000000 c00000007c81c918
> > GPR08: c00000007c81c888 0000000002000000 0000000000000002 c0000000014ecbcc
> > GPR12: 0000000024000042 c000000000c1ea80 0000000003500000 c00000000074af10
> > GPR16: c000000000749588 0000000000000000 0000000000000000 0000000000000000
> > GPR20: c00000007c3f3600 c000000079074c00 c00000007c81c000 0000000002f1f8e0
> > GPR24: 0000000000000000 0000000000000000 0000000000000000 c000000079074c28
> > GPR28: c00000007c81c000 0000000000000000 c000000000b353f0 c000000000b97818
> > NIP [c0000000003a6280] .__scsi_alloc_queue+0x2c/0x13c
> > LR [c0000000003a63b4] .scsi_alloc_queue+0x24/0x84
> > Call Trace:
> > [c00000007c3f32a0] [c00000007c3f3330] 0xc00000007c3f3330 (unreliable)
> > [c00000007c3f3330] [c0000000003a63b4] .scsi_alloc_queue+0x24/0x84
> > [c00000007c3f33b0] [c0000000003a8f78] .scsi_alloc_sdev+0x198/0x2ac
> > [c00000007c3f3470] [c0000000003a9450] .scsi_probe_and_add_lun+0x130/0xaac
> > [c00000007c3f3580] [c0000000003aa20c] .__scsi_scan_target+0xf4/0x5fc
> > [c00000007c3f36a0] [c0000000003aa768] .scsi_scan_channel+0x54/0xd0
> > [c00000007c3f3740] [c0000000003aa8b0] .scsi_scan_host_selected+0xcc/0x144
> > [c00000007c3f37f0] [c0000000003d5264] .ibmvscsi_probe+0x590/0x6e4
> > [c00000007c3f38c0] [c000000000021e88] .vio_bus_probe+0x84/0xb0
> > [c00000007c3f3960] [c00000000037cbac] .driver_probe_device+0xfc/0x1c0
> > [c00000007c3f39f0] [c00000000037cd04] .__driver_attach+0x94/0xd8
> > [c00000007c3f3a80] [c00000000037b9f8] .bus_for_each_dev+0x84/0xdc
> > [c00000007c3f3b30] [c00000000037c954] .driver_attach+0x28/0x40
> > [c00000007c3f3bb0] [c00000000037c290] .bus_add_driver+0x148/0x314
> > [c00000007c3f3c60] [c00000000037d1b0] .driver_register+0xd4/0x1a8
> > [c00000007c3f3d10] [c000000000021cbc] .vio_register_driver+0x40/0x5c
> > [c00000007c3f3da0] [c00000000084f418] .ibmvscsi_module_init+0x80/0xb8
> > [c00000007c3f3e30] [c0000000000094c8] .do_one_initcall+0x9c/0x1cc
> > [c00000007c3f3ee0] [c000000000822cc0] .kernel_init+0x21c/0x298
> > [c00000007c3f3f90] [c000000000026cb8] .kernel_thread+0x54/0x70
> > Instruction dump:
> > 4e800020 7c0802a6 fb81ffe0 fbe1fff8 fba1ffe8 7c7c1b78 f8010010 f821ff71
> > 7c9f2378 eba302a0 48000008 ebbd0000 <e81d0058> 7fa3eb78 2fa00000 419efff0
> > ---[ end trace 18604a042ee6e0ba ]---
> > Kernel panic - not syncing: Attempted to kill init!
> >
> > I have bisected this down to commit
> > 4acd10521ee002137b5d6791e234d7110033c782 ("[SCSI] scsi_lib_dma.c : fix
> > bug /w dma maps on virtual vc ports") which was added between
> > next-20090925 and next-20090926.
> >
> > Reverting that single commit from next-20090926 allows it to boot.
>
> OK, so my strongest suspicion is that the SCSI device is parented to
> some IBM specific device that has no type. This is causing SCSI to
> wander up the tree until it hits a NULL device and panics on the deref.
>
> Does this incremental diff fix it?
That fixes the above panic, but leaves me with this:
calling .ibmvscsi_module_init+0x0/0xb8 @ 1
ibmvscsi 30000028: SRP_VERSION: 16.a
scsi0 : IBM POWER Virtual SCSI Adapter 1.5.8
ibmvscsi 30000028: partner initialization complete
ibmvscsi 30000028: host srp version: 16.a, host partition 1-Didgo-VIOS (1), OS 3, max io 1048576
ibmvscsi 30000028: Client reserve enabled
ibmvscsi 30000028: sent SRP login
ibmvscsi 30000028: SRP_LOGIN succeeded
Unable to handle kernel paging request for data at address 0x00000020
Faulting instruction address: 0xc0000000003a8798
Oops: Kernel access of bad area, sig: 11 [#1]
SMP NR_CPUS=128 NUMA pSeries
Modules linked in:
NIP: c0000000003a8798 LR: c0000000003a8774 CTR: 0000000000000000
REGS: c00000007c3f2aa0 TRAP: 0300 Not tainted (2.6.31-autokern1-next-20090926)
MSR: 8000000000009032 <EE,ME,IR,DR> CR: 44002022 XER: 00000001
DAR: 0000000000000020, DSISR: 0000000040000000
TASK = c00000007c3e8000[1] 'swapper' THREAD: c00000007c3f0000 CPU: 3
GPR00: 0000000000000000 c00000007c3f2d20 c000000000bc5390 0000000000000000
GPR04: 0000000000000000 0000000000000000 c00000007a3f0bc0 0000000000000000
GPR08: 0000000024000000 0000000000000000 c00000007a3f0ae0 0000000000000001
GPR12: 0000000048002022 c000000000c1ea80 0000000003500000 c00000000074af10
GPR16: c000000000749588 0000000000000000 c00000007c5d4800 0000000000000003
GPR20: c00000007c3f34f0 c000000000b96a20 c00000007c5d4628 c00000007c5d4638
GPR24: 0000000000000000 0000000000000000 0000000000000002 0000000000000001
GPR28: c00000007c6e7c00 0000000000000002 c000000000b37630 c000000000a76420
NIP [c0000000003a8798] .scsi_dma_map+0xc8/0x130
LR [c0000000003a8774] .scsi_dma_map+0xa4/0x130
Call Trace:
[c00000007c3f2d20] [c00000007c3e8000] 0xc00000007c3e8000 (unreliable)
[c00000007c3f2dd0] [c0000000003d603c] .ibmvscsi_queuecommand+0x16c/0x570
[c00000007c3f2ea0] [c00000000039f968] .scsi_dispatch_cmd+0x1d4/0x240
[c00000007c3f2f40] [c0000000003a7cbc] .scsi_request_fn+0x434/0x47c
[c00000007c3f2fe0] [c0000000002d0c4c] .__generic_unplug_device+0x60/0x78
[c00000007c3f3060] [c0000000002dacec] .blk_execute_rq_nowait+0x70/0xcc
[c00000007c3f30f0] [c0000000002dae24] .blk_execute_rq+0xdc/0x134
[c00000007c3f32b0] [c0000000003a6fe8] .scsi_execute+0x120/0x1b4
[c00000007c3f3380] [c0000000003a71b0] .scsi_execute_req+0x134/0x1c0
[c00000007c3f3470] [c0000000003a95b8] .scsi_probe_and_add_lun+0x274/0xaac
[c00000007c3f3580] [c0000000003aa230] .__scsi_scan_target+0xf4/0x5fc
[c00000007c3f36a0] [c0000000003aa78c] .scsi_scan_channel+0x54/0xd0
[c00000007c3f3740] [c0000000003aa8d4] .scsi_scan_host_selected+0xcc/0x144
[c00000007c3f37f0] [c0000000003d5288] .ibmvscsi_probe+0x590/0x6e4
[c00000007c3f38c0] [c000000000021e88] .vio_bus_probe+0x84/0xb0
[c00000007c3f3960] [c00000000037cbac] .driver_probe_device+0xfc/0x1c0
[c00000007c3f39f0] [c00000000037cd04] .__driver_attach+0x94/0xd8
[c00000007c3f3a80] [c00000000037b9f8] .bus_for_each_dev+0x84/0xdc
[c00000007c3f3b30] [c00000000037c954] .driver_attach+0x28/0x40
[c00000007c3f3bb0] [c00000000037c290] .bus_add_driver+0x148/0x314
[c00000007c3f3c60] [c00000000037d1b0] .driver_register+0xd4/0x1a8
[c00000007c3f3d10] [c000000000021cbc] .vio_register_driver+0x40/0x5c
[c00000007c3f3da0] [c00000000084f418] .ibmvscsi_module_init+0x80/0xb8
[c00000007c3f3e30] [c0000000000094c8] .do_one_initcall+0x9c/0x1cc
[c00000007c3f3ee0] [c000000000822cc0] .kernel_init+0x21c/0x298
[c00000007c3f3f90] [c000000000026cb8] .kernel_thread+0x54/0x70
Instruction dump:
3ba00000 4800000c 4bf4f689 60000000 7f9dd800 381d0001 7c1d07b4 419cffec
2b9a0002 7c000026 5400f7fe 0b000000 <e9390020> 7fe3fb78 7f84e378 7f65db78
---[ end trace fe14497cda58c66c ]---
Kernel panic - not syncing: Attempted to kill init!
--
Cheers,
Stephen Rothwell sfr@canb.auug.org.au
http://www.canb.auug.org.au/~sfr/
[-- Attachment #2: Type: application/pgp-signature, Size: 198 bytes --]
^ permalink raw reply
* linux-next: Tree for September 29
From: Stephen Rothwell @ 2009-09-29 4:04 UTC (permalink / raw)
To: linux-next; +Cc: LKML
[-- Attachment #1: Type: text/plain, Size: 8274 bytes --]
Hi all,
Changes since 20090928:
My fixes tree contains a build fix for powerpc/kvm.
I have still reverted a commit from the scsi tree that causes a boot
failure.
I have still added a patch to remove includes of autoconf.h that were
causing some build failures.
----------------------------------------------------------------------------
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 sfr@canb.auug.org.au
$ 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
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
Merging ieee1394/for-next
Merging ubi/linux-next
Merging kvm/linux-next
Merging dlm/next
Merging scsi/master
$ git am -3 ../patches/0001-Revert-SCSI-scsi_lib_dma.c-fix-bug-w-dma-maps-on-vir.patch
Applying: Revert "[SCSI] scsi_lib_dma.c : fix bug /w dma maps on virtual vc ports"
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
CONFLICT (content): Merge conflict in mm/page-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
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 arch/x86/kernel/early_printk.c
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/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 (add/add): Merge conflict in drivers/scsi/pmcraid.h
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
Applying: linux-next: 20090926 - drop autoconf.h from DRBD driver
[-- Attachment #2: Type: application/pgp-signature, Size: 198 bytes --]
^ permalink raw reply
* Re: linux-next: tree build failure
From: Jan Beulich @ 2009-09-29 9:28 UTC (permalink / raw)
To: sfr, hollisb; +Cc: akpm, linuxppc-dev, kvm-ppc, linux-kernel, linux-next
>>> Hollis Blanchard 09/29/09 2:00 AM >>>
>First, I think there is a real bug here, and the code should read like
>this (to match the comment):
> /* type has to be known at build time for optimization */
>- BUILD_BUG_ON(__builtin_constant_p(type));
>+ BUILD_BUG_ON(!__builtin_constant_p(type));
>
>However, I get the same build error *both* ways, i.e.
>__builtin_constant_p(type) evaluates to both 0 and 1? Either that, or
>the new BUILD_BUG_ON() macro isn't working...
No, at this point of the compilation process it's neither zero nor one,
it's simply considered non-constant by the compiler at that stage
(this builtin is used for optimization, not during parsing, and the
error gets generated when the body of the function gets parsed,
not when code gets generated from it).
Jan
^ permalink raw reply
* Re: linux-next: tree build failure
From: roel kluin @ 2009-09-29 9:51 UTC (permalink / raw)
To: Jan Beulich
Cc: sfr-3FnU+UHB4dNDw9hX6IcOSA, hollisb-r/Jw6+rmf7HQT0dZR+AlfA,
akpm-de/tnXTf+JLsfHDXvbKv3WD2FQJk+8+b,
linuxppc-dev-uLR06cmDAlY/bJ5BZ2RsiQ,
kvm-ppc-u79uwXL29TY76Z2rM5mHXA,
linux-kernel-u79uwXL29TY76Z2rM5mHXA,
linux-next-u79uwXL29TY76Z2rM5mHXA
In-Reply-To: <4AC1E15502000078000516B5-Qfbpwmsw6RoS3W1tAdPHOtBPR1lH4CV8@public.gmane.org>
On Tue, Sep 29, 2009 at 11:28 AM, Jan Beulich <jbeulich-Et1tbQHTxzrQT0dZR+AlfA@public.gmane.org> wrote:
>>>> Hollis Blanchard 09/29/09 2:00 AM >>>
>>First, I think there is a real bug here, and the code should read like
>>this (to match the comment):
>> /* type has to be known at build time for optimization */
>>- BUILD_BUG_ON(__builtin_constant_p(type));
>>+ BUILD_BUG_ON(!__builtin_constant_p(type));
>>
>>However, I get the same build error *both* ways, i.e.
>>__builtin_constant_p(type) evaluates to both 0 and 1? Either that, or
>>the new BUILD_BUG_ON() macro isn't working...
>
> No, at this point of the compilation process it's neither zero nor one,
> it's simply considered non-constant by the compiler at that stage
> (this builtin is used for optimization, not during parsing, and the
> error gets generated when the body of the function gets parsed,
> not when code gets generated from it).
>
> Jan
then maybe
if(__builtin_constant_p(type))
BUILD_BUG_ON(1);
would work?
Roel
--
To unsubscribe from this list: send the line "unsubscribe kvm-ppc" in
the body of a message to majordomo-u79uwXL29TY76Z2rM5mHXA@public.gmane.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
^ permalink raw reply
* [PATCH] linux-next: 20090929 - android driver build breaks
From: Kamalesh Babulal @ 2009-09-29 15:20 UTC (permalink / raw)
To: gregkh; +Cc: linux-next, LKML, sfr, akpm, rientjes
In-Reply-To: <20090929140404.dfb2c5f5.sfr@canb.auug.org.au>
Hi Greg,
next-20090929 randconfig build breaks with
CONFIG_ANDROID_LOW_MEMORY_KILLER=y
drivers/staging/android/lowmemorykiller.c: In function 'lowmem_shrink':
drivers/staging/android/lowmemorykiller.c:111: error: 'struct mm_struct' has no member named 'oom_adj'
make[3]: *** [drivers/staging/android/lowmemorykiller.o] Error 1
Commit 0753ba01e126020bf0f8150934903b48935b697d was reverted back,
which moves back oom_adj from mm_struct to task_struct and commit
28b83c5193e7ab951e402252278f2cc79dc4d298 moved the oomkilladj
from task_struct to signal_struct.
Following patch reverts the changes introduced by commit
a6a9f81ccc9f5c86ccc22bbed1960a57d0316e8b to
drivers/staging/android/lowmemorykiller.c
Signed-off-by: Kamalesh Babulal <kamalesh@linux.vnet.ibm.com>
--
drivers/staging/android/lowmemorykiller.c | 8 +++-----
1 files changed, 3 insertions(+), 5 deletions(-)
diff --git a/drivers/staging/android/lowmemorykiller.c b/drivers/staging/android/lowmemorykiller.c
index 935d281..63ef837 100644
--- a/drivers/staging/android/lowmemorykiller.c
+++ b/drivers/staging/android/lowmemorykiller.c
@@ -99,21 +99,19 @@ static int lowmem_shrink(int nr_to_scan, gfp_t gfp_mask)
read_lock(&tasklist_lock);
for_each_process(p) {
- struct mm_struct *mm;
int oom_adj;
task_lock(p);
- mm = p->mm;
- if (!mm) {
+ if (!p->mm) {
task_unlock(p);
continue;
}
- oom_adj = mm->oom_adj;
+ oom_adj = p->signal->oom_adj;
if (oom_adj < min_adj) {
task_unlock(p);
continue;
}
- tasksize = get_mm_rss(mm);
+ tasksize = get_mm_rss(p->mm);
task_unlock(p);
if (tasksize <= 0)
continue;
Kamalesh
^ permalink raw reply related
* Re: [PATCH -next] drbd: trace depends on TRACING
From: Philipp Reisner @ 2009-09-29 15:32 UTC (permalink / raw)
To: drbd-dev-cunTk1MwBs8qoQakbn7OcQ
Cc: Randy Dunlap, Stephen Rothwell, akpm,
linux-next-u79uwXL29TY76Z2rM5mHXA, LKML
In-Reply-To: <4ABD4C28.9070202-QHcLZuEGTsvQT0dZR+AlfA@public.gmane.org>
On Saturday 26 September 2009 01:03:04 Randy Dunlap wrote:
> From: Randy Dunlap <randy.dunlap-QHcLZuEGTsvQT0dZR+AlfA@public.gmane.org>
>
> DRBD_TRACE should depend on TRACING.
> It's also possible that TRACEPOINTS should depend on TRACING.
>
Hi Randy,
I tried to figure out in which way that should be done. By looking
at "BLK_DEV_IO_TRACE" I got the impression that this should
be done by adding "select GENERIC_TRACER".
I will further examine this tomorrow. I just wanted to let you know
that this did not fall off the table...
-Phil
diff --git a/drivers/block/drbd/Kconfig b/drivers/block/drbd/Kconfig
index 4e6f90f..7b35287 100644
--- a/drivers/block/drbd/Kconfig
+++ b/drivers/block/drbd/Kconfig
@@ -7,7 +7,7 @@ comment "DRBD disabled because PROC_FS, INET or CONNECTOR not
selected"
config BLK_DEV_DRBD
tristate "DRBD Distributed Replicated Block Device support"
- depends on PROC_FS && INET && CONNECTOR
+ depends on BLOCK && PROC_FS && INET && CONNECTOR
select LRU_CACHE
default n
help
@@ -42,6 +42,7 @@ config DRBD_TRACE
tristate "DRBD tracing"
depends on BLK_DEV_DRBD
select TRACEPOINTS
+ select GENERIC_TRACER
default n
help
--
: Dipl-Ing Philipp Reisner
: LINBIT | Your Way to High Availability
: Tel: +43-1-8178292-50, Fax: +43-1-8178292-82
: http://www.linbit.com
DRBD(R) and LINBIT(R) are registered trademarks of LINBIT, Austria.
^ permalink raw reply related
* Re: [PATCH] linux-next: 20090929 - android driver build breaks
From: Greg KH @ 2009-09-29 15:33 UTC (permalink / raw)
To: Kamalesh Babulal; +Cc: linux-next, LKML, sfr, akpm, rientjes
In-Reply-To: <20090929152027.GC4373@linux.vnet.ibm.com>
On Tue, Sep 29, 2009 at 08:50:27PM +0530, Kamalesh Babulal wrote:
> Hi Greg,
>
> next-20090929 randconfig build breaks with
> CONFIG_ANDROID_LOW_MEMORY_KILLER=y
>
> drivers/staging/android/lowmemorykiller.c: In function 'lowmem_shrink':
> drivers/staging/android/lowmemorykiller.c:111: error: 'struct mm_struct' has no member named 'oom_adj'
> make[3]: *** [drivers/staging/android/lowmemorykiller.o] Error 1
>
> Commit 0753ba01e126020bf0f8150934903b48935b697d was reverted back,
> which moves back oom_adj from mm_struct to task_struct and commit
> 28b83c5193e7ab951e402252278f2cc79dc4d298 moved the oomkilladj
> from task_struct to signal_struct.
>
> Following patch reverts the changes introduced by commit
> a6a9f81ccc9f5c86ccc22bbed1960a57d0316e8b to
> drivers/staging/android/lowmemorykiller.c
Ick, what a mess. I'll queue this up, thanks.
greg k-h
^ permalink raw reply
* Re: [PATCH -next] drbd: trace depends on TRACING
From: Christoph Hellwig @ 2009-09-29 15:37 UTC (permalink / raw)
To: Philipp Reisner
Cc: Randy Dunlap, Stephen Rothwell, LKML,
linux-next-u79uwXL29TY76Z2rM5mHXA, akpm,
drbd-dev-cunTk1MwBs8qoQakbn7OcQ
In-Reply-To: <200909291732.51383.philipp.reisner-63ez5xqkn6DQT0dZR+AlfA@public.gmane.org>
On Tue, Sep 29, 2009 at 05:32:50PM +0200, Philipp Reisner wrote:
> On Saturday 26 September 2009 01:03:04 Randy Dunlap wrote:
> > From: Randy Dunlap <randy.dunlap-QHcLZuEGTsvQT0dZR+AlfA@public.gmane.org>
> >
> > DRBD_TRACE should depend on TRACING.
> > It's also possible that TRACEPOINTS should depend on TRACING.
> >
>
> Hi Randy,
>
> I tried to figure out in which way that should be done. By looking
> at "BLK_DEV_IO_TRACE" I got the impression that this should
> be done by adding "select GENERIC_TRACER".
Neither really. The only way of tracing that should be used is the
TRACE_EVENT macros, which compile away to nothing if tracing is
disabled, so no dependency is needed at all.
^ permalink raw reply
* Re: linux-next: tree build failure
From: Hollis Blanchard @ 2009-09-29 23:39 UTC (permalink / raw)
To: Jan Beulich
Cc: sfr-3FnU+UHB4dNDw9hX6IcOSA, akpm-de/tnXTf+JLsfHDXvbKv3WD2FQJk+8+b,
linuxppc-dev-uLR06cmDAlY/bJ5BZ2RsiQ,
kvm-ppc-u79uwXL29TY76Z2rM5mHXA,
linux-kernel-u79uwXL29TY76Z2rM5mHXA,
linux-next-u79uwXL29TY76Z2rM5mHXA
In-Reply-To: <4AC1E15502000078000516B5-Qfbpwmsw6RoS3W1tAdPHOtBPR1lH4CV8@public.gmane.org>
On Tue, 2009-09-29 at 10:28 +0100, Jan Beulich wrote:
> >>> Hollis Blanchard 09/29/09 2:00 AM >>>
> >First, I think there is a real bug here, and the code should read like
> >this (to match the comment):
> > /* type has to be known at build time for optimization */
> >- BUILD_BUG_ON(__builtin_constant_p(type));
> >+ BUILD_BUG_ON(!__builtin_constant_p(type));
> >
> >However, I get the same build error *both* ways, i.e.
> >__builtin_constant_p(type) evaluates to both 0 and 1? Either that, or
> >the new BUILD_BUG_ON() macro isn't working...
>
> No, at this point of the compilation process it's neither zero nor one,
> it's simply considered non-constant by the compiler at that stage
> (this builtin is used for optimization, not during parsing, and the
> error gets generated when the body of the function gets parsed,
> not when code gets generated from it).
I think I see what you're saying. Do you have a fix to suggest?
--
Hollis Blanchard
IBM Linux Technology Center
--
To unsubscribe from this list: send the line "unsubscribe kvm-ppc" in
the body of a message to majordomo-u79uwXL29TY76Z2rM5mHXA@public.gmane.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
^ permalink raw reply
* linux-next: manual merge of the drm tree with the tree
From: Stephen Rothwell @ 2009-09-30 1:58 UTC (permalink / raw)
To: Dave Airlie; +Cc: linux-next, linux-kernel, Jerome Glisse
Hi Dave,
Today's linux-next merge of the drm tree got a conflict in
drivers/gpu/drm/radeon/radeon_asic.h between commit
28d520433b6375740990ab99d69b0d0067fd656b ("drm/vgaarb: add VGA
arbitration support to the drm and kms") from Linus' tree and commits
d39c3b895876427c5083a936e00f3f5b7f0fc1b3 ("drm/radeon/kms: Convert RV515
to new init path and associated cleanup") and
f0ed1f655aa0375e2abba84cc4e8e6c853d48555 ("drm/radeon/kms: Convert R520
to new init path and associated cleanup") from the drm tree.
I fixed it up (see below) and can carry the fix for a while.
--
Cheers,
Stephen Rothwell sfr@canb.auug.org.au
diff --cc drivers/gpu/drm/radeon/radeon_asic.h
index 8968f78,bce0cb0..0000000
--- a/drivers/gpu/drm/radeon/radeon_asic.h
+++ b/drivers/gpu/drm/radeon/radeon_asic.h
@@@ -431,25 -421,29 +428,30 @@@ void rv515_ring_start(struct radeon_dev
uint32_t rv515_pcie_rreg(struct radeon_device *rdev, uint32_t reg);
void rv515_pcie_wreg(struct radeon_device *rdev, uint32_t reg, uint32_t v);
void rv515_bandwidth_update(struct radeon_device *rdev);
+ int rv515_resume(struct radeon_device *rdev);
+ int rv515_suspend(struct radeon_device *rdev);
static struct radeon_asic rv515_asic = {
.init = &rv515_init,
- .errata = &rv515_errata,
- .vram_info = &rv515_vram_info,
+ .fini = &rv515_fini,
+ .suspend = &rv515_suspend,
+ .resume = &rv515_resume,
+ .errata = NULL,
+ .vram_info = NULL,
+ .vga_set_state = &r100_vga_set_state,
.gpu_reset = &rv515_gpu_reset,
- .mc_init = &rv515_mc_init,
- .mc_fini = &rv515_mc_fini,
- .wb_init = &r100_wb_init,
- .wb_fini = &r100_wb_fini,
+ .mc_init = NULL,
+ .mc_fini = NULL,
+ .wb_init = NULL,
+ .wb_fini = NULL,
.gart_init = &rv370_pcie_gart_init,
.gart_fini = &rv370_pcie_gart_fini,
- .gart_enable = &rv370_pcie_gart_enable,
- .gart_disable = &rv370_pcie_gart_disable,
+ .gart_enable = NULL,
+ .gart_disable = NULL,
.gart_tlb_flush = &rv370_pcie_gart_tlb_flush,
.gart_set_page = &rv370_pcie_gart_set_page,
- .cp_init = &r100_cp_init,
- .cp_fini = &r100_cp_fini,
- .cp_disable = &r100_cp_disable,
+ .cp_init = NULL,
+ .cp_fini = NULL,
+ .cp_disable = NULL,
.cp_commit = &r100_cp_commit,
.ring_start = &rv515_ring_start,
.ring_test = &r100_ring_test,
@@@ -476,30 -470,29 +478,30 @@@
/*
* r520,rv530,rv560,rv570,r580
*/
- void r520_errata(struct radeon_device *rdev);
- void r520_vram_info(struct radeon_device *rdev);
- int r520_mc_init(struct radeon_device *rdev);
- void r520_mc_fini(struct radeon_device *rdev);
- void r520_bandwidth_update(struct radeon_device *rdev);
+ int r520_init(struct radeon_device *rdev);
+ int r520_resume(struct radeon_device *rdev);
static struct radeon_asic r520_asic = {
- .init = &rv515_init,
- .errata = &r520_errata,
- .vram_info = &r520_vram_info,
+ .init = &r520_init,
+ .fini = &rv515_fini,
+ .suspend = &rv515_suspend,
+ .resume = &r520_resume,
+ .errata = NULL,
+ .vram_info = NULL,
+ .vga_set_state = &r100_vga_set_state,
.gpu_reset = &rv515_gpu_reset,
- .mc_init = &r520_mc_init,
- .mc_fini = &r520_mc_fini,
- .wb_init = &r100_wb_init,
- .wb_fini = &r100_wb_fini,
- .gart_init = &rv370_pcie_gart_init,
- .gart_fini = &rv370_pcie_gart_fini,
- .gart_enable = &rv370_pcie_gart_enable,
- .gart_disable = &rv370_pcie_gart_disable,
+ .mc_init = NULL,
+ .mc_fini = NULL,
+ .wb_init = NULL,
+ .wb_fini = NULL,
+ .gart_init = NULL,
+ .gart_fini = NULL,
+ .gart_enable = NULL,
+ .gart_disable = NULL,
.gart_tlb_flush = &rv370_pcie_gart_tlb_flush,
.gart_set_page = &rv370_pcie_gart_set_page,
- .cp_init = &r100_cp_init,
- .cp_fini = &r100_cp_fini,
- .cp_disable = &r100_cp_disable,
+ .cp_init = NULL,
+ .cp_fini = NULL,
+ .cp_disable = NULL,
.cp_commit = &r100_cp_commit,
.ring_start = &rv515_ring_start,
.ring_test = &r100_ring_test,
^ permalink raw reply
page: next (older) | prev (newer) | latest
- recent:[subjects (threaded)|topics (new)|topics (active)]
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox