Skip to contentSkip to conversation

linux-next: Tree for May 6

PATCH New Stephen Rothwell 7 participants 25 messages May 6, 2010 – May 11, 2010

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

Hi all,

Changes since 20100505:

Dropped trees: tmio-mmc (long unresolved conflicts and unable to fetch)
hwlat (at the maintainer's request)

The wireless tree lost its conflicts.

The rr tree gained a conflict against the net tree.

The security-testing tree gained a conflict against Linus' tree.

The staging-next tree gained a conflict against the net 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 162 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.

Signature · 228 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
Applying: ar9170: fix for driver-core ABI change
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
Applying: staging: update gfp/slab.h includes
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
Applying: arm: update gfp/slab.h includes
Merging davinci/davinci-next
Applying: davinci: update gfp/slab.h includes
Merging i.MX/for-next
Merging msm/for-next
CONFLICT (content): Merge conflict in arch/arm/mach-msm/Kconfig
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
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
Applying: ocfs2: update gfp/slab.h includes
Merging squashfs/master
Merging udf/for_next
Merging v9fs/for-next
CONFLICT (content): Merge conflict in fs/9p/vfs_super.c
Merging ubifs/linux-next
Merging xfs/master
Merging vfs/for-next
CONFLICT (content): Merge conflict in fs/cifs/file.c
CONFLICT (content): Merge conflict in fs/namei.c
CONFLICT (content): Merge conflict in fs/nfs/inode.c
CONFLICT (content): Merge conflict in fs/nfsd/nfs4xdr.c
CONFLICT (content): Merge conflict in fs/nfsd/vfs.c
CONFLICT (content): Merge conflict in fs/ufs/inode.c
CONFLICT (content): Merge conflict in fs/xfs/linux-2.6/xfs_super.c
CONFLICT (content): Merge conflict in security/tomoyo/realpath.c
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
Applying: v4l-dvb: update gfp/slab.h includes
Merging kbuild/for-next
Merging kconfig/for-next
Merging ide/master
Merging libata/NEXT
Merging infiniband/for-next
Merging acpi/test
Applying: acpi: update gfp/slab.h includes
Merging ieee1394/for-next
Merging ubi/linux-next
Merging kvm/linux-next
Merging dlm/next
Merging ibft/master
Merging scsi/master
Merging async_tx/next
Merging net/master
CONFLICT (content): Merge conflict in drivers/scsi/iscsi_tcp.c
Merging wireless/master
Applying: wireless: update gfp/slab.h includes
Merging mtd/master
CONFLICT (content): Merge conflict in drivers/mtd/mtdcore.c
Applying: mtd: update gfp/slab.h includes
Merging crypto/master
CONFLICT (content): Merge conflict in arch/arm/mach-omap2/devices.c
Merging sound/for-next
Merging cpufreq/next
Merging quilt/rr
CONFLICT (content): Merge conflict in drivers/net/virtio_net.c
CONFLICT (content): Merge conflict in include/linux/mod_devicetable.h
CONFLICT (content): Merge conflict in scripts/mod/file2alias.c
Merging mmc/next
Merging input/next
Merging lsm/for-next
Merging block/for-next
CONFLICT (content): Merge conflict in fs/ext3/fsync.c
CONFLICT (content): Merge conflict in fs/ext4/fsync.c
Merging quilt/device-mapper
Merging embedded/master
Merging firmware/master
Merging pcmcia/master
CONFLICT (content): Merge conflict in drivers/net/pcmcia/3c589_cs.c
CONFLICT (content): Merge conflict in drivers/net/wireless/orinoco/orinoco_cs.c
CONFLICT (content): Merge conflict in drivers/net/wireless/orinoco/spectrum_cs.c
Merging battery/master
Merging leds/for-mm
Merging backlight/for-mm
Merging kgdb/kgdb-next
Applying: kgdb: update for sysrq handling change
Applying: kdb: update gfp/slab.h includes
Merging slab/for-next
Merging uclinux/for-next
Merging md/for-next
Merging mfd/for-next
CONFLICT (content): Merge conflict in drivers/dma/Makefile
CONFLICT (add/add): Merge conflict in drivers/dma/timb_dma.c
Merging hdlc/hdlc-next
Merging drm/drm-next
CONFLICT (content): Merge conflict in drivers/gpu/drm/i915/i915_drv.h
CONFLICT (content): Merge conflict in drivers/gpu/drm/radeon/r300.c
Merging viafb/viafb-next
Merging voltage/for-next
Merging security-testing/next
CONFLICT (content): Merge conflict in security/keys/keyring.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
Merging audit/for-next
Merging quilt/aoe
Merging suspend/linux-next
Merging bluetooth/master
Merging fsnotify/for-next
Applying: fsnotify: update gfp/slab.h includes
Merging irda/for-next
CONFLICT (content): Merge conflict in drivers/net/irda/irda-usb.c
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
Applying: vbus: use of kzalloc/kfree requires the include of slab.h
Applying: vbus: update gfp/slab.h includes
Merging i7core_edac/linux_next
Merging devicetree/next-devicetree
Merging spi/next-spi
Merging omap_dss2/for-next
Merging tip/auto-latest
CONFLICT (content): Merge conflict in Documentation/feature-removal-schedule.txt
Applying: lockdep: Fix redundant_hardirqs_on incremented with irqs enabled
Merging edac-amd/for-next
Merging oprofile/for-next
Merging percpu/for-next
Merging workqueues/for-next
Merging sfi/sfi-test
Merging asm-generic/next
Merging hwpoison/hwpoison
Merging sysctl/master
Merging bkl-core/bkl/core
Merging bkl-procfs/bkl/procfs
Merging bkl-ioctl/bkl/ioctl
CONFLICT (content): Merge conflict in arch/cris/arch-v10/drivers/ds1302.c
CONFLICT (content): Merge conflict in drivers/block/pktcdvd.c
Merging quilt/driver-core
CONFLICT (content): Merge conflict in drivers/base/platform.c
CONFLICT (content): Merge conflict in drivers/staging/comedi/drivers/quatech_daqp_cs.c
Applying: md: fixup for sysfs_get_dirent API change
Merging quilt/tty
CONFLICT (content): Merge conflict in include/linux/tty.h
Merging quilt/usb
CONFLICT (content): Merge conflict in drivers/input/tablet/acecad.c
CONFLICT (content): Merge conflict in drivers/input/tablet/kbtab.c
CONFLICT (content): Merge conflict in drivers/input/tablet/wacom_sys.c
CONFLICT (delete/modify): sound/usb/usbaudio.c deleted in HEAD and modified in quilt/usb. Version quilt/usb of sound/usb/usbaudio.c left in tree.
$ git rm -f sound/usb/usbaudio.c
Applying: usb: update gfp/slab.h includes
Applying: sound: fixup for usb_buffer_alloc/free rename
Merging staging-next/staging-next
CONFLICT (content): Merge conflict in drivers/staging/arlan/arlan-main.c
CONFLICT (content): Merge conflict in drivers/staging/comedi/drivers/cb_das16_cs.c
CONFLICT (content): Merge conflict in drivers/staging/cx25821/cx25821-alsa.c
CONFLICT (content): Merge conflict in drivers/staging/dt3155/dt3155_drv.c
CONFLICT (content): Merge conflict in drivers/staging/netwave/netwave_cs.c
Merging slabh/slabh
Merging scsi-post-merge/master
#1 lore raw

Re: linux-next: Tree for May 6 (acpi: PM=n)

Quoted 3 lines · On Thu, 6 May 2010 15:15:02 +1000 Stephen Rothwell wrote:

Hi all,

Changes since 20100505:

When CONFIG_PM is not set:

drivers/built-in.o: In function `acpi_init':
bus.c:(.init.text+0x2d84): undefined reference to pm_flags' bus.c:(.init.text+0x2d91): undefined reference to pm_flags'

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

reviewer
#2 lore raw

Re: [linux-pm] linux-next: Tree for May 6 (acpi: PM=n)

Quoted 5 lines

When CONFIG_PM is not set:

drivers/built-in.o: In function `acpi_init':
bus.c:(.init.text+0x2d84): undefined reference to pm_flags' bus.c:(.init.text+0x2d91): undefined reference to pm_flags'

CONFIG_ACPI depends on CONFIG_PM,
so acpi/bus.c should not be compiled for CONFIG_PM=n

Hmm, is is somebody doing something strange, like "select ACPI" without guaranteeing that all of ACPI's dependencies are satisfied?

thanks,
Len Brown, Intel Open Source Technology Center

#3 lore raw

Re: [linux-pm] linux-next: Tree for May 6 (acpi: PM=n)

Quoted 11 lines · On Thu, 06 May 2010 16:26:13 -0400 (EDT) Len Brown wrote:
Quoted 5 lines

When CONFIG_PM is not set:

drivers/built-in.o: In function `acpi_init':
bus.c:(.init.text+0x2d84): undefined reference to pm_flags' bus.c:(.init.text+0x2d91): undefined reference to pm_flags'

CONFIG_ACPI depends on CONFIG_PM,
so acpi/bus.c should not be compiled for CONFIG_PM=n

Hmm, is is somebody doing something strange, like "select ACPI" without guaranteeing that all of ACPI's dependencies are satisfied?

Oh, thanks for the clue.

That would be a patch that I commented on and was ignored, but James Morris merged it anyway. Now it should be dropped.

http://lkml.org/lkml/2010/5/4/379

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

#4 lore raw

Re: [linux-pm] linux-next: Tree for May 6 (acpi: PM=n)

Quoted 14 lines · Randy Dunlap
Quoted 11 lines · On Thu, 06 May 2010 16:26:13 -0400 (EDT) Len Brown wrote:
Quoted 5 lines

When CONFIG_PM is not set:

drivers/built-in.o: In function `acpi_init':
bus.c:(.init.text+0x2d84): undefined reference to pm_flags' bus.c:(.init.text+0x2d91): undefined reference to pm_flags'

CONFIG_ACPI depends on CONFIG_PM,
so acpi/bus.c should not be compiled for CONFIG_PM=n

Hmm, is is somebody doing something strange, like "select ACPI" without guaranteeing that all of ACPI's dependencies are satisfied?

Quoted 6 lines

Oh, thanks for the clue.

That would be a patch that I commented on and was ignored, but James Morris merged it anyway. Now it should be dropped.

http://lkml.org/lkml/2010/5/4/379

You weren't ignored. Mimi responded and mentioned a subsequent patch, after which, there was no further discussion.

I've reverted:

b89e66e1e396f7b5436af154e58209320cc08aed
"TPM: ACPI/PNP dependency removal"

a674fa46c79ffa37995bd1c8e4daa2b3be5a95ae
"ima: remove ACPI dependency"

Note: any further ACPI-related changes here should have acks from linux-acpi folk.

- James

Signature · 2 lines
James Morris
<[email protected]>
#5 lore raw

Re: [linux-pm] linux-next: Tree for May 6 (acpi: PM=n)

Quoted 18 lines · James Morris
Quoted 16 lines · Randy Dunlap
Quoted 11 lines · On Thu, 06 May 2010 16:26:13 -0400 (EDT) Len Brown wrote:
Quoted 5 lines

When CONFIG_PM is not set:

drivers/built-in.o: In function `acpi_init':
bus.c:(.init.text+0x2d84): undefined reference to pm_flags' bus.c:(.init.text+0x2d91): undefined reference to pm_flags'

CONFIG_ACPI depends on CONFIG_PM,
so acpi/bus.c should not be compiled for CONFIG_PM=n

Hmm, is is somebody doing something strange, like "select ACPI" without guaranteeing that all of ACPI's dependencies are satisfied?

Oh, thanks for the clue.

Quoted 7 lines
Quoted 4 lines

That would be a patch that I commented on and was ignored, but James Morris merged it anyway. Now it should be dropped.

http://lkml.org/lkml/2010/5/4/379

You weren't ignored. Mimi responded and mentioned a subsequent patch, after which, there was no further discussion.

OK. But merging a known bad patch doesn't make much sense to me.

Quoted 8 lines

I've reverted:

b89e66e1e396f7b5436af154e58209320cc08aed
"TPM: ACPI/PNP dependency removal"

a674fa46c79ffa37995bd1c8e4daa2b3be5a95ae
"ima: remove ACPI dependency"

Thanks.

Quoted 3 lines

Note: any further ACPI-related changes here should have acks from linux-acpi folk.

Signature · 2 lines
~Randy
*** Remember to use Documentation/SubmitChecklist when testing your code ***
#6 lore raw

Re: linux-next: Tree for May 6 (acpi: PM=n)

In reply to James Morris
Quoted 18 lines · James Morris
Quoted 16 lines · Randy Dunlap
Quoted 11 lines · On Thu, 06 May 2010 16:26:13 -0400 (EDT) Len Brown wrote:
Quoted 5 lines

When CONFIG_PM is not set:

drivers/built-in.o: In function `acpi_init':
bus.c:(.init.text+0x2d84): undefined reference to pm_flags' bus.c:(.init.text+0x2d91): undefined reference to pm_flags'

CONFIG_ACPI depends on CONFIG_PM,
so acpi/bus.c should not be compiled for CONFIG_PM=n

Hmm, is is somebody doing something strange, like "select ACPI" without guaranteeing that all of ACPI's dependencies are satisfied?

Oh, thanks for the clue.

Quoted 7 lines
Quoted 4 lines

That would be a patch that I commented on and was ignored, but James Morris merged it anyway. Now it should be dropped.

http://lkml.org/lkml/2010/5/4/379

You weren't ignored. Mimi responded and mentioned a subsequent patch, after which, there was no further discussion.

OK. But merging a known bad patch doesn't make much sense to me.

Quoted 8 lines

I've reverted:

b89e66e1e396f7b5436af154e58209320cc08aed
"TPM: ACPI/PNP dependency removal"

a674fa46c79ffa37995bd1c8e4daa2b3be5a95ae
"ima: remove ACPI dependency"

Thanks.

Quoted 3 lines

Note: any further ACPI-related changes here should have acks from linux-acpi folk.

Signature · 2 lines
~Randy
*** Remember to use Documentation/SubmitChecklist when testing your code ***
#7 lore raw

Re: linux-next: Tree for May 6 (acpi: PM=n)

In reply to Randy Dunlap
Quoted 14 lines · Randy Dunlap
Quoted 11 lines · On Thu, 06 May 2010 16:26:13 -0400 (EDT) Len Brown wrote:
Quoted 5 lines

When CONFIG_PM is not set:

drivers/built-in.o: In function `acpi_init':
bus.c:(.init.text+0x2d84): undefined reference to pm_flags' bus.c:(.init.text+0x2d91): undefined reference to pm_flags'

CONFIG_ACPI depends on CONFIG_PM,
so acpi/bus.c should not be compiled for CONFIG_PM=n

Hmm, is is somebody doing something strange, like "select ACPI" without guaranteeing that all of ACPI's dependencies are satisfied?

Quoted 6 lines

Oh, thanks for the clue.

That would be a patch that I commented on and was ignored, but James Morris merged it anyway. Now it should be dropped.

http://lkml.org/lkml/2010/5/4/379

You weren't ignored. Mimi responded and mentioned a subsequent patch, after which, there was no further discussion.

I've reverted:

b89e66e1e396f7b5436af154e58209320cc08aed
"TPM: ACPI/PNP dependency removal"

a674fa46c79ffa37995bd1c8e4daa2b3be5a95ae
"ima: remove ACPI dependency"

Note: any further ACPI-related changes here should have acks from linux-acpi folk.

- James

Signature · 2 lines
James Morris
<[email protected]>
#8 lore raw

Re: linux-next: Tree for May 6 (acpi: PM=n)

In reply to Len Brown
Quoted 11 lines · On Thu, 06 May 2010 16:26:13 -0400 (EDT) Len Brown wrote:
Quoted 5 lines

When CONFIG_PM is not set:

drivers/built-in.o: In function `acpi_init':
bus.c:(.init.text+0x2d84): undefined reference to pm_flags' bus.c:(.init.text+0x2d91): undefined reference to pm_flags'

CONFIG_ACPI depends on CONFIG_PM,
so acpi/bus.c should not be compiled for CONFIG_PM=n

Hmm, is is somebody doing something strange, like "select ACPI" without guaranteeing that all of ACPI's dependencies are satisfied?

Oh, thanks for the clue.

That would be a patch that I commented on and was ignored, but James Morris merged it anyway. Now it should be dropped.

http://lkml.org/lkml/2010/5/4/379

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

reviewer
#9 lore raw

Re: linux-next: Tree for May 6 (acpi: PM=n)

In reply to Randy Dunlap
Quoted 5 lines

When CONFIG_PM is not set:

drivers/built-in.o: In function `acpi_init':
bus.c:(.init.text+0x2d84): undefined reference to pm_flags' bus.c:(.init.text+0x2d91): undefined reference to pm_flags'

CONFIG_ACPI depends on CONFIG_PM,
so acpi/bus.c should not be compiled for CONFIG_PM=n

Hmm, is is somebody doing something strange, like "select ACPI" without guaranteeing that all of ACPI's dependencies are satisfied?

thanks,
Len Brown, Intel Open Source Technology Center

#10 lore raw

Re: linux-next: Tree for May 6 (acpi: PM=n)

In reply to Stephen Rothwell
Quoted 3 lines · On Thu, 6 May 2010 15:15:02 +1000 Stephen Rothwell wrote:

Hi all,

Changes since 20100505:

When CONFIG_PM is not set:

drivers/built-in.o: In function `acpi_init':
bus.c:(.init.text+0x2d84): undefined reference to pm_flags' bus.c:(.init.text+0x2d91): undefined reference to pm_flags'

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

#11 lore raw

Re: linux-next: Tree for May 6 (acpi: PCI=n)

In reply to Stephen Rothwell
Quoted 3 lines · On Thu, 6 May 2010 15:15:02 +1000 Stephen Rothwell wrote:

Hi all,

Changes since 20100505:

When CONFIG_PCI is not enabled:

arch/x86/kernel/acpi/boot.c:1034: error: 'pci_bus_type' undeclared

drivers/acpi/reboot.c:30: error:implicit declaration of function 'pci_find_bus' drivers/acpi/reboot.c:30: warning: assignment makes pointer from integer without a cast drivers/acpi/reboot.c:38: error:implicit declaration of function 'pci_bus_write_config_byte'

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

reviewer
#12 lore raw

Re: linux-next: Tree for May 6 (acpi: PCI=n)

Quoted 7 lines

When CONFIG_PCI is not enabled:

arch/x86/kernel/acpi/boot.c:1034: error: 'pci_bus_type' undeclared

drivers/acpi/reboot.c:30: error:implicit declaration of function 'pci_find_bus' drivers/acpi/reboot.c:30: warning: assignment makes pointer from integer without a cast drivers/acpi/reboot.c:38: error:implicit declaration of function 'pci_bus_write_config_byte'

CONFIG_ACPI depends on CONFIG_PCI, so this file should not be build with CONFIG_PCI=n.

Please let me know how you were able to generate this illegal configuration.

thanks,
Len Brown, Intel Open Source Technology Center

#13 lore raw

Re: linux-next: Tree for May 6 (acpi: PCI=n)

Quoted 8 lines · On Thu, 06 May 2010 16:29:42 -0400 (EDT) Len Brown wrote:
Quoted 7 lines

When CONFIG_PCI is not enabled:

arch/x86/kernel/acpi/boot.c:1034: error: 'pci_bus_type' undeclared

drivers/acpi/reboot.c:30: error:implicit declaration of function 'pci_find_bus' drivers/acpi/reboot.c:30: warning: assignment makes pointer from integer without a cast drivers/acpi/reboot.c:38: error:implicit declaration of function 'pci_bus_write_config_byte'

Quoted 5 lines

CONFIG_ACPI depends on CONFIG_PCI, so this file should not be build with CONFIG_PCI=n.

Please let me know how you were able to generate this illegal configuration.

Same TPM kconfig that selects ACPI without any other qualifications.

In 50 randconfig builds, 12 build failures were due to that one bad kconfig.

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

#14 lore raw

Re: linux-next: Tree for May 6 (nouveau)

In reply to Stephen Rothwell
Quoted 3 lines · On Thu, 6 May 2010 15:15:02 +1000 Stephen Rothwell wrote:

Hi all,

Changes since 20100505:

When CONFIG_ACPI_BUTTON=m:

drivers/built-in.o: In function `nouveau_connector_detect':
nouveau_connector.c:(.text+0x1d81cf): undefined reference to `acpi_lid_open'

#ifdef CONFIG_ACPI
		if (!nouveau_ignorelid && !acpi_lid_open())
			status = connector_status_unknown;

#endif

Do you want that to be
#ifdef CONFIG_ACPI_BUTTON
?
That will still only be built when CONFIG_ACPI_BUTTON=y (not =m).

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

#15 lore raw

Re: linux-next: Tree for May 6 (nouveau)

In reply to Stephen Rothwell
Quoted 3 lines · On Thu, 6 May 2010 15:15:02 +1000 Stephen Rothwell wrote:

Hi all,

Changes since 20100505:

When CONFIG_ACPI_BUTTON=m:

drivers/built-in.o: In function `nouveau_connector_detect':
nouveau_connector.c:(.text+0x1d81cf): undefined reference to `acpi_lid_open'

#ifdef CONFIG_ACPI
		if (!nouveau_ignorelid && !acpi_lid_open())
			status = connector_status_unknown;

#endif

Do you want that to be
#ifdef CONFIG_ACPI_BUTTON
?
That will still only be built when CONFIG_ACPI_BUTTON=y (not =m).

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

reviewer
#16 lore raw

Re: linux-next: Tree for May 6 (nouveau)

Quoted 9 lines

When CONFIG_ACPI_BUTTON=m:

drivers/built-in.o: In function `nouveau_connector_detect':
nouveau_connector.c:(.text+0x1d81cf): undefined reference to `acpi_lid_open'

#ifdef CONFIG_ACPI
		if (!nouveau_ignorelid && !acpi_lid_open())
			status = connector_status_unknown;
Quoted 8 lines

#endif

Do you want that to be
#ifdef CONFIG_ACPI_BUTTON
?
That will still only be built when CONFIG_ACPI_BUTTON=y (not =m).

intel_lvds.c seems to handle this issue without #ifdefs by including acpi/button.h

cheers,
Len Brown, Intel Open Source Technology Center

reviewer
#17 lore raw

Re: linux-next: Tree for May 6 (nouveau)

In reply to Randy Dunlap
Quoted 9 lines

When CONFIG_ACPI_BUTTON=m:

drivers/built-in.o: In function `nouveau_connector_detect':
nouveau_connector.c:(.text+0x1d81cf): undefined reference to `acpi_lid_open'

#ifdef CONFIG_ACPI
		if (!nouveau_ignorelid && !acpi_lid_open())
			status = connector_status_unknown;
Quoted 8 lines

#endif

Do you want that to be
#ifdef CONFIG_ACPI_BUTTON
?
That will still only be built when CONFIG_ACPI_BUTTON=y (not =m).

intel_lvds.c seems to handle this issue without #ifdefs by including acpi/button.h

cheers,
Len Brown, Intel Open Source Technology Center

#18 lore raw

PATCH 1/1 IR: add header file to fix build

In reply to Stephen Rothwell

From: Randy Dunlap <[email protected]>

Fix build error:
drivers/media/IR/rc-map.c:51: error: implicit declaration of function 'msleep'

Cc Mauro Carvalho Chehab <[email protected]>
---
 drivers/media/IR/rc-map.c |    1 +
 1 file changed, 1 insertion(+)
drivers/media/IR/rc-map.c +1 -0
@@ -13,6 +13,7 @@
  */
 
 #include <media/ir-core.h>
+#include <linux/delay.h>
 #include <linux/spinlock.h>
 
 /* Used to handle IR raw handler extensions */
#19 lore raw

PATCH 1/1 staging: fix arlan build-braces

In reply to Stephen Rothwell

From: Randy Dunlap <[email protected]>

The braces on the writeControlRegister() macro are not sufficient (at least for one version of gcc):

drivers/staging/arlan/arlan-main.c:230: error: 'else' without a previous 'if' drivers/staging/arlan/arlan-main.c:236: error: 'else' without a previous 'if' drivers/staging/arlan/arlan-main.c:242: error: 'else' without a previous 'if' drivers/staging/arlan/arlan-main.c:250: error: 'else' without a previous 'if' drivers/staging/arlan/arlan-main.c:298: error: 'else' without a previous 'if' drivers/staging/arlan/arlan-main.c:324: error: 'else' without a previous 'if' drivers/staging/arlan/arlan-main.c:348: error: 'else' without a previous 'if' drivers/staging/arlan/arlan-main.c:362: error: 'else' without a previous 'if' drivers/staging/arlan/arlan-main.c:367: error: 'else' without a previous 'if' drivers/staging/arlan/arlan-main.c:372: error: 'else' without a previous 'if'

---
 drivers/staging/arlan/arlan.h |    5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)
drivers/staging/arlan/arlan.h +3 -2
@@ -461,10 +461,11 @@ struct arlan_private {
    int cr;   \
    \
    cr = readControlRegister(dev);\
-   if (cr & ARLAN_CHANNEL_ATTENTION) \
+   if (cr & ARLAN_CHANNEL_ATTENTION) { \
       writeControlRegister(dev, (cr & ~ARLAN_CHANNEL_ATTENTION));\
-   else \
+   } else { \
       writeControlRegister(dev, (cr | ARLAN_CHANNEL_ATTENTION));\
+   } \
 }
 
 #define clearChannelAttention(dev) { \
#20 lore raw

Re: [PATCH -next] staging: fix arlan build-braces

Quoted 6 lines · Randy Dunlap

From: Randy Dunlap <[email protected]>

The braces on the writeControlRegister() macro are not sufficient (at least for one version of gcc):

drivers/staging/arlan/arlan-main.c:230: error: 'else' without a previous 'if'

This driver is now deleted, so I can't apply the patch :)

thanks,

greg k-h

#21 lore raw

PATCH 1/1 staging: fix cxt1e1 semaphore build breakage

In reply to Stephen Rothwell

From: Randy Dunlap <[email protected]>

Fix build errors by including linux/semaphore.h:

drivers/staging/cxt1e1/pmcc4_private.h:144: error: field 'sr_sem_busy' has incomplete type drivers/staging/cxt1e1/pmcc4_private.h:146: error: field 'sr_sem_wait' has incomplete type drivers/staging/cxt1e1/pmcc4_private.h:189: error: field 'sem_wdbusy' has incomplete type drivers/staging/cxt1e1/musycc.c:617: error: implicit declaration of function 'down' drivers/staging/cxt1e1/musycc.c:641: error: implicit declaration of function 'up'

---
 drivers/staging/cxt1e1/pmcc4_private.h |    1 +
 1 file changed, 1 insertion(+)
drivers/staging/cxt1e1/pmcc4_private.h +1 -0
@@ -20,6 +20,7 @@
 
 #include <linux/kernel.h>
 #include <linux/sched.h>
+#include <linux/semaphore.h>
 #include <linux/spinlock.h>
 #include <linux/interrupt.h>    /* support for tasklets */
 #include <linux/timer.h>        /* support for timer */
#22 lore raw

PATCH 1/1 staging: fix ti-st, depends on RFKILL

In reply to Stephen Rothwell

From: Randy Dunlap <[email protected]>

Fix build errors. st_kim.c uses rfkill*() interfaces, so it should depend on RFKILL.

st_kim.c:(.text+0x291b21): undefined reference to rfkill_unregister' st_kim.c:(.text+0x291b31): undefined reference to rfkill_destroy' st_kim.c:(.text+0x291d8a): undefined reference to rfkill_alloc' st_kim.c:(.text+0x291db9): undefined reference to rfkill_init_sw_state' st_kim.c:(.text+0x291dc9): undefined reference to rfkill_register' st_kim.c:(.text+0x291e07): undefined reference to rfkill_unregister' (.text+0x291e85): undefined reference to rfkill_set_hw_state' (.text+0x292072): undefined reference to rfkill_set_hw_state' (.text+0x2920e1): undefined reference to `rfkill_set_hw_state

---
 drivers/staging/ti-st/Kconfig |    1 +
 1 file changed, 1 insertion(+)
drivers/staging/ti-st/Kconfig +1 -0
@@ -5,6 +5,7 @@
 menu "Texas Instruments shared transport line discipline"
 config TI_ST
 	tristate "shared transport core driver"
+	depends on RFKILL
 	select FW_LOADER
 	help
 	  This enables the shared transport core driver for TI
#23 lore raw

PATCH 1/1 usb: fix u132-hcd code/data warning

In reply to Stephen Rothwell

From: Randy Dunlap <[email protected]>

Fix gcc warning on mixed declarations/code:
drivers/usb/host/u132-hcd.c:1450: warning: ISO C90 forbids mixed declarations and code

---
 drivers/usb/host/u132-hcd.c |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/usb/host/u132-hcd.c +1 -1
@@ -1446,9 +1446,9 @@ static void u132_hcd_endp_work_scheduler
 			return;
 		} else {
 			int retval;
-			address = u132->addr[endp->usb_addr].address;
 			struct urb *urb = endp->urb_list[ENDP_QUEUE_MASK &
 				endp->queue_next];
+			address = u132->addr[endp->usb_addr].address;
 			endp->active = 1;
 			ring->curr_endp = endp;
 			ring->in_use = 1;
#24 lore raw

patch usb-fix-u132-hcd-code-data-warning.patch added to gregkh-2.6 tree

This is a note to let you know that I've just added the patch titled

Subject: USB: fix u132-hcd code/data warning

to my gregkh-2.6 tree. Its filename is

usb-fix-u132-hcd-code-data-warning.patch

This tree can be found at
http://www.kernel.org/pub/linux/kernel/people/gregkh/gregkh-2.6/patches/

Quoted 1 line

From [email protected] Tue May 11 16:25:40 2010

From: Randy Dunlap <[email protected]>
Date: Thu, 6 May 2010 16:46:03 -0700
Subject: USB: fix u132-hcd code/data warning
To: Stephen Rothwell <[email protected]>, [email protected]
Cc: [email protected], LKML <[email protected]>, lud <[email protected]>
Message-ID: <[email protected]>

From: Randy Dunlap <[email protected]>

Fix gcc warning on mixed declarations/code:
drivers/usb/host/u132-hcd.c:1450: warning: ISO C90 forbids mixed declarations and code

---
 drivers/usb/host/u132-hcd.c |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/usb/host/u132-hcd.c +1 -1
@@ -1446,9 +1446,9 @@ static void u132_hcd_endp_work_scheduler
 			return;
 		} else {
 			int retval;
-			address = u132->addr[endp->usb_addr].address;
 			struct urb *urb = endp->urb_list[ENDP_QUEUE_MASK &
 				endp->queue_next];
+			address = u132->addr[endp->usb_addr].address;
 			endp->active = 1;
 			ring->curr_endp = endp;
 			ring->in_use = 1;