Skip to contentSkip to conversation

linux-next: Tree for September 20

PATCH In review Stephen Rothwell 6 participants 11 messages Sep 20, 2010 – Sep 23, 2010

Subsystems (3)
lore
Share & tools
lore
#0 lore raw

Hi all,

Changes since 20100917:

The msm tree no longer needs its merge fix.

The powerpc tree still has its build failure for which I applied a patch.

The ceph tree gained a build failure so I used the version from next-20100917.

The kvm tree lost its conflicts.

The block tree still has its build failure so I used the version from next-20100916.

The kgdb tree still has its build failure for which I applied a patch.

The mfd lost its build failure and conflict.

The viafb tree gained a build failure so I used the version from next-20100917.

The rcu tree lost its build failure.

I still have a patch to the drivers-x86 tree to remove a Kconfig warning.

The bkl-trivial tree gained a conflict against the mmc tree.

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

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 173 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 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.

Signature · 230 lines
Cheers,
Stephen Rothwell                    [email protected]

$ git checkout master
$ git reset --hard stable
Merging origin/master
Merging fixes/fixes
Merging arm-current/master
Merging m68k-current/for-linus
Merging powerpc-merge/merge
Merging sparc-current/master
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/rc-fixes
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 gcl-current/merge
Merging arm/devel
Merging davinci/davinci-next
Merging i.MX/for-next
Merging msm/for-next
Merging omap/for-next
Merging pxa/for-next
Merging samsung/next-samsung
CONFLICT (content): Merge conflict in arch/arm/mach-s3c64xx/Makefile
CONFLICT (content): Merge conflict in arch/arm/mach-s3c64xx/mach-smdk6410.c
CONFLICT (content): Merge conflict in arch/arm/plat-samsung/Kconfig
CONFLICT (content): Merge conflict in drivers/input/touchscreen/s3c2410_ts.c
Merging s5p/for-next
CONFLICT (content): Merge conflict in arch/arm/mach-s3c64xx/dev-spi.c
CONFLICT (content): Merge conflict in arch/arm/mach-s5pv210/cpu.c
Merging tegra/for-next
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
Applying: powerpc: define a compat_sys_recv cond_syscall
Merging 4xx/next
Merging 52xx-and-virtex/next
Merging galak/next
CONFLICT (content): Merge conflict in arch/powerpc/platforms/85xx/mpc85xx_mds.c
Merging s390/features
Merging sh/master
Merging genesis/master
Merging sparc/master
Merging tile/master
Merging xtensa/master
CONFLICT (content): Merge conflict in arch/xtensa/configs/iss_defconfig
Merging ceph/for-next
$ git reset --hard HEAD^
Merging refs/next/20100917/ceph
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
CONFLICT (content): Merge conflict in fs/logfs/logfs.h
Merging nfs/linux-next
Merging nfsd/nfsd-next
Merging nilfs2/for-next
Merging ocfs2/linux-next
Merging omfs/for-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 bjdooks-i2c/next-i2c
Merging quilt/jdelvare-hwmon
Merging quilt/kernel-doc
Merging v4l-dvb/master
CONFLICT (content): Merge conflict in drivers/media/IR/ir-keytable.c
CONFLICT (content): Merge conflict in drivers/media/IR/ir-lirc-codec.c
CONFLICT (content): Merge conflict in drivers/media/IR/ir-raw-event.c
CONFLICT (add/add): Merge conflict in drivers/media/IR/streamzap.c
CONFLICT (content): Merge conflict in drivers/media/dvb/siano/smscoreapi.c
CONFLICT (add/add): Merge conflict in drivers/media/video/s5p-fimc/fimc-core.c
Merging kbuild/for-next
Merging kconfig/for-next
Merging ide/master
Merging libata/NEXT
Merging infiniband/for-next
Merging acpi/test
Merging idle-test/idle-test
Merging ieee1394/for-next
Merging ubi/linux-next
Merging kvm/linux-next
Merging dlm/next
Merging swiotlb/master
Merging swiotlb-xen/master
Merging ibft/master
Merging scsi/master
Merging async_tx/next
Merging net/master
CONFLICT (content): Merge conflict in drivers/net/pcmcia/pcnet_cs.c
Merging wireless/master
Merging mtd/master
Merging crypto/master
Merging sound-asoc/for-next
CONFLICT (content): Merge conflict in arch/arm/mach-s3c64xx/mach-smdk6410.c
CONFLICT (content): Merge conflict in drivers/video/sh_mobile_hdmi.c
Merging sound/for-next
Merging cpufreq/next
Merging quilt/rr
Merging input/next
Merging lsm/for-next
Merging block/for-next
$ git reset --hard HEAD^
Merging refs/next/20100916/block
CONFLICT (content): Merge conflict in block/blk-core.c
CONFLICT (content): Merge conflict in drivers/block/loop.c
[master 239cc7c] Merge commit 'refs/next/20100916/block'
Merging quilt/device-mapper
Merging embedded/master
Merging firmware/master
Merging pcmcia/master
CONFLICT (content): Merge conflict in drivers/net/pcmcia/smc91c92_cs.c
Merging battery/master
Merging leds/for-mm
Merging backlight/for-mm
Merging mmc/mmc-next
Merging kgdb/kgdb-next
Applying: kgdb: merge fix for mode_set_base_atomic API change
Merging slab/for-next
Merging uclinux/for-next
Merging md/for-next
Merging mfd/for-next
CONFLICT (content): Merge conflict in drivers/mfd/sh_mobile_sdhi.c
Merging hdlc/hdlc-next
Merging drm/drm-next
Merging viafb/viafb-next
$ git reset --hard HEAD^
Merging refs/next/20100917/viafb
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 quilt/aoe
Merging suspend/linux-next
Merging bluetooth/master
Merging fsnotify/for-next
Merging irda/for-next
CONFLICT (content): Merge conflict in drivers/net/irda/irda-usb.c
Merging catalin/for-next
CONFLICT (content): Merge conflict in arch/arm/include/asm/smp_plat.h
CONFLICT (content): Merge conflict in arch/arm/kernel/Makefile
Merging alacrity/linux-next
CONFLICT (content): Merge conflict in include/linux/Kbuild
Merging i7core_edac/linux_next
CONFLICT (content): Merge conflict in MAINTAINERS
Merging devicetree/next-devicetree
Merging spi/next-spi
Merging omap_dss2/for-next
Merging xen/upstream/xen
Merging rcu/rcu/next
Merging tip/auto-latest
CONFLICT (content): Merge conflict in net/core/dev.c
Merging lost-spurious-irq/lost-spurious-irq
CONFLICT (content): Merge conflict in drivers/ata/libata-core.c
CONFLICT (content): Merge conflict in include/linux/libata.h
Merging edac-amd/for-next
Merging oprofile/for-next
Merging percpu/for-next
CONFLICT (content): Merge conflict in mm/percpu.c
Merging workqueues/for-next
Merging sfi/sfi-test
Merging asm-generic/next
Merging drivers-x86/linux-next
Applying: Fix Kconfig mistaken update
Merging hwpoison/hwpoison
Merging sysctl/master
Merging quilt/driver-core
CONFLICT (content): Merge conflict in drivers/misc/Makefile
Merging quilt/tty
Merging quilt/usb
CONFLICT (content): Merge conflict in drivers/usb/gadget/rndis.c
Merging staging-next/staging-next
CONFLICT (content): Merge conflict in drivers/staging/Makefile
CONFLICT (content): Merge conflict in drivers/staging/batman-adv/hard-interface.c
CONFLICT (delete/modify): drivers/staging/mrst-touchscreen/Makefile deleted in HEAD and modified in staging-next/staging-next. Version staging-next/staging-next of drivers/staging/mrst-touchscreen/Makefile left in tree.
CONFLICT (delete/modify): drivers/staging/mrst-touchscreen/intel-mid-touch.c deleted in HEAD and modified in staging-next/staging-next. Version staging-next/staging-next of drivers/staging/mrst-touchscreen/intel-mid-touch.c left in tree.
$ git rm -f drivers/staging/mrst-touchscreen/Makefile drivers/staging/mrst-touchscreen/intel-mid-touch.c
Merging slabh/slabh
Merging bkl-trivial/trivial
CONFLICT (content): Merge conflict in drivers/char/pcmcia/cm4000_cs.c
CONFLICT (content): Merge conflict in drivers/char/pcmcia/cm4040_cs.c
CONFLICT (content): Merge conflict in drivers/mmc/card/block.c
Merging bkl-llseek/llseek
Merging bkl-vfs/vfs
CONFLICT (content): Merge conflict in fs/nilfs2/super.c
Merging bkl-config/config
Merging irqflags/master
Merging scsi-post-merge/merge-base:master
#1 lore raw

Re: linux-next: Tree for September 20 (scsi/pcmcia/nsp_cs.c)

Quoted 3 lines · On Mon, 20 Sep 2010 16:12:39 +1000 Stephen Rothwell wrote:

Hi all,

Changes since 20100917:

drivers/scsi/pcmcia/nsp_cs.c:1573: error: 'cfg' undeclared (first use in this function) drivers/scsi/pcmcia/nsp_cs.c:1592: error: dereferencing pointer to incomplete type drivers/scsi/pcmcia/nsp_cs.c:1595: error: dereferencing pointer to incomplete type drivers/scsi/pcmcia/nsp_cs.c:1697: error: 'struct pcmcia_device' has no member named 'win'

(rand)config is attached.

---
~Randy
*** Remember to use Documentation/SubmitChecklist when testing your code ***

#2 lore raw

Re: linux-next: Tree for September 20 (scsi/pcmcia/nsp_cs.c)

Thanks for testing, should be fixed for tomorrow.

Quoted 18 lines · Randy Dunlap
Quoted 3 lines · On Mon, 20 Sep 2010 16:12:39 +1000 Stephen Rothwell wrote:

Hi all,

Changes since 20100917:

drivers/scsi/pcmcia/nsp_cs.c:1573: error: 'cfg' undeclared (first use in this function) drivers/scsi/pcmcia/nsp_cs.c:1592: error: dereferencing pointer to incomplete type drivers/scsi/pcmcia/nsp_cs.c:1595: error: dereferencing pointer to incomplete type drivers/scsi/pcmcia/nsp_cs.c:1697: error: 'struct pcmcia_device' has no member named 'win'

(rand)config is attached.

---
~Randy
*** Remember to use Documentation/SubmitChecklist when testing your code ***

#3 lore raw

PATCH 1/1 driver core: fix build for CONFIG_BLOCK=n

In reply to Stephen Rothwell

From: Randy Dunlap <[email protected]>

Fix build when CONFIG_BLOCK is not enabled (since SEP-06). Fixes these build errors:

drivers/base/core.c: In function 'get_device_parent':
drivers/base/core.c:622: error: 'block_class' undeclared (first use in this function) drivers/base/core.c: In function 'device_add_class_symlinks':
drivers/base/core.c:712: error: 'block_class' undeclared (first use in this function) drivers/base/core.c: In function 'device_remove_class_symlinks':
drivers/base/core.c:742: error: 'block_class' undeclared (first use in this function)

---
 drivers/base/core.c |    6 ++++++
 1 file changed, 6 insertions(+)
drivers/base/core.c +6 -0
@@ -618,6 +618,7 @@ static struct kobject *get_device_parent
 		struct kobject *k;
 
 #ifdef CONFIG_SYSFS_DEPRECATED
+#ifdef CONFIG_BLOCK
 		/* block disks show up in /sys/block */
 		if (dev->class == &block_class) {
 			if (parent && parent->class == &block_class)
@@ -625,6 +626,7 @@ static struct kobject *get_device_parent
 			return &block_class.p->class_subsys.kobj;
 		}
 #endif
+#endif
 		/*
 		 * If we have no parent, we live in "virtual".
 		 * Class-devices with a non class-device as parent, live
@@ -708,10 +710,12 @@ static int device_add_class_symlinks(str
 	}
 
 #ifdef CONFIG_SYSFS_DEPRECATED
+#ifdef CONFIG_BLOCK
 	/* /sys/block has directories and does not need symlinks */
 	if (dev->class == &block_class)
 		return 0;
 #endif
+#endif
 
 	/* link in the class directory pointing to the device */
 	error = sysfs_create_link(&dev->class->p->class_subsys.kobj,
@@ -739,9 +743,11 @@ static void device_remove_class_symlinks
 		sysfs_remove_link(&dev->kobj, "device");
 	sysfs_remove_link(&dev->kobj, "subsystem");
 #ifdef CONFIG_SYSFS_DEPRECATED
+#ifdef CONFIG_BLOCK
 	if (dev->class == &block_class)
 		return;
 #endif
+#endif
 	sysfs_delete_link(&dev->class->p->class_subsys.kobj, &dev->kobj, dev_name(dev));
 }
 
#4 lore raw

Re: [PATCH -next] driver core: fix build for CONFIG_BLOCK=n

Quoted 5 lines · Randy Dunlap

From: Randy Dunlap <[email protected]>

Fix build when CONFIG_BLOCK is not enabled (since SEP-06). Fixes these build errors:

Quoted 8 lines

drivers/base/core.c: In function 'get_device_parent':
drivers/base/core.c:622: error: 'block_class' undeclared (first use in this function) drivers/base/core.c: In function 'device_add_class_symlinks':
drivers/base/core.c:712: error: 'block_class' undeclared (first use in this function) drivers/base/core.c: In function 'device_remove_class_symlinks':
drivers/base/core.c:742: error: 'block_class' undeclared (first use in this function)

This should no longer be needed with the next linux-next tree as the logic in this area has changed thanks to Andi's patch.

thanks,

greg k-h

#5 lore raw

Re: [PATCH -next] driver core: fix build for CONFIG_BLOCK=n

Quoted 13 lines · On Tue, 21 Sep 2010 15:31:15 -0700 Greg KH wrote:
Quoted 12 lines · Randy Dunlap

From: Randy Dunlap <[email protected]>

Fix build when CONFIG_BLOCK is not enabled (since SEP-06). Fixes these build errors:

drivers/base/core.c: In function 'get_device_parent':
drivers/base/core.c:622: error: 'block_class' undeclared (first use in this function) drivers/base/core.c: In function 'device_add_class_symlinks':
drivers/base/core.c:712: error: 'block_class' undeclared (first use in this function) drivers/base/core.c: In function 'device_remove_class_symlinks':
drivers/base/core.c:742: error: 'block_class' undeclared (first use in this function)

Quoted 4 lines
Quoted 1 line

This should no longer be needed with the next linux-next tree as the logic in this area has changed thanks to Andi's patch.

{sorry about resend, email problems}

Still seeing this build error. (linux-next 2010-0923) Will you be merging some patch soon?

---
~Randy
*** Remember to use Documentation/SubmitChecklist when testing your code ***

#6 lore raw

Re: [PATCH -next] driver core: fix build for CONFIG_BLOCK=n

Quoted 17 lines · Randy Dunlap
Quoted 15 lines · On Tue, 21 Sep 2010 15:31:15 -0700 Greg KH wrote:
Quoted 13 lines · Randy Dunlap

From: Randy Dunlap <[email protected]>

Fix build when CONFIG_BLOCK is not enabled (since SEP-06). Fixes these build errors:

drivers/base/core.c: In function 'get_device_parent':
drivers/base/core.c:622: error: 'block_class' undeclared (first use in this function) drivers/base/core.c: In function 'device_add_class_symlinks':
drivers/base/core.c:712: error: 'block_class' undeclared (first use in this function) drivers/base/core.c: In function 'device_remove_class_symlinks':
drivers/base/core.c:742: error: 'block_class' undeclared (first use in this function)

Quoted 8 lines
Quoted 2 lines

This should no longer be needed with the next linux-next tree as the logic in this area has changed thanks to Andi's patch.

{sorry about resend, email problems}

Still seeing this build error. (linux-next 2010-0923) Will you be merging some patch soon?

Not unless someone provides it. I know of no valid user of the kernel that does not enable CONFIG_BLOCK, so I really doubt this will ever hit anyone in "real life" so it's _way_ down the list of things I have to do at the moment, sorry.

thanks,

greg k-h

#7 lore raw

Re: [PATCH -next] driver core: fix build for CONFIG_BLOCK=n

Quoted 16 lines · On Thu, 23 Sep 2010 12:16:29 -0700 Greg KH wrote:
Quoted 15 lines · Randy Dunlap
Quoted 13 lines · On Tue, 21 Sep 2010 15:31:15 -0700 Greg KH wrote:
Quoted 12 lines · Randy Dunlap

From: Randy Dunlap <[email protected]>

Fix build when CONFIG_BLOCK is not enabled (since SEP-06). Fixes these build errors:

drivers/base/core.c: In function 'get_device_parent':
drivers/base/core.c:622: error: 'block_class' undeclared (first use in this function) drivers/base/core.c: In function 'device_add_class_symlinks':
drivers/base/core.c:712: error: 'block_class' undeclared (first use in this function) drivers/base/core.c: In function 'device_remove_class_symlinks':
drivers/base/core.c:742: error: 'block_class' undeclared (first use in this function)

Quoted 4 lines
Quoted 4 lines
Quoted 4 lines
Quoted 1 line

This should no longer be needed with the next linux-next tree as the logic in this area has changed thanks to Andi's patch.

                                     ~~~~~~~~~~~~~~~~~~~~~~~
Quoted 11 lines
Quoted 6 lines

{sorry about resend, email problems}

Still seeing this build error. (linux-next 2010-0923) Will you be merging some patch soon?

Not unless someone provides it. I know of no valid user of the kernel that does not enable CONFIG_BLOCK, so I really doubt this will ever hit anyone in "real life" so it's _way_ down the list of things I have to do at the moment, sorry.

so what was your comment about Andi's patch (above)?

Do you have it? Have you merged it?

---
~Randy
*** Remember to use Documentation/SubmitChecklist when testing your code ***

#8 lore raw

Re: [PATCH -next] driver core: fix build for CONFIG_BLOCK=n

Quoted 31 lines · Randy Dunlap
Quoted 16 lines · On Thu, 23 Sep 2010 12:16:29 -0700 Greg KH wrote:
Quoted 15 lines · Randy Dunlap
Quoted 13 lines · On Tue, 21 Sep 2010 15:31:15 -0700 Greg KH wrote:
Quoted 12 lines · Randy Dunlap

From: Randy Dunlap <[email protected]>

Fix build when CONFIG_BLOCK is not enabled (since SEP-06). Fixes these build errors:

drivers/base/core.c: In function 'get_device_parent':
drivers/base/core.c:622: error: 'block_class' undeclared (first use in this function) drivers/base/core.c: In function 'device_add_class_symlinks':
drivers/base/core.c:712: error: 'block_class' undeclared (first use in this function) drivers/base/core.c: In function 'device_remove_class_symlinks':
drivers/base/core.c:742: error: 'block_class' undeclared (first use in this function)

Quoted 4 lines
Quoted 4 lines
Quoted 4 lines
Quoted 1 line

This should no longer be needed with the next linux-next tree as the logic in this area has changed thanks to Andi's patch.

                                     ~~~~~~~~~~~~~~~~~~~~~~~
Quoted 7 lines
Quoted 6 lines

{sorry about resend, email problems}

Still seeing this build error. (linux-next 2010-0923) Will you be merging some patch soon?

Quoted 6 lines
Quoted 4 lines

Not unless someone provides it. I know of no valid user of the kernel that does not enable CONFIG_BLOCK, so I really doubt this will ever hit anyone in "real life" so it's _way_ down the list of things I have to do at the moment, sorry.

so what was your comment about Andi's patch (above)?

It's merged already, and because of it, your patch failed to apply.

thanks,

greg k-h

#9 lore raw

Re: [PATCH -next] driver core: fix build for CONFIG_BLOCK=n

Quoted 29 lines · On Thu, 23 Sep 2010 13:30:06 -0700 Greg KH wrote:
Quoted 28 lines · Randy Dunlap
Quoted 16 lines · On Thu, 23 Sep 2010 12:16:29 -0700 Greg KH wrote:
Quoted 15 lines · Randy Dunlap
Quoted 13 lines · On Tue, 21 Sep 2010 15:31:15 -0700 Greg KH wrote:
Quoted 12 lines · Randy Dunlap

From: Randy Dunlap <[email protected]>

Fix build when CONFIG_BLOCK is not enabled (since SEP-06). Fixes these build errors:

drivers/base/core.c: In function 'get_device_parent':
drivers/base/core.c:622: error: 'block_class' undeclared (first use in this function) drivers/base/core.c: In function 'device_add_class_symlinks':
drivers/base/core.c:712: error: 'block_class' undeclared (first use in this function) drivers/base/core.c: In function 'device_remove_class_symlinks':
drivers/base/core.c:742: error: 'block_class' undeclared (first use in this function)

Quoted 4 lines
Quoted 4 lines
Quoted 4 lines
Quoted 1 line

This should no longer be needed with the next linux-next tree as the logic in this area has changed thanks to Andi's patch.

                                     ~~~~~~~~~~~~~~~~~~~~~~~
Quoted 4 lines
Quoted 4 lines

{sorry about resend, email problems}

Quoted 7 lines
Quoted 7 lines
Quoted 7 lines
Quoted 2 lines

Still seeing this build error. (linux-next 2010-0923) Will you be merging some patch soon?

Not unless someone provides it. I know of no valid user of the kernel that does not enable CONFIG_BLOCK, so I really doubt this will ever hit anyone in "real life" so it's _way_ down the list of things I have to do at the moment, sorry.

Maybe you should just submit a patch to remove CONFIG_BLOCK. (and many other kconfig symbols)

Quoted 3 lines
Quoted 1 line

so what was your comment about Andi's patch (above)?

It's merged already, and because of it, your patch failed to apply.

OK, so I disagree with your comment:

Quoted 2 lines
Quoted 2 lines
Quoted 2 lines
Quoted 2 lines
Quoted 2 lines

This should no longer be needed with the next linux-next tree as the logic in this area has changed thanks to Andi's patch.

but I now understand that my patch failed to apply. Thanks for the info.

---
~Randy
*** Remember to use Documentation/SubmitChecklist when testing your code ***

#10 lore raw

Re: [PATCH -next] driver core: fix build for CONFIG_BLOCK=n

In reply to Greg KH
Quoted 13 lines · On Tue, 21 Sep 2010 15:31:15 -0700 Greg KH wrote:
Quoted 12 lines · Randy Dunlap

From: Randy Dunlap <[email protected]>

Fix build when CONFIG_BLOCK is not enabled (since SEP-06). Fixes these build errors:

drivers/base/core.c: In function 'get_device_parent':
drivers/base/core.c:622: error: 'block_class' undeclared (first use in this function) drivers/base/core.c: In function 'device_add_class_symlinks':
drivers/base/core.c:712: error: 'block_class' undeclared (first use in this function) drivers/base/core.c: In function 'device_remove_class_symlinks':
drivers/base/core.c:742: error: 'block_class' undeclared (first use in this function)

Quoted 4 lines
Quoted 1 line

This should no longer be needed with the next linux-next tree as the logic in this area has changed thanks to Andi's patch.

Still seeing this build error.
Will you be merging some patch soon?

thnx,
---
~Randy
*** Remember to use Documentation/SubmitChecklist when testing your code ***