Skip to contentSkip to conversation

linux-next: Tree for May 27

PATCH Applied Stephen Rothwell 5 participants 7 messages May 27, 2010 – May 31, 2010

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

Hi all,

We are in the merge window again. I remind you all not to add stuff for 2.6.36 to your linux-next trees until after 2.6.35-rc1.

Changes since 20100526:

My fixes tree contains:
v4l-dvb: update gfp/slab.h includes
arm: update gfp/slab.h includes
davinci: update gfp/slab.h includes
ocfs2: update gfp/slab.h includes

The driver-core.current tree lost its conflict.

The fuse tree lost its build failure.

The rr tree lost its conflicts.

The leds tree gained 2 build failures so I used the version from next-20100526.

The watchdog 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 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 · 187 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/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 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
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
CONFLICT (content): Merge conflict in drivers/serial/mpc52xx_uart.c
Merging galak/next
CONFLICT (content): Merge conflict in arch/powerpc/sysdev/fsl_msi.c
Merging s390/features
Merging sh/master
Merging genesis/master
CONFLICT (content): Merge conflict in include/linux/serial_sci.h
Merging sparc/master
Merging xtensa/master
Merging ceph/for-next
Merging cifs/master
Merging configfs/linux-next
Merging ecryptfs/next
CONFLICT (content): Merge conflict in fs/ecryptfs/main.c
Merging ext3/for_next
Merging ext4/next
CONFLICT (content): Merge conflict in fs/ext4/fsync.c
CONFLICT (content): Merge conflict in fs/ext4/super.c
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
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
CONFLICT (content): Merge conflict in arch/arm/plat-omap/i2c.c
CONFLICT (content): Merge conflict in drivers/i2c/busses/i2c-cpm.c
CONFLICT (content): Merge conflict in drivers/i2c/busses/i2c-mpc.c
Merging quilt/jdelvare-hwmon
Merging quilt/kernel-doc
Merging v4l-dvb/master
Merging kbuild/for-next
CONFLICT (content): Merge conflict in Documentation/kbuild/makefiles.txt
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
CONFLICT (content): Merge conflict in Documentation/feature-removal-schedule.txt
Merging ubi/linux-next
Merging kvm/linux-next
Merging dlm/next
Merging ibft/master
Merging scsi/master
Merging async_tx/next
Merging net/master
Merging wireless/master
Merging mtd/master
Merging crypto/master
Merging sound/for-next
Merging cpufreq/next
Merging quilt/rr
Merging mmc/next
Merging input/next
Merging lsm/for-next
Merging block/for-next
Merging quilt/device-mapper
Merging embedded/master
Merging firmware/master
Merging pcmcia/master
Merging battery/master
Merging leds/for-mm
$ git reset --hard HEAD^
Merging refs/next/20100526/leds
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/dma/Makefile
CONFLICT (add/add): Merge conflict in drivers/dma/timb_dma.c
Merging hdlc/hdlc-next
Merging drm/drm-next
Merging viafb/viafb-next
Merging voltage/for-next
Merging security-testing/next
Merging lblnet/master
Merging agp/agp-next
Merging uwb/for-upstream
Merging watchdog/master
Merging bdev/master
Merging dwmw2-iommu/master
Merging cputime/cputime
Merging osd/linux-next
Merging jc_docs/docs-next
Merging nommu/master
Merging trivial/for-next
Merging audit/for-next
Merging quilt/aoe
Merging suspend/linux-next
Merging bluetooth/master
Merging fsnotify/for-next
CONFLICT (delete/modify): fs/notify/inotify/inotify.c deleted in fsnotify/for-next and modified in HEAD. Version HEAD of fs/notify/inotify/inotify.c left in tree.
$ git rm -f fs/notify/inotify/inotify.c
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
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
CONFLICT (content): Merge conflict in kernel/Makefile
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
Merging quilt/driver-core
Merging quilt/tty
Merging quilt/usb
Merging staging-next/staging-next
Merging slabh/slabh
Merging scsi-post-merge/master
#1 lore raw

Re: linux-next: Tree for May 27 (infiniband: qib)

Quoted 6 lines · On Thu, 27 May 2010 15:26:28 +1000 Stephen Rothwell wrote:

Hi all,

We are in the merge window again. I remind you all not to add stuff for 2.6.36 to your linux-next trees until after 2.6.35-rc1.

Changes since 20100526:

when CONFIG_INFINIBAND_QIB=y and CONFIG_DCA=m:

drivers/built-in.o: In function `qib_update_sdma_dca':
qib_iba7322.c:(.text+0x409219): undefined reference to dca3_get_tag' drivers/built-in.o: In function qib_update_rhdrq_dca':
qib_iba7322.c:(.text+0x40a1f9): undefined reference to dca3_get_tag' drivers/built-in.o: In function qib_setup_7322_cleanup':
qib_iba7322.c:(.text+0x40f91f): undefined reference to dca_remove_requester' drivers/built-in.o: In function qib_init_iba7322_funcs':
(.text+0x419b6f): undefined reference to `dca_add_requester'

