* linux-next: Tree for January 7 @ 2010-01-07 6:21 Stephen Rothwell 2010-01-07 18:10 ` linux-next: Tree for January 7 (pcmcia) Randy Dunlap 0 siblings, 1 reply; 9+ messages in thread From: Stephen Rothwell @ 2010-01-07 6:21 UTC (permalink / raw) To: linux-next; +Cc: LKML [-- Attachment #1: Type: text/plain, Size: 7905 bytes --] Hi all, Changes since 20100106: The net tree gained a conflict against the wireless-current tree. The mfd tree gained some conflicts against the tmio-mmc tree. The agp tree still has a build failure for which I reverted a commit. The suspend tree gained a conflict against the input 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 155 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 CONFLICT (content): Merge conflict in drivers/scsi/cxgb3i/cxgb3i_offload.c 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 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 sparc/master Merging xtensa/master Merging ceph/for-next 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 Merging nfsd/nfsd-next Merging nilfs2/for-next Merging ocfs2/linux-next Merging squashfs/master Merging udf/for_next Merging v9fs/for-next CONFLICT (add/add): Merge conflict in fs/9p/cache.c Merging ubifs/linux-next Merging xfs/master CONFLICT (add/add): Merge conflict in fs/xfs/linux-2.6/xfs_trace.h CONFLICT (content): Merge conflict in include/linux/fs.h Merging reiserfs-bkl/reiserfs/kill-bkl 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 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 net/mac80211/iface.c CONFLICT (content): Merge conflict in net/mac80211/scan.c Merging wireless/master CONFLICT (content): Merge conflict in drivers/net/wireless/iwlwifi/iwl-core.h Merging mtd/master Merging crypto/master Merging sound/for-next Merging cpufreq/next Merging quilt/rr Merging mmc/next Merging tmio-mmc/linux-next Merging input/next 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/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 hdlc/hdlc-next Merging drm/drm-next Merging voltage/for-next Merging security-testing/next Merging lblnet/master Merging agp/agp-next [master a8ed08d] Revert "drivers/char/agp/amd64-agp.c: squish warning" 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 CONFLICT (content): Merge conflict in drivers/input/serio/serio.c Merging bluetooth/master Merging fsnotify/for-next 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 lib/Kconfig Merging i7core_edac/linux_next Merging devicetree/next-devicetree 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 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 Merging quilt/tty Merging quilt/usb Merging quilt/staging Merging scsi-post-merge/master [-- Attachment #2: Type: application/pgp-signature, Size: 198 bytes --] ^ permalink raw reply [flat|nested] 9+ messages in thread
* Re: linux-next: Tree for January 7 (pcmcia) 2010-01-07 6:21 linux-next: Tree for January 7 Stephen Rothwell @ 2010-01-07 18:10 ` Randy Dunlap 2010-01-07 20:57 ` Dominik Brodowski 0 siblings, 1 reply; 9+ messages in thread From: Randy Dunlap @ 2010-01-07 18:10 UTC (permalink / raw) To: Stephen Rothwell, linux-kbuild; +Cc: linux-next, LKML, Valdis.Kletnieks On Thu, 7 Jan 2010 17:21:34 +1100 Stephen Rothwell wrote: > Hi all, > > Changes since 20100106: drivers/built-in.o: In function `yenta_probe': yenta_socket.c:(.devinit.text+0x1e582): undefined reference to `pccard_nonstatic_ops' CONFIG_PCCARD=y CONFIG_PCMCIA=m CONFIG_PCCARD_NONSTATIC=m CONFIG_YENTA=y so yenta code (built-in) tries to reference data that lives in a loadable module. But I would expect this Kconfig: config YENTA tristate "CardBus yenta-compatible bridge support" depends on PCI select CARDBUS if !EMBEDDED select PCCARD_NONSTATIC if PCMCIA to make PCCARD_NONSTATIC=y instead of =m. Has something changed in kconfig recently that would make that different? --- ~Randy ^ permalink raw reply [flat|nested] 9+ messages in thread
* Re: linux-next: Tree for January 7 (pcmcia) 2010-01-07 18:10 ` linux-next: Tree for January 7 (pcmcia) Randy Dunlap @ 2010-01-07 20:57 ` Dominik Brodowski 2010-01-07 21:07 ` Michal Marek 0 siblings, 1 reply; 9+ messages in thread From: Dominik Brodowski @ 2010-01-07 20:57 UTC (permalink / raw) To: Randy Dunlap Cc: Stephen Rothwell, linux-kbuild, linux-next, LKML, Valdis.Kletnieks Hey, On Thu, Jan 07, 2010 at 10:10:06AM -0800, Randy Dunlap wrote: > > Hi all, > > > > Changes since 20100106: > > > drivers/built-in.o: In function `yenta_probe': > yenta_socket.c:(.devinit.text+0x1e582): undefined reference to `pccard_nonstatic_ops' > > CONFIG_PCCARD=y > CONFIG_PCMCIA=m > CONFIG_PCCARD_NONSTATIC=m > CONFIG_YENTA=y > > so yenta code (built-in) tries to reference data that lives in a > loadable module. Uh, that was I. If kconfig can't be fixed easily, I'll revert the change > But I would expect this Kconfig: > > config YENTA > tristate "CardBus yenta-compatible bridge support" > depends on PCI > select CARDBUS if !EMBEDDED > select PCCARD_NONSTATIC if PCMCIA > > to make PCCARD_NONSTATIC=y instead of =m. Has something changed in > kconfig recently that would make that different? Best, Dominik ^ permalink raw reply [flat|nested] 9+ messages in thread
* Re: linux-next: Tree for January 7 (pcmcia) 2010-01-07 20:57 ` Dominik Brodowski @ 2010-01-07 21:07 ` Michal Marek 0 siblings, 0 replies; 9+ messages in thread From: Michal Marek @ 2010-01-07 21:07 UTC (permalink / raw) To: Dominik Brodowski Cc: Randy Dunlap, Stephen Rothwell, linux-kbuild, linux-next, LKML, Valdis.Kletnieks On Thu, Jan 07, 2010 at 09:57:28PM +0100, Dominik Brodowski wrote: > Hey, > > On Thu, Jan 07, 2010 at 10:10:06AM -0800, Randy Dunlap wrote: > > > Hi all, > > > > > > Changes since 20100106: > > > > > > drivers/built-in.o: In function `yenta_probe': > > yenta_socket.c:(.devinit.text+0x1e582): undefined reference to `pccard_nonstatic_ops' > > > > CONFIG_PCCARD=y > > CONFIG_PCMCIA=m > > CONFIG_PCCARD_NONSTATIC=m > > CONFIG_YENTA=y > > > > so yenta code (built-in) tries to reference data that lives in a > > loadable module. > > Uh, that was I. If kconfig can't be fixed easily, I'll revert the change Hi Randy, Dominik, Please try this one-liner. The problem is that 'if X' and 'if X!=n' are not the same in ternary logic. Michal >From e7b12e70272484da2161c0b6c459f2eff2a989a8 Mon Sep 17 00:00:00 2001 From: Michal Marek <mmarek@suse.cz> Date: Thu, 7 Jan 2010 21:03:11 +0100 Subject: [PATCH] pcmcia: fix yenta dependency on PCCARD_NONSTATIC With CONFIG_PCMCIA=m and CONFIG_YENTA=y, we get drivers/built-in.o: In function `yenta_probe': yenta_socket.c:(.devinit.text+0x1e582): undefined reference to `pccard_nonstatic_ops' This is because select PCCARD_NONSTATIC if PCMCIA sets PCCARD_NONSTATIC = min(YENTA, PCMCIA). Change it to 'if PCMCIA!=n' to remove the upper limit. Reported-by: Randy Dunlap <rdunlap@xenotime.net> Signed-off-by: Michal Marek <mmarek@suse.cz> --- drivers/pcmcia/Kconfig | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/drivers/pcmcia/Kconfig b/drivers/pcmcia/Kconfig index 5cea8ba..e196a19 100644 --- a/drivers/pcmcia/Kconfig +++ b/drivers/pcmcia/Kconfig @@ -84,7 +84,7 @@ config YENTA tristate "CardBus yenta-compatible bridge support" depends on PCI select CARDBUS if !EMBEDDED - select PCCARD_NONSTATIC if PCMCIA + select PCCARD_NONSTATIC if PCMCIA != n ---help--- This option enables support for CardBus host bridges. Virtually all modern PCMCIA bridges are CardBus compatible. A "bridge" is -- 1.6.5.3 ^ permalink raw reply related [flat|nested] 9+ messages in thread
* Re: linux-next: Tree for January 7 (pcmcia) @ 2010-01-07 21:07 ` Michal Marek 0 siblings, 0 replies; 9+ messages in thread From: Michal Marek @ 2010-01-07 21:07 UTC (permalink / raw) To: Dominik Brodowski Cc: Randy Dunlap, Stephen Rothwell, linux-kbuild, linux-next, LKML, Valdis.Kletnieks On Thu, Jan 07, 2010 at 09:57:28PM +0100, Dominik Brodowski wrote: > Hey, > > On Thu, Jan 07, 2010 at 10:10:06AM -0800, Randy Dunlap wrote: > > > Hi all, > > > > > > Changes since 20100106: > > > > > > drivers/built-in.o: In function `yenta_probe': > > yenta_socket.c:(.devinit.text+0x1e582): undefined reference to `pccard_nonstatic_ops' > > > > CONFIG_PCCARD=y > > CONFIG_PCMCIA=m > > CONFIG_PCCARD_NONSTATIC=m > > CONFIG_YENTA=y > > > > so yenta code (built-in) tries to reference data that lives in a > > loadable module. > > Uh, that was I. If kconfig can't be fixed easily, I'll revert the change Hi Randy, Dominik, Please try this one-liner. The problem is that 'if X' and 'if X!=n' are not the same in ternary logic. Michal From e7b12e70272484da2161c0b6c459f2eff2a989a8 Mon Sep 17 00:00:00 2001 From: Michal Marek <mmarek@suse.cz> Date: Thu, 7 Jan 2010 21:03:11 +0100 Subject: [PATCH] pcmcia: fix yenta dependency on PCCARD_NONSTATIC With CONFIG_PCMCIA=m and CONFIG_YENTA=y, we get drivers/built-in.o: In function `yenta_probe': yenta_socket.c:(.devinit.text+0x1e582): undefined reference to `pccard_nonstatic_ops' This is because select PCCARD_NONSTATIC if PCMCIA sets PCCARD_NONSTATIC = min(YENTA, PCMCIA). Change it to 'if PCMCIA!=n' to remove the upper limit. Reported-by: Randy Dunlap <rdunlap@xenotime.net> Signed-off-by: Michal Marek <mmarek@suse.cz> --- drivers/pcmcia/Kconfig | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/drivers/pcmcia/Kconfig b/drivers/pcmcia/Kconfig index 5cea8ba..e196a19 100644 --- a/drivers/pcmcia/Kconfig +++ b/drivers/pcmcia/Kconfig @@ -84,7 +84,7 @@ config YENTA tristate "CardBus yenta-compatible bridge support" depends on PCI select CARDBUS if !EMBEDDED - select PCCARD_NONSTATIC if PCMCIA + select PCCARD_NONSTATIC if PCMCIA != n ---help--- This option enables support for CardBus host bridges. Virtually all modern PCMCIA bridges are CardBus compatible. A "bridge" is -- 1.6.5.3 ^ permalink raw reply related [flat|nested] 9+ messages in thread
* Re: linux-next: Tree for January 7 (pcmcia) 2010-01-07 21:07 ` Michal Marek (?) @ 2010-01-07 21:55 ` Randy Dunlap 2010-01-08 17:54 ` Dominik Brodowski -1 siblings, 1 reply; 9+ messages in thread From: Randy Dunlap @ 2010-01-07 21:55 UTC (permalink / raw) To: Michal Marek Cc: Dominik Brodowski, Randy Dunlap, Stephen Rothwell, linux-kbuild, linux-next, LKML, Valdis.Kletnieks On Thu, 7 Jan 2010 22:07:44 +0100 Michal Marek wrote: > On Thu, Jan 07, 2010 at 09:57:28PM +0100, Dominik Brodowski wrote: > > Hey, > > > > On Thu, Jan 07, 2010 at 10:10:06AM -0800, Randy Dunlap wrote: > > > > Hi all, > > > > > > > > Changes since 20100106: > > > > > > > > > drivers/built-in.o: In function `yenta_probe': > > > yenta_socket.c:(.devinit.text+0x1e582): undefined reference to `pccard_nonstatic_ops' > > > > > > CONFIG_PCCARD=y > > > CONFIG_PCMCIA=m > > > CONFIG_PCCARD_NONSTATIC=m > > > CONFIG_YENTA=y > > > > > > so yenta code (built-in) tries to reference data that lives in a > > > loadable module. > > > > Uh, that was I. If kconfig can't be fixed easily, I'll revert the change > > Hi Randy, Dominik, > > Please try this one-liner. The problem is that 'if X' and 'if X!=n' are not > the same in ternary logic. > > Michal > > From e7b12e70272484da2161c0b6c459f2eff2a989a8 Mon Sep 17 00:00:00 2001 > From: Michal Marek <mmarek@suse.cz> > Date: Thu, 7 Jan 2010 21:03:11 +0100 > Subject: [PATCH] pcmcia: fix yenta dependency on PCCARD_NONSTATIC > > With CONFIG_PCMCIA=m and CONFIG_YENTA=y, we get > > drivers/built-in.o: In function `yenta_probe': > yenta_socket.c:(.devinit.text+0x1e582): undefined reference to > `pccard_nonstatic_ops' > > This is because > > select PCCARD_NONSTATIC if PCMCIA > > sets PCCARD_NONSTATIC = min(YENTA, PCMCIA). Change it to 'if PCMCIA!=n' > to remove the upper limit. > > Reported-by: Randy Dunlap <rdunlap@xenotime.net> > Signed-off-by: Michal Marek <mmarek@suse.cz> Acked-by: Randy Dunlap <rdunlap@xenotime.net> Thanks. > --- > drivers/pcmcia/Kconfig | 2 +- > 1 files changed, 1 insertions(+), 1 deletions(-) > > diff --git a/drivers/pcmcia/Kconfig b/drivers/pcmcia/Kconfig > index 5cea8ba..e196a19 100644 > --- a/drivers/pcmcia/Kconfig > +++ b/drivers/pcmcia/Kconfig > @@ -84,7 +84,7 @@ config YENTA > tristate "CardBus yenta-compatible bridge support" > depends on PCI > select CARDBUS if !EMBEDDED > - select PCCARD_NONSTATIC if PCMCIA > + select PCCARD_NONSTATIC if PCMCIA != n > ---help--- > This option enables support for CardBus host bridges. Virtually > all modern PCMCIA bridges are CardBus compatible. A "bridge" is > -- > 1.6.5.3 > > -- > To unsubscribe from this list: send the line "unsubscribe linux-kernel" in > the body of a message to majordomo@vger.kernel.org > More majordomo info at http://vger.kernel.org/majordomo-info.html > Please read the FAQ at http://www.tux.org/lkml/ --- ~Randy ^ permalink raw reply [flat|nested] 9+ messages in thread
* Re: linux-next: Tree for January 7 (pcmcia) 2010-01-07 21:55 ` Randy Dunlap @ 2010-01-08 17:54 ` Dominik Brodowski 0 siblings, 0 replies; 9+ messages in thread From: Dominik Brodowski @ 2010-01-08 17:54 UTC (permalink / raw) To: Randy Dunlap Cc: Michal Marek, Stephen Rothwell, linux-kbuild, linux-next, LKML, Valdis.Kletnieks Hey, On Thu, Jan 07, 2010 at 01:55:57PM -0800, Randy Dunlap wrote: > > On Thu, Jan 07, 2010 at 09:57:28PM +0100, Dominik Brodowski wrote: > > > Hey, > > > > > > On Thu, Jan 07, 2010 at 10:10:06AM -0800, Randy Dunlap wrote: > > > > > Hi all, > > > > > > > > > > Changes since 20100106: > > > > > > > > > > > > drivers/built-in.o: In function `yenta_probe': > > > > yenta_socket.c:(.devinit.text+0x1e582): undefined reference to `pccard_nonstatic_ops' > > > > > > > > CONFIG_PCCARD=y > > > > CONFIG_PCMCIA=m > > > > CONFIG_PCCARD_NONSTATIC=m > > > > CONFIG_YENTA=y > > > > > > > > so yenta code (built-in) tries to reference data that lives in a > > > > loadable module. > > > > > > Uh, that was I. If kconfig can't be fixed easily, I'll revert the change > > > > Hi Randy, Dominik, > > > > Please try this one-liner. The problem is that 'if X' and 'if X!=n' are not > > the same in ternary logic. > > > > Michal > > > > From e7b12e70272484da2161c0b6c459f2eff2a989a8 Mon Sep 17 00:00:00 2001 > > From: Michal Marek <mmarek@suse.cz> > > Date: Thu, 7 Jan 2010 21:03:11 +0100 > > Subject: [PATCH] pcmcia: fix yenta dependency on PCCARD_NONSTATIC > > > > With CONFIG_PCMCIA=m and CONFIG_YENTA=y, we get > > > > drivers/built-in.o: In function `yenta_probe': > > yenta_socket.c:(.devinit.text+0x1e582): undefined reference to > > `pccard_nonstatic_ops' > > > > This is because > > > > select PCCARD_NONSTATIC if PCMCIA > > > > sets PCCARD_NONSTATIC = min(YENTA, PCMCIA). Change it to 'if PCMCIA!=n' > > to remove the upper limit. > > > > Reported-by: Randy Dunlap <rdunlap@xenotime.net> > > Signed-off-by: Michal Marek <mmarek@suse.cz> > > Acked-by: Randy Dunlap <rdunlap@xenotime.net> > > Thanks. Thanks for the patch. I extended it a bit further: >From 77f9eb4599f1d0f5a43cadece9809018b534e308 Mon Sep 17 00:00:00 2001 From: Michal Marek <mmarek@suse.cz> Date: Thu, 7 Jan 2010 21:03:11 +0100 Subject: [PATCH] pcmcia: fix yenta dependency on PCCARD_NONSTATIC With CONFIG_PCMCIA=m and CONFIG_YENTA=y, we get drivers/built-in.o: In function `yenta_probe': yenta_socket.c:(.devinit.text+0x1e582): undefined reference to `pccard_nonstatic_ops' This is because select PCCARD_NONSTATIC if PCMCIA sets PCCARD_NONSTATIC = min(YENTA, PCMCIA). Change it to 'if PCMCIA!=n' to remove the upper limit. [linux@dominikbrodowski.net: propagate change to PCMICA_M8XX] Reported-by: Randy Dunlap <rdunlap@xenotime.net> Signed-off-by: Michal Marek <mmarek@suse.cz> Acked-by: Randy Dunlap <rdunlap@xenotime.net> Signed-off-by: Dominik Brodowski <linux@dominikbrodowski.net> diff --git a/drivers/pcmcia/Kconfig b/drivers/pcmcia/Kconfig index efc51b9..e8f35da 100644 --- a/drivers/pcmcia/Kconfig +++ b/drivers/pcmcia/Kconfig @@ -84,7 +84,7 @@ config YENTA tristate "CardBus yenta-compatible bridge support" depends on PCI select CARDBUS if !EMBEDDED - select PCCARD_NONSTATIC if PCMCIA + select PCCARD_NONSTATIC if PCMCIA != n ---help--- This option enables support for CardBus host bridges. Virtually all modern PCMCIA bridges are CardBus compatible. A "bridge" is @@ -161,8 +161,8 @@ config TCIC config PCMCIA_M8XX tristate "MPC8xx PCMCIA support" - depends on PCMCIA && PPC && 8xx - select PCCARD_IODYN if PCMCIA + depends on PCCARD && PPC && 8xx + select PCCARD_IODYN if PCMCIA != n help Say Y here to include support for PowerPC 8xx series PCMCIA controller. ^ permalink raw reply related [flat|nested] 9+ messages in thread
* Re: linux-next: Tree for January 7 (pcmcia) @ 2010-01-08 17:54 ` Dominik Brodowski 0 siblings, 0 replies; 9+ messages in thread From: Dominik Brodowski @ 2010-01-08 17:54 UTC (permalink / raw) To: Randy Dunlap Cc: Michal Marek, Stephen Rothwell, linux-kbuild, linux-next, LKML, Valdis.Kletnieks Hey, On Thu, Jan 07, 2010 at 01:55:57PM -0800, Randy Dunlap wrote: > > On Thu, Jan 07, 2010 at 09:57:28PM +0100, Dominik Brodowski wrote: > > > Hey, > > > > > > On Thu, Jan 07, 2010 at 10:10:06AM -0800, Randy Dunlap wrote: > > > > > Hi all, > > > > > > > > > > Changes since 20100106: > > > > > > > > > > > > drivers/built-in.o: In function `yenta_probe': > > > > yenta_socket.c:(.devinit.text+0x1e582): undefined reference to `pccard_nonstatic_ops' > > > > > > > > CONFIG_PCCARD=y > > > > CONFIG_PCMCIA=m > > > > CONFIG_PCCARD_NONSTATIC=m > > > > CONFIG_YENTA=y > > > > > > > > so yenta code (built-in) tries to reference data that lives in a > > > > loadable module. > > > > > > Uh, that was I. If kconfig can't be fixed easily, I'll revert the change > > > > Hi Randy, Dominik, > > > > Please try this one-liner. The problem is that 'if X' and 'if X!=n' are not > > the same in ternary logic. > > > > Michal > > > > From e7b12e70272484da2161c0b6c459f2eff2a989a8 Mon Sep 17 00:00:00 2001 > > From: Michal Marek <mmarek@suse.cz> > > Date: Thu, 7 Jan 2010 21:03:11 +0100 > > Subject: [PATCH] pcmcia: fix yenta dependency on PCCARD_NONSTATIC > > > > With CONFIG_PCMCIA=m and CONFIG_YENTA=y, we get > > > > drivers/built-in.o: In function `yenta_probe': > > yenta_socket.c:(.devinit.text+0x1e582): undefined reference to > > `pccard_nonstatic_ops' > > > > This is because > > > > select PCCARD_NONSTATIC if PCMCIA > > > > sets PCCARD_NONSTATIC = min(YENTA, PCMCIA). Change it to 'if PCMCIA!=n' > > to remove the upper limit. > > > > Reported-by: Randy Dunlap <rdunlap@xenotime.net> > > Signed-off-by: Michal Marek <mmarek@suse.cz> > > Acked-by: Randy Dunlap <rdunlap@xenotime.net> > > Thanks. Thanks for the patch. I extended it a bit further: From 77f9eb4599f1d0f5a43cadece9809018b534e308 Mon Sep 17 00:00:00 2001 From: Michal Marek <mmarek@suse.cz> Date: Thu, 7 Jan 2010 21:03:11 +0100 Subject: [PATCH] pcmcia: fix yenta dependency on PCCARD_NONSTATIC With CONFIG_PCMCIA=m and CONFIG_YENTA=y, we get drivers/built-in.o: In function `yenta_probe': yenta_socket.c:(.devinit.text+0x1e582): undefined reference to `pccard_nonstatic_ops' This is because select PCCARD_NONSTATIC if PCMCIA sets PCCARD_NONSTATIC = min(YENTA, PCMCIA). Change it to 'if PCMCIA!=n' to remove the upper limit. [linux@dominikbrodowski.net: propagate change to PCMICA_M8XX] Reported-by: Randy Dunlap <rdunlap@xenotime.net> Signed-off-by: Michal Marek <mmarek@suse.cz> Acked-by: Randy Dunlap <rdunlap@xenotime.net> Signed-off-by: Dominik Brodowski <linux@dominikbrodowski.net> diff --git a/drivers/pcmcia/Kconfig b/drivers/pcmcia/Kconfig index efc51b9..e8f35da 100644 --- a/drivers/pcmcia/Kconfig +++ b/drivers/pcmcia/Kconfig @@ -84,7 +84,7 @@ config YENTA tristate "CardBus yenta-compatible bridge support" depends on PCI select CARDBUS if !EMBEDDED - select PCCARD_NONSTATIC if PCMCIA + select PCCARD_NONSTATIC if PCMCIA != n ---help--- This option enables support for CardBus host bridges. Virtually all modern PCMCIA bridges are CardBus compatible. A "bridge" is @@ -161,8 +161,8 @@ config TCIC config PCMCIA_M8XX tristate "MPC8xx PCMCIA support" - depends on PCMCIA && PPC && 8xx - select PCCARD_IODYN if PCMCIA + depends on PCCARD && PPC && 8xx + select PCCARD_IODYN if PCMCIA != n help Say Y here to include support for PowerPC 8xx series PCMCIA controller. ^ permalink raw reply related [flat|nested] 9+ messages in thread
* Re: linux-next: Tree for January 7 (pcmcia) 2010-01-08 17:54 ` Dominik Brodowski (?) @ 2010-01-08 19:24 ` Michal Marek -1 siblings, 0 replies; 9+ messages in thread From: Michal Marek @ 2010-01-08 19:24 UTC (permalink / raw) To: Dominik Brodowski Cc: Randy Dunlap, Stephen Rothwell, linux-kbuild, linux-next, LKML, Valdis.Kletnieks Dominik Brodowski wrote: > From 77f9eb4599f1d0f5a43cadece9809018b534e308 Mon Sep 17 00:00:00 2001 > From: Michal Marek <mmarek@suse.cz> > Date: Thu, 7 Jan 2010 21:03:11 +0100 > Subject: [PATCH] pcmcia: fix yenta dependency on PCCARD_NONSTATIC > > With CONFIG_PCMCIA=m and CONFIG_YENTA=y, we get > > drivers/built-in.o: In function `yenta_probe': > yenta_socket.c:(.devinit.text+0x1e582): undefined reference to > `pccard_nonstatic_ops' > > This is because > > select PCCARD_NONSTATIC if PCMCIA > > sets PCCARD_NONSTATIC = min(YENTA, PCMCIA). Change it to 'if PCMCIA!=n' > to remove the upper limit. > > [linux@dominikbrodowski.net: propagate change to PCMICA_M8XX] > Reported-by: Randy Dunlap <rdunlap@xenotime.net> > Signed-off-by: Michal Marek <mmarek@suse.cz> > Acked-by: Randy Dunlap <rdunlap@xenotime.net> > Signed-off-by: Dominik Brodowski <linux@dominikbrodowski.net> > > diff --git a/drivers/pcmcia/Kconfig b/drivers/pcmcia/Kconfig > index efc51b9..e8f35da 100644 > --- a/drivers/pcmcia/Kconfig > +++ b/drivers/pcmcia/Kconfig > @@ -84,7 +84,7 @@ config YENTA > tristate "CardBus yenta-compatible bridge support" > depends on PCI > select CARDBUS if !EMBEDDED > - select PCCARD_NONSTATIC if PCMCIA > + select PCCARD_NONSTATIC if PCMCIA != n > ---help--- > This option enables support for CardBus host bridges. Virtually > all modern PCMCIA bridges are CardBus compatible. A "bridge" is > @@ -161,8 +161,8 @@ config TCIC > > config PCMCIA_M8XX > tristate "MPC8xx PCMCIA support" > - depends on PCMCIA && PPC && 8xx > - select PCCARD_IODYN if PCMCIA > + depends on PCCARD && PPC && 8xx > + select PCCARD_IODYN if PCMCIA != n PCCARD_IODYN is bool, so this change is not necessary (but doesn't do any harm either). Michal ^ permalink raw reply [flat|nested] 9+ messages in thread
end of thread, other threads:[~2010-01-08 19:24 UTC | newest] Thread overview: 9+ messages (download: mbox.gz / follow: Atom feed) -- links below jump to the message on this page -- 2010-01-07 6:21 linux-next: Tree for January 7 Stephen Rothwell 2010-01-07 18:10 ` linux-next: Tree for January 7 (pcmcia) Randy Dunlap 2010-01-07 20:57 ` Dominik Brodowski 2010-01-07 21:07 ` Michal Marek 2010-01-07 21:07 ` Michal Marek 2010-01-07 21:55 ` Randy Dunlap 2010-01-08 17:54 ` Dominik Brodowski 2010-01-08 17:54 ` Dominik Brodowski 2010-01-08 19:24 ` Michal Marek
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.