All of lore.kernel.org
 help / color / mirror / Atom feed
* linux-next: Tree for February 19
@ 2010-02-19  6:47 Stephen Rothwell
  2010-02-19 17:21 ` linux-next: Tree for February 19 (scsi/mpt2sas/raid_class) Randy Dunlap
  0 siblings, 1 reply; 8+ messages in thread
From: Stephen Rothwell @ 2010-02-19  6:47 UTC (permalink / raw)
  To: linux-next; +Cc: LKML

[-- Attachment #1: Type: text/plain, Size: 9994 bytes --]

Hi all,

Changes since 20100218:

The arm tree gained a build failure for which I applied a patch.

The scsi tree lost its build failure.

The net tree gained a build failure for which I reverted a commit.

The als tree lost its conflict.

----------------------------------------------------------------------------

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 158 trees (counting Linus' and 22 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/for-linus
Merging quilt/driver-core.current
Merging quilt/tty.current
Merging quilt/usb.current
Merging quilt/staging.current
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/davinci-next
Merging i.MX/for-next
CONFLICT (content): Merge conflict in arch/arm/Makefile
Merging msm/for-next
Merging omap/for-next
Merging pxa/for-next
Merging samsung/next-samsung
Merging avr32/avr32-arch
Merging blackfin/for-linus
Merging cris/for-next
Merging ia64/test
Merging m68k/for-next
Merging m68knommu/for-next
Merging microblaze/next
Merging mips/mips-for-linux-next
Merging parisc/next
Merging powerpc/next
Merging 4xx/next
Merging 52xx-and-virtex/next
Merging galak/next
Merging s390/features
Merging sh/master
Merging genesis/master
CONFLICT (content): Merge conflict in arch/arm/Kconfig
Merging sparc/master
Merging xtensa/master
Merging ceph/for-next
CONFLICT (content): Merge conflict in fs/gfs2/super.c
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 logfs/master
Merging nfs/linux-next
CONFLICT (content): Merge conflict in fs/gfs2/super.c
Applying: ceph: update for BDI_RECLAIMABLE change
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
CONFLICT (content): Merge conflict in fs/xfs/linux-2.6/xfs_super.c
Merging reiserfs-bkl/reiserfs/kill-bkl
Merging vfs/for-next
Applying: logfs: fixup for write_inode API change
Merging pci/linux-next
Merging hid/for-next
Merging quilt/i2c
Merging bjdooks-i2c/next-i2c
CONFLICT (content): Merge conflict in drivers/i2c/busses/Kconfig
CONFLICT (content): Merge conflict in drivers/i2c/busses/Makefile
Merging quilt/jdelvare-hwmon
Merging quilt/kernel-doc
Merging v4l-dvb/master
Merging kbuild/for-next
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
CONFLICT (content): Merge conflict in Documentation/feature-removal-schedule.txt
Merging wireless/master
CONFLICT (content): Merge conflict in drivers/net/wireless/rt2x00/rt2800pci.c
Merging mtd/master
Merging crypto/master
Merging sound/for-next
CONFLICT (content): Merge conflict in arch/arm/plat-mxc/Makefile
Merging cpufreq/next
Merging quilt/rr
CONFLICT (content): Merge conflict in drivers/char/hvc_console.c
CONFLICT (content): Merge conflict in drivers/char/hvc_console.h
Merging mmc/next
Merging tmio-mmc/linux-next
CONFLICT (content): Merge conflict in drivers/mfd/asic3.c
CONFLICT (content): Merge conflict in drivers/mfd/t7l66xb.c
CONFLICT (content): Merge conflict in drivers/mfd/tc6387xb.c
CONFLICT (content): Merge conflict in drivers/mfd/tc6393xb.c
CONFLICT (add/add): Merge conflict in drivers/mfd/tmio_core.c
CONFLICT (content): Merge conflict in drivers/mmc/host/tmio_mmc.c
CONFLICT (content): Merge conflict in drivers/mmc/host/tmio_mmc.h
CONFLICT (content): Merge conflict in include/linux/mfd/tmio.h
Merging input/next
CONFLICT (content): Merge conflict in Documentation/feature-removal-schedule.txt
Merging lsm/for-next
Merging block/for-next
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
CONFLICT (content): Merge conflict in drivers/mfd/Makefile
Merging hdlc/hdlc-next
Merging drm/drm-next
CONFLICT (content): Merge conflict in drivers/gpu/drm/drm_fb_helper.c
CONFLICT (content): Merge conflict in drivers/gpu/drm/i915/i915_irq.c
Merging voltage/for-next
Merging security-testing/next
CONFLICT (content): Merge conflict in security/tomoyo/realpath.c
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
CONFLICT (content): Merge conflict in arch/arm/mach-u300/include/mach/debug-macro.S
CONFLICT (content): Merge conflict in drivers/net/qlge/qlge_ethtool.c
CONFLICT (content): Merge conflict in drivers/net/qlge/qlge_main.c
Merging audit/for-next
Merging quilt/aoe
Merging suspend/linux-next
Merging bluetooth/master
Merging fsnotify/for-next
CONFLICT (content): Merge conflict in fs/notify/inotify/inotify_user.c
CONFLICT (content): Merge conflict in kernel/audit_tree.c
Merging irda/for-next
CONFLICT (content): Merge conflict in drivers/net/irda/irda-usb.c
Merging hwlat/for-linus
CONFLICT (content): Merge conflict in MAINTAINERS
CONFLICT (content): Merge conflict in drivers/misc/Makefile
Merging drbd/for-jens
Merging catalin/for-next
Merging alacrity/linux-next
CONFLICT (content): Merge conflict in include/linux/Kbuild
CONFLICT (content): Merge conflict in lib/Kconfig
Merging i7core_edac/linux_next
Merging devicetree/next-devicetree
CONFLICT (content): Merge conflict in arch/microblaze/include/asm/prom.h
CONFLICT (content): Merge conflict in drivers/serial/pmac_zilog.c
Merging spi/next-spi
Merging limits/writable_limits
CONFLICT (content): Merge conflict in arch/x86/ia32/ia32entry.S
CONFLICT (content): Merge conflict in arch/x86/include/asm/unistd_32.h
CONFLICT (content): Merge conflict in arch/x86/include/asm/unistd_64.h
CONFLICT (content): Merge conflict in arch/x86/kernel/syscall_table_32.S
Merging omap_dss2/for-next
Merging als/for-next
Merging tip/auto-latest
Merging edac-amd/for-next
Merging oprofile/for-next
Merging percpu/for-next
Applying: slab: update for percpu API change
Merging workqueues/for-next
Merging sfi/sfi-test
Merging asm-generic/next
Merging hwpoison/hwpoison
Merging sysctl/master
Merging quilt/driver-core
CONFLICT (content): Merge conflict in drivers/base/power/main.c
CONFLICT (content): Merge conflict in drivers/pcmcia/ds.c
CONFLICT (content): Merge conflict in include/linux/device.h
Applying: i2c: update for semaphore to mutex conversion of devices
Merging quilt/tty
Merging quilt/usb
CONFLICT (content): Merge conflict in drivers/usb/early/ehci-dbgp.c
Merging quilt/staging
CONFLICT (delete/modify): drivers/staging/sm7xx/smtc2d.c deleted in quilt/staging and modified in HEAD. Version HEAD of drivers/staging/sm7xx/smtc2d.c left in tree.
CONFLICT (delete/modify): drivers/staging/sm7xx/smtc2d.h deleted in quilt/staging and modified in HEAD. Version HEAD of drivers/staging/sm7xx/smtc2d.h left in tree.
$ git rm -f drivers/staging/sm7xx/smtc2d.c drivers/staging/sm7xx/smtc2d.h
Merging scsi-post-merge/master
[master d926255] Revert "net: Add Aeroflex Gaisler 10/100/1G Ethernet MAC driver"
Applying: sparc: fix fallout from update_mmu_cache API change

[-- Attachment #2: Type: application/pgp-signature, Size: 198 bytes --]

^ permalink raw reply	[flat|nested] 8+ messages in thread

* Re: linux-next: Tree for February 19 (scsi/mpt2sas/raid_class)
  2010-02-19  6:47 linux-next: Tree for February 19 Stephen Rothwell
@ 2010-02-19 17:21 ` Randy Dunlap
  2010-02-22  3:46   ` [PATCH -next] scsi: RAID_ATTRS depends on SCSI Randy Dunlap
  0 siblings, 1 reply; 8+ messages in thread
From: Randy Dunlap @ 2010-02-19 17:21 UTC (permalink / raw)
  To: Stephen Rothwell; +Cc: linux-next, LKML, scsi, James E.J. Bottomley

On 02/18/10 22:47, Stephen Rothwell wrote:
> Hi all,
> 
> Changes since 20100218:
> 
> 
> The scsi tree lost its build failure.


(caused by a one-line patch to scsi/mpt2sas/Kconfig:
	select RAID_ATTRS
)


When CONFIG_SCSI=m, CONFIG_RAID_ATTRS can still be =y, causing build errors
like:

ERROR: "raid_class_release" [drivers/scsi/mpt2sas/mpt2sas.ko] undefined!
ERROR: "raid_class_attach" [drivers/scsi/mpt2sas/mpt2sas.ko] undefined!

drivers/scsi/built-in.o does contain raid_class_* code (according to 'nm'),
but drivers/built-in.o does not, so I guess that drivers/Makefile:

obj-$(CONFIG_SCSI)		+= scsi/

is preventing drivers/scsi/built-in.o from being added to drivers/built-in.o.

We can:

a/  change drivers/Makefile to say:

obj-y				+= scsi/

(test: that still had a build error:
drivers/built-in.o: In function `raid_match':
raid_class.c:(.text+0x9de7c): undefined reference to `scsi_is_sdev_device'
)

b/  change drivers/scsi/Kconfig to make RAID_ATTRS depend on SCSI, so that raid_class
would be built as a module

That one does work.


Do something else?
Preferences?

-- 
~Randy

^ permalink raw reply	[flat|nested] 8+ messages in thread

* [PATCH -next] scsi: RAID_ATTRS depends on SCSI
  2010-02-19 17:21 ` linux-next: Tree for February 19 (scsi/mpt2sas/raid_class) Randy Dunlap
@ 2010-02-22  3:46   ` Randy Dunlap
  2010-03-02 11:26     ` [origin tree build failure] " Ingo Molnar
  2010-03-03  5:36     ` James Bottomley
  0 siblings, 2 replies; 8+ messages in thread
From: Randy Dunlap @ 2010-02-22  3:46 UTC (permalink / raw)
  To: linux-next, akpm; +Cc: Stephen Rothwell, LKML, scsi, James E.J. Bottomley

From: Randy Dunlap <randy.dunlap@oracle.com>

raid_class uses scsi interfaces, so it should depend on SCSI.
Otherwise build errors occur when RAID_ATTRS=y and SCSI=m:

ERROR: "raid_class_release" [drivers/scsi/mpt2sas/mpt2sas.ko] undefined!
ERROR: "raid_class_attach" [drivers/scsi/mpt2sas/mpt2sas.ko] undefined!

Signed-off-by: Randy Dunlap <randy.dunlap@oracle.com>
---
 drivers/scsi/Kconfig |   14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

--- linux-next-20100219.orig/drivers/scsi/Kconfig
+++ linux-next-20100219/drivers/scsi/Kconfig
@@ -1,12 +1,5 @@
 menu "SCSI device support"
 
-config RAID_ATTRS
-	tristate "RAID Transport Class"
-	default n
-	depends on BLOCK
-	---help---
-	  Provides RAID
-
 config SCSI
 	tristate "SCSI device support"
 	depends on BLOCK
@@ -34,6 +27,13 @@ config SCSI_DMA
 	bool
 	default n
 
+config RAID_ATTRS
+	tristate "RAID Transport Class"
+	default n
+	depends on BLOCK && SCSI
+	---help---
+	  Provides RAID
+
 config SCSI_TGT
 	tristate "SCSI target support"
 	depends on SCSI && EXPERIMENTAL

^ permalink raw reply	[flat|nested] 8+ messages in thread

* [origin tree build failure] Re: [PATCH -next] scsi: RAID_ATTRS depends on SCSI
  2010-02-22  3:46   ` [PATCH -next] scsi: RAID_ATTRS depends on SCSI Randy Dunlap
@ 2010-03-02 11:26     ` Ingo Molnar
  2010-03-02 23:30       ` Stephen Rothwell
  2010-03-03  5:36     ` James Bottomley
  1 sibling, 1 reply; 8+ messages in thread
From: Ingo Molnar @ 2010-03-02 11:26 UTC (permalink / raw)
  To: Randy Dunlap, Linus Torvalds
  Cc: linux-next, akpm, Stephen Rothwell, LKML, scsi, James E.J. Bottomley


* Randy Dunlap <rdunlap@xenotime.net> wrote:

> From: Randy Dunlap <randy.dunlap@oracle.com>
> 
> raid_class uses scsi interfaces, so it should depend on SCSI.
> Otherwise build errors occur when RAID_ATTRS=y and SCSI=m:
> 
> ERROR: "raid_class_release" [drivers/scsi/mpt2sas/mpt2sas.ko] undefined!
> ERROR: "raid_class_attach" [drivers/scsi/mpt2sas/mpt2sas.ko] undefined!

FYI, this build bug has been pushed upstream via the SCSI tree, without 
Randy's fix.

I have applied Randy's drivers/scsi/Kconfig fix to tip:out-of-tree and that 
solves the build bug here.

 Tested-by: Ingo Molnar <mingo@elte.hu>

Thanks,

	Ingo

^ permalink raw reply	[flat|nested] 8+ messages in thread

* Re: [origin tree build failure] Re: [PATCH -next] scsi: RAID_ATTRS depends on SCSI
  2010-03-02 11:26     ` [origin tree build failure] " Ingo Molnar
@ 2010-03-02 23:30       ` Stephen Rothwell
  0 siblings, 0 replies; 8+ messages in thread
From: Stephen Rothwell @ 2010-03-02 23:30 UTC (permalink / raw)
  To: Ingo Molnar
  Cc: Randy Dunlap, Linus Torvalds, linux-next, akpm, LKML, scsi,
	James E.J. Bottomley

[-- Attachment #1: Type: text/plain, Size: 963 bytes --]

Hi Ingo,

On Tue, 2 Mar 2010 12:26:03 +0100 Ingo Molnar <mingo@elte.hu> wrote:
>
> * Randy Dunlap <rdunlap@xenotime.net> wrote:
> 
> > From: Randy Dunlap <randy.dunlap@oracle.com>
> > 
> > raid_class uses scsi interfaces, so it should depend on SCSI.
> > Otherwise build errors occur when RAID_ATTRS=y and SCSI=m:
> > 
> > ERROR: "raid_class_release" [drivers/scsi/mpt2sas/mpt2sas.ko] undefined!
> > ERROR: "raid_class_attach" [drivers/scsi/mpt2sas/mpt2sas.ko] undefined!
> 
> FYI, this build bug has been pushed upstream via the SCSI tree, without 
> Randy's fix.
> 
> I have applied Randy's drivers/scsi/Kconfig fix to tip:out-of-tree and that 
> solves the build bug here.
> 
>  Tested-by: Ingo Molnar <mingo@elte.hu>

Thanks for the heads up Ingo, I have added that to my fixes tree as well
so it will be in 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	[flat|nested] 8+ messages in thread

* Re: [PATCH -next] scsi: RAID_ATTRS depends on SCSI
  2010-02-22  3:46   ` [PATCH -next] scsi: RAID_ATTRS depends on SCSI Randy Dunlap
  2010-03-02 11:26     ` [origin tree build failure] " Ingo Molnar
@ 2010-03-03  5:36     ` James Bottomley
  2010-03-03  6:17       ` Stephen Rothwell
  2010-03-03 16:56       ` Randy Dunlap
  1 sibling, 2 replies; 8+ messages in thread
From: James Bottomley @ 2010-03-03  5:36 UTC (permalink / raw)
  To: Randy Dunlap; +Cc: linux-next, akpm, Stephen Rothwell, LKML, scsi

On Sun, 2010-02-21 at 19:46 -0800, Randy Dunlap wrote:
> From: Randy Dunlap <randy.dunlap@oracle.com>
> 
> raid_class uses scsi interfaces, so it should depend on SCSI.
> Otherwise build errors occur when RAID_ATTRS=y and SCSI=m:
> 
> ERROR: "raid_class_release" [drivers/scsi/mpt2sas/mpt2sas.ko] undefined!
> ERROR: "raid_class_attach" [drivers/scsi/mpt2sas/mpt2sas.ko] undefined!
> 
> Signed-off-by: Randy Dunlap <randy.dunlap@oracle.com>
> ---
>  drivers/scsi/Kconfig |   14 +++++++-------
>  1 file changed, 7 insertions(+), 7 deletions(-)
> 
> --- linux-next-20100219.orig/drivers/scsi/Kconfig
> +++ linux-next-20100219/drivers/scsi/Kconfig
> @@ -1,12 +1,5 @@
>  menu "SCSI device support"
>  
> -config RAID_ATTRS
> -	tristate "RAID Transport Class"
> -	default n
> -	depends on BLOCK
> -	---help---
> -	  Provides RAID
> -
>  config SCSI
>  	tristate "SCSI device support"
>  	depends on BLOCK
> @@ -34,6 +27,13 @@ config SCSI_DMA
>  	bool
>  	default n
>  
> +config RAID_ATTRS
> +	tristate "RAID Transport Class"
> +	default n
> +	depends on BLOCK && SCSI
> +	---help---
> +	  Provides RAID
> +

This will fix the error, but it's not quite the right thing to do.  the
RAID class should be independent of SCSI, but it wants to do a SCSI
check if SCSI is compiled in the matching routines.  This gives us a
nasty dependency, the condition being that the raid class must be m if
SCSI is m.

I think this patch does the right thing.  Can someone test it on the
config checker?  Or I can just put it in linux-next and have Stephen's
builds do it.

Thanks,

James

---

diff --git a/drivers/scsi/Kconfig b/drivers/scsi/Kconfig
index 9191d1e..75f2336 100644
--- a/drivers/scsi/Kconfig
+++ b/drivers/scsi/Kconfig
@@ -1,9 +1,15 @@
 menu "SCSI device support"
 
+config SCSI_MOD
+       tristate
+       default y if SCSI=n || SCSI=y
+       default m if SCSI=m
+
 config RAID_ATTRS
 	tristate "RAID Transport Class"
 	default n
 	depends on BLOCK
+	depends on SCSI_MOD
 	---help---
 	  Provides RAID
 
diff --git a/drivers/scsi/raid_class.c b/drivers/scsi/raid_class.c
index bd88349..2c146b4 100644
--- a/drivers/scsi/raid_class.c
+++ b/drivers/scsi/raid_class.c
@@ -63,6 +63,7 @@ static int raid_match(struct attribute_container *cont, struct device *dev)
 	 * emulated RAID devices, so start with SCSI */
 	struct raid_internal *i = ac_to_raid_internal(cont);
 
+#if defined(CONFIG_SCSI) || defined(CONFIG_SCSI_MODULE)
 	if (scsi_is_sdev_device(dev)) {
 		struct scsi_device *sdev = to_scsi_device(dev);
 
@@ -71,6 +72,7 @@ static int raid_match(struct attribute_container *cont, struct device *dev)
 
 		return i->f->is_raid(dev);
 	}
+#endif
 	/* FIXME: look at other subsystems too */
 	return 0;
 }



^ permalink raw reply related	[flat|nested] 8+ messages in thread

* Re: [PATCH -next] scsi: RAID_ATTRS depends on SCSI
  2010-03-03  5:36     ` James Bottomley
@ 2010-03-03  6:17       ` Stephen Rothwell
  2010-03-03 16:56       ` Randy Dunlap
  1 sibling, 0 replies; 8+ messages in thread
From: Stephen Rothwell @ 2010-03-03  6:17 UTC (permalink / raw)
  To: James Bottomley; +Cc: Randy Dunlap, linux-next, akpm, LKML, scsi

[-- Attachment #1: Type: text/plain, Size: 823 bytes --]

Hi James,

On Wed, 03 Mar 2010 11:06:56 +0530 James Bottomley <James.Bottomley@suse.de> wrote:
>
> This will fix the error, but it's not quite the right thing to do.  the
> RAID class should be independent of SCSI, but it wants to do a SCSI
> check if SCSI is compiled in the matching routines.  This gives us a
> nasty dependency, the condition being that the raid class must be m if
> SCSI is m.
> 
> I think this patch does the right thing.  Can someone test it on the
> config checker?  Or I can just put it in linux-next and have Stephen's
> builds do it.

My tree for today has Randy's fix in it.  Also, you should really test
against Linus' tree as that is where the problem currently lies.

-- 
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	[flat|nested] 8+ messages in thread

* Re: [PATCH -next] scsi: RAID_ATTRS depends on SCSI
  2010-03-03  5:36     ` James Bottomley
  2010-03-03  6:17       ` Stephen Rothwell
@ 2010-03-03 16:56       ` Randy Dunlap
  1 sibling, 0 replies; 8+ messages in thread
From: Randy Dunlap @ 2010-03-03 16:56 UTC (permalink / raw)
  To: James Bottomley; +Cc: linux-next, akpm, Stephen Rothwell, LKML, scsi

On 03/02/10 21:36, James Bottomley wrote:
> On Sun, 2010-02-21 at 19:46 -0800, Randy Dunlap wrote:
>> From: Randy Dunlap <randy.dunlap@oracle.com>
>>
>> raid_class uses scsi interfaces, so it should depend on SCSI.
>> Otherwise build errors occur when RAID_ATTRS=y and SCSI=m:
>>
>> ERROR: "raid_class_release" [drivers/scsi/mpt2sas/mpt2sas.ko] undefined!
>> ERROR: "raid_class_attach" [drivers/scsi/mpt2sas/mpt2sas.ko] undefined!
>>
>> Signed-off-by: Randy Dunlap <randy.dunlap@oracle.com>
>> ---
>>  drivers/scsi/Kconfig |   14 +++++++-------
>>  1 file changed, 7 insertions(+), 7 deletions(-)
>>
>> --- linux-next-20100219.orig/drivers/scsi/Kconfig
>> +++ linux-next-20100219/drivers/scsi/Kconfig
>> @@ -1,12 +1,5 @@
>>  menu "SCSI device support"
>>  
>> -config RAID_ATTRS
>> -	tristate "RAID Transport Class"
>> -	default n
>> -	depends on BLOCK
>> -	---help---
>> -	  Provides RAID
>> -
>>  config SCSI
>>  	tristate "SCSI device support"
>>  	depends on BLOCK
>> @@ -34,6 +27,13 @@ config SCSI_DMA
>>  	bool
>>  	default n
>>  
>> +config RAID_ATTRS
>> +	tristate "RAID Transport Class"
>> +	default n
>> +	depends on BLOCK && SCSI
>> +	---help---
>> +	  Provides RAID
>> +
> 
> This will fix the error, but it's not quite the right thing to do.  the
> RAID class should be independent of SCSI, but it wants to do a SCSI
> check if SCSI is compiled in the matching routines.  This gives us a
> nasty dependency, the condition being that the raid class must be m if
> SCSI is m.
> 
> I think this patch does the right thing.  Can someone test it on the
> config checker?  Or I can just put it in linux-next and have Stephen's
> builds do it.

Acked-by: Randy Dunlap <randy.dunlap@oracle.com>

Thanks for the patch.

> Thanks,
> 
> James
> 
> ---
> 
> diff --git a/drivers/scsi/Kconfig b/drivers/scsi/Kconfig
> index 9191d1e..75f2336 100644
> --- a/drivers/scsi/Kconfig
> +++ b/drivers/scsi/Kconfig
> @@ -1,9 +1,15 @@
>  menu "SCSI device support"
>  
> +config SCSI_MOD
> +       tristate
> +       default y if SCSI=n || SCSI=y
> +       default m if SCSI=m
> +
>  config RAID_ATTRS
>  	tristate "RAID Transport Class"
>  	default n
>  	depends on BLOCK
> +	depends on SCSI_MOD
>  	---help---
>  	  Provides RAID
>  
> diff --git a/drivers/scsi/raid_class.c b/drivers/scsi/raid_class.c
> index bd88349..2c146b4 100644
> --- a/drivers/scsi/raid_class.c
> +++ b/drivers/scsi/raid_class.c
> @@ -63,6 +63,7 @@ static int raid_match(struct attribute_container *cont, struct device *dev)
>  	 * emulated RAID devices, so start with SCSI */
>  	struct raid_internal *i = ac_to_raid_internal(cont);
>  
> +#if defined(CONFIG_SCSI) || defined(CONFIG_SCSI_MODULE)
>  	if (scsi_is_sdev_device(dev)) {
>  		struct scsi_device *sdev = to_scsi_device(dev);
>  
> @@ -71,6 +72,7 @@ static int raid_match(struct attribute_container *cont, struct device *dev)
>  
>  		return i->f->is_raid(dev);
>  	}
> +#endif
>  	/* FIXME: look at other subsystems too */
>  	return 0;
>  }
> 
> 


-- 
~Randy

^ permalink raw reply	[flat|nested] 8+ messages in thread

end of thread, other threads:[~2010-03-03 16:56 UTC | newest]

Thread overview: 8+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2010-02-19  6:47 linux-next: Tree for February 19 Stephen Rothwell
2010-02-19 17:21 ` linux-next: Tree for February 19 (scsi/mpt2sas/raid_class) Randy Dunlap
2010-02-22  3:46   ` [PATCH -next] scsi: RAID_ATTRS depends on SCSI Randy Dunlap
2010-03-02 11:26     ` [origin tree build failure] " Ingo Molnar
2010-03-02 23:30       ` Stephen Rothwell
2010-03-03  5:36     ` James Bottomley
2010-03-03  6:17       ` Stephen Rothwell
2010-03-03 16:56       ` Randy Dunlap

This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.