However, it looks like qib needs to handle DCA config in a way that is similar to how it is handled in drivers/net/{myri10ge,igb,ixgbe}/ instead of assuming that DCA is enabled.

And please fix the linux-next 2010-may-25 reported qib problem:
http://lkml.org/lkml/2010/5/25/321

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

#2 lore raw

Re: linux-next: Tree for May 27 (infiniband: qib)

Quoted 3 lines

However, it looks like qib needs to handle DCA config in a way that is similar to how it is handled in drivers/net/{myri10ge,igb,ixgbe}/ instead of assuming that DCA is enabled.

Looks like we're just going to rip out DCA support for now.

Quoted 2 lines

And please fix the linux-next 2010-may-25 reported qib problem:
http://lkml.org/lkml/2010/5/25/321

I think that should be fixed in my for-next branch already (at least I have a patch from Ralph called "IB/qib: Fix undefined symbol error when CONFIG_PCI_MSI=n" in there).

- R.

Signature · 2 lines
Roland Dreier <[email protected]> || For corporate legal information go to:
http://www.cisco.com/web/about/doing_business/legal/cri/index.html
#3 lore raw

Re: linux-next: Tree for May 27 (infiniband: qib)

Quoted 4 lines · Roland Dreier
Quoted 3 lines

However, it looks like qib needs to handle DCA config in a way that is similar to how it is handled in drivers/net/{myri10ge,igb,ixgbe}/ instead of assuming that DCA is enabled.

Quoted 8 lines

Looks like we're just going to rip out DCA support for now.

Quoted 2 lines

And please fix the linux-next 2010-may-25 reported qib problem:
http://lkml.org/lkml/2010/5/25/321

I think that should be fixed in my for-next branch already (at least I have a patch from Ralph called "IB/qib: Fix undefined symbol error when CONFIG_PCI_MSI=n" in there).

Sounds good. Was is posted to linux-rdma?

thanks,

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

Re: linux-next: Tree for May 27 (infiniband: qib)

Quoted 10 lines · Randy Dunlap
Quoted 9 lines · Roland Dreier
Quoted 3 lines

However, it looks like qib needs to handle DCA config in a way that is similar to how it is handled in drivers/net/{myri10ge,igb,ixgbe}/ instead of assuming that DCA is enabled.

Looks like we're just going to rip out DCA support for now.

Quoted 2 lines

And please fix the linux-next 2010-may-25 reported qib problem:
http://lkml.org/lkml/2010/5/25/321

Quoted 7 lines
Quoted 3 lines

I think that should be fixed in my for-next branch already (at least I have a patch from Ralph called "IB/qib: Fix undefined symbol error when CONFIG_PCI_MSI=n" in there).

Sounds good. Was is posted to linux-rdma?

thanks,

Yes, I posted it to linux-rdma.

http://www.spinics.net/lists/linux-rdma/msg04140.html

http://www.spinics.net/lists/linux-rdma/msg04187.html

#5 lore raw

PATCH 1/1 hid: roccat modules interdependencies

In reply to Stephen Rothwell

From: Randy Dunlap <[email protected]>

hid-roccat-kone calls the hid-roccat module interfaces, so the former should depend on or select the latter to prevent build errors, like:

hid-roccat-kone.c:(.text+0x133ed2): undefined reference to roccat_report_event' hid-roccat-kone.c:(.text+0x133fa8): undefined reference to roccat_disconnect' hid-roccat-kone.c:(.text+0x1353be): undefined reference to `roccat_connect'

---
 drivers/hid/Kconfig |    1 +
 1 file changed, 1 insertion(+)
drivers/hid/Kconfig +1 -0
@@ -358,6 +358,7 @@ config HID_ROCCAT
 config HID_ROCCAT_KONE
 	tristate "Roccat Kone Mouse support"
 	depends on USB_HID
+	select HID_ROCCAT
 	---help---
 	Support for Roccat Kone mouse.
 
Applied
#6 lore raw

Re: [PATCH -next] hid: roccat modules interdependencies

Quoted 18 lines · Randy Dunlap

From: Randy Dunlap <[email protected]>

hid-roccat-kone calls the hid-roccat module interfaces, so the former should depend on or select the latter to prevent build errors, like:

hid-roccat-kone.c:(.text+0x133ed2): undefined reference to roccat_report_event' hid-roccat-kone.c:(.text+0x133fa8): undefined reference to roccat_disconnect' hid-roccat-kone.c:(.text+0x1353be): undefined reference to `roccat_connect'

---
 drivers/hid/Kconfig |    1 +
 1 file changed, 1 insertion(+)

drivers/hid/Kconfig config HID_ROCCAT · line 363

Quoted 6 lines
drivers/hid/Kconfig +1 -0
@@ -358,6 +358,7 @@ config HID_ROCCAT
 config HID_ROCCAT_KONE
 	tristate "Roccat Kone Mouse support"
 	depends on USB_HID
+	select HID_ROCCAT
 	---help---
 	Support for Roccat Kone mouse.

Applied, thanks Randy.

Signature · 2 lines
Jiri Kosina
SUSE Labs, Novell Inc.