Skip to contentSkip to conversation

linux-next: Tree for November 17

PATCH New Stephen Rothwell 3 participants 9 messages Nov 17, 2010 – Nov 18, 2010

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

Hi all,

Changes since 20101116:

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

The jdelvare-hwmon lost its conflict.

The v4l-dvb tree still has its build failure, so I used the version from next-20101112.

The net tree lost its build failure.

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

The tty tree lost its build failure.

The usb tree gained a build failure so I used the version from next-20101116.

The bkl-config tree lots its build failure.

The cleancache tree gained a conflict against the bkl-config 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 179 trees (counting Linus' and 26 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 · 220 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
CONFLICT (content): Merge conflict in drivers/scsi/scsi_error.c
CONFLICT (content): Merge conflict in include/scsi/scsi_host.h
Merging net-current/master
Merging sound-current/for-linus
Merging pci-current/for-linus
Merging wireless-current/master
Merging kbuild-current/rc-fixes
Merging driver-core.current/driver-core-linus
Merging tty.current/tty-linus
Merging usb.current/usb-linus
Merging staging.current/staging-linus
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 sh-current/sh-fixes-for-linus
Merging rmobile-current/rmobile-fixes-for-linus
Merging fbdev-current/fbdev-fixes-for-linus
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 s5p/for-next
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
Merging 4xx/next
Merging 52xx-and-virtex/next
Merging galak/next
Merging s390/features
Merging sh/sh-latest
Merging rmobile/rmobile-latest
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/20101116/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 hfsplus/for-next
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
CONFLICT (content): Merge conflict in drivers/pci/pci-sysfs.c
Merging hid/for-next
CONFLICT (content): Merge conflict in drivers/hid/hid-input.c
Merging quilt/i2c
Merging bjdooks-i2c/next-i2c
Merging quilt/jdelvare-hwmon
Merging hwmon-staging/hwmon-next
Merging quilt/kernel-doc
Merging v4l-dvb/master
$ git reset --hard HEAD^
Merging refs/next/20101112/v4l-dvb
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 ibft/master
Merging scsi/master
Merging async_tx/next
Merging net/master
Merging wireless/master
Merging bluetooth/master
CONFLICT (content): Merge conflict in drivers/net/wireless/ath/ath5k/base.c
CONFLICT (content): Merge conflict in drivers/net/wireless/iwlwifi/Makefile
CONFLICT (content): Merge conflict in drivers/net/wireless/iwlwifi/iwl-1000.c
CONFLICT (content): Merge conflict in drivers/net/wireless/iwlwifi/iwl-3945.c
CONFLICT (content): Merge conflict in drivers/net/wireless/iwlwifi/iwl-4965.c
CONFLICT (content): Merge conflict in drivers/net/wireless/iwlwifi/iwl-5000.c
CONFLICT (content): Merge conflict in drivers/net/wireless/iwlwifi/iwl-6000.c
CONFLICT (add/add): Merge conflict in drivers/net/wireless/iwlwifi/iwl-agn-rxon.c
CONFLICT (content): Merge conflict in drivers/net/wireless/iwlwifi/iwl-agn.c
CONFLICT (content): Merge conflict in drivers/net/wireless/iwlwifi/iwl-core.c
CONFLICT (content): Merge conflict in drivers/net/wireless/iwlwifi/iwl-core.h
CONFLICT (add/add): Merge conflict in drivers/net/wireless/iwlwifi/iwl-legacy.c
CONFLICT (add/add): Merge conflict in drivers/net/wireless/iwlwifi/iwl-legacy.h
Merging mtd/master
Merging crypto/master
Merging sound/for-next
Merging sound-asoc/for-next
Merging cpufreq/next
Merging quilt/rr
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 mmc/mmc-next
Merging kgdb/kgdb-next
Merging slab/for-next
Merging uclinux/for-next
Merging md/for-next
Merging mfd/for-next
Merging hdlc/hdlc-next
Merging drm/drm-next
Merging fbdev/master
Merging viafb/viafb-next
Merging omap_dss2/for-next
Merging voltage/for-next
Merging security-testing/next
Merging lblnet/master
Merging agp/agp-next
Merging watchdog/master
Merging bdev/master
Merging dwmw2-iommu/master
Merging cputime/cputime
Merging osd/linux-next
Merging jc_docs/docs-next
Merging nommu/master
Merging trivial/for-next
CONFLICT (content): Merge conflict in MAINTAINERS
CONFLICT (delete/modify): arch/blackfin/mach-bf518/include/mach/defBF51x_base.h deleted in HEAD and modified in trivial/for-next. Version trivial/for-next of arch/blackfin/mach-bf518/include/mach/defBF51x_base.h left in tree.
CONFLICT (delete/modify): arch/blackfin/mach-bf527/include/mach/defBF52x_base.h deleted in HEAD and modified in trivial/for-next. Version trivial/for-next of arch/blackfin/mach-bf527/include/mach/defBF52x_base.h left in tree.
CONFLICT (content): Merge conflict in arch/blackfin/mach-bf538/include/mach/defBF539.h
CONFLICT (content): Merge conflict in drivers/scsi/bfa/bfa_fcpim.c
$ git rm -f arch/blackfin/mach-bf518/include/mach/defBF51x_base.h arch/blackfin/mach-bf527/include/mach/defBF52x_base.h
Merging audit/for-next
Merging suspend/linux-next
Merging fsnotify/for-next
Merging irda/for-next
Merging catalin/for-next
Merging alacrity/linux-next
CONFLICT (content): Merge conflict in include/linux/Kbuild
Merging i7core_edac/linux_next
Merging i7300_edac/linux_next
Merging devicetree/next-devicetree
Merging spi/next-spi
Merging tip/auto-latest
Merging rcu/rcu/next
Merging oprofile/for-next
Merging xen/upstream/xen
Merging swiotlb-xen/master
Merging xen-pvhvm/linux-next
Merging edac-amd/for-next
Merging percpu/for-next
Merging workqueues/for-next
Merging sfi/sfi-test
Merging asm-generic/next
Merging drivers-x86/linux-next
Merging hwpoison/hwpoison
Merging sysctl/master
Merging driver-core/driver-core-next
Merging tty/tty-next
Merging usb/usb-next
$ git reset --hard HEAD^
Merging refs/next/20101116/usb
Merging staging/staging-next
Merging slabh/slabh
Merging bkl-trivial/trivial
Merging bkl-llseek/llseek
Merging bkl-vfs/vfs
Merging bkl-config/config
Merging irqflags/master
Merging cleancache/linux-next
CONFLICT (content): Merge conflict in fs/ocfs2/super.c
CONFLICT (content): Merge conflict in include/linux/fs.h
CONFLICT (content): Merge conflict in mm/Kconfig
Merging scsi-post-merge/merge-base:master
[master efcc1bc] Revert "iwlwifi: fix modular legacy build errors"
#1 lore raw

Ave

2010/11/17 Stephen Rothwell <[email protected]>:

Quoted 4 lines

Hi all,

Changes since 20101116:

I think that this is well know
LD [M] sound/oss/sound.o
make[3]: *** No rule to make target /etc/sound/dsp001.ld', needed by sound/oss/pss_boot.h'. Stop.
make[2]: *** [sound/oss] Error 2
make[1]: *** [sound] Error 2
make: *** [sub-make] Error 2

This one can be interesting

GEN /home/test/linux-2.6-obj/Makefile
scripts/kconfig/conf --silentoldconfig Kconfig
warning: (MTD_NAND && MTD || MTD_DOC2000 && MTD || MTD_DOC2001 && MTD || MTD_DOC2001PLUS && MTD) selects MTD_NAND_IDS which has unmet direct dependencies (MTD
&& MTD_NAND)
warning: (MTD_NAND && MTD || MTD_DOC2000 && MTD || MTD_DOC2001 && MTD || MTD_DOC2001PLUS && MTD) selects MTD_NAND_IDS which has unmet direct dependencies (MTD
&& MTD_NAND)
Using /home/test/linux-2.6 as source for kernel

  GEN     /home/test/linux-2.6-obj/Makefile
  CHK     include/linux/version.h
  CHK     include/generated/utsrelease.h
  CC      kernel/bounds.s
  GEN     include/generated/bounds.h
  CC      arch/x86/kernel/asm-offsets.s
In file included from
/home/test/linux-2.6/arch/x86/include/asm/suspend_64.h:10:0,
                 from /home/test/linux-2.6/arch/x86/include/asm/suspend.h:4,
                 from /home/test/linux-2.6/arch/x86/kernel/asm-offsets_64.c:20,
                 from /home/test/linux-2.6/arch/x86/kernel/asm-offsets.c:4:

/home/test/linux-2.6/arch/x86/include/asm/i387.h: In function 'irq_ts_save':
/home/test/linux-2.6/arch/x86/include/asm/i387.h:348:2: error:
implicit declaration of function 'kernel_locked'
make[2]: *** [arch/x86/kernel/asm-offsets.s] Error 1
make[1]: *** [prepare0] Error 2
make: *** [sub-make] Error 2

Config attached.

Signature · 7 lines
Slawa!
N.P.S.

Les fleurs du mal unfold
Comme les fleurs du mal
Dark demons of my soul
Un amour fatal
#2 lore raw
Quoted 48 lines · On Wed, 17 Nov 2010 18:23:20 +0100 Zimny Lech wrote:

Ave

2010/11/17 Stephen Rothwell <[email protected]>:

Quoted 4 lines

Hi all,

Changes since 20101116:

I think that this is well know
LD [M] sound/oss/sound.o
make[3]: *** No rule to make target /etc/sound/dsp001.ld', needed by sound/oss/pss_boot.h'. Stop.
make[2]: *** [sound/oss] Error 2
make[1]: *** [sound] Error 2
make: *** [sub-make] Error 2

This one can be interesting

GEN /home/test/linux-2.6-obj/Makefile
scripts/kconfig/conf --silentoldconfig Kconfig
warning: (MTD_NAND && MTD || MTD_DOC2000 && MTD || MTD_DOC2001 && MTD || MTD_DOC2001PLUS && MTD) selects MTD_NAND_IDS which has unmet direct dependencies (MTD
&& MTD_NAND)
warning: (MTD_NAND && MTD || MTD_DOC2000 && MTD || MTD_DOC2001 && MTD || MTD_DOC2001PLUS && MTD) selects MTD_NAND_IDS which has unmet direct dependencies (MTD
&& MTD_NAND)
Using /home/test/linux-2.6 as source for kernel

  GEN     /home/test/linux-2.6-obj/Makefile
  CHK     include/linux/version.h
  CHK     include/generated/utsrelease.h
  CC      kernel/bounds.s
  GEN     include/generated/bounds.h
  CC      arch/x86/kernel/asm-offsets.s
In file included from
/home/test/linux-2.6/arch/x86/include/asm/suspend_64.h:10:0,
                 from /home/test/linux-2.6/arch/x86/include/asm/suspend.h:4,
                 from /home/test/linux-2.6/arch/x86/kernel/asm-offsets_64.c:20,
                 from /home/test/linux-2.6/arch/x86/kernel/asm-offsets.c:4:

/home/test/linux-2.6/arch/x86/include/asm/i387.h: In function 'irq_ts_save':
/home/test/linux-2.6/arch/x86/include/asm/i387.h:348:2: error:
implicit declaration of function 'kernel_locked'
make[2]: *** [arch/x86/kernel/asm-offsets.s] Error 1
make[1]: *** [prepare0] Error 2
make: *** [sub-make] Error 2

Quoted 1 line

Config attached.

Why was #include <linux/smp_lock.h> removed from <linux/hardirq.h> ?

I added #include <linux/smp_lock.h> to i387.h, but them mm/filemap.c build fails with the same error:

linux-next-20101117/mm/filemap.c: In function 'iov_iter_copy_from_user_atomic':
linux-next-20101117/mm/filemap.c:1936: error: implicit declaration of function 'kernel_locked'

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

#3 lore raw
Quoted 8 lines · On Wed, 17 Nov 2010 09:59:20 -0800 Randy Dunlap <[email protected]> wrote:

Why was #include <linux/smp_lock.h> removed from <linux/hardirq.h> ?

I added #include <linux/smp_lock.h> to i387.h, but them mm/filemap.c build fails with the same error:

linux-next-20101117/mm/filemap.c: In function 'iov_iter_copy_from_user_atomic':
linux-next-20101117/mm/filemap.c:1936: error: implicit declaration of function 'kernel_locked'

Was this fixed before Linus took that patch? Also, the #include of linux/smp_lock.h in linux/hardirq.h was the only line between #ifdef CONFIG_PREEMPT and #endif ... was this patch even reviewed?

Maybe (after it was reviewed) it should have been given more time in linux-next before being merged.

Signature · 3 lines
Cheers,
Stephen Rothwell                    [email protected]
http://www.canb.auug.org.au/~sfr/
#4 lore raw
Quoted 11 lines · Stephen Rothwell
Quoted 8 lines · On Wed, 17 Nov 2010 09:59:20 -0800 Randy Dunlap <[email protected]> wrote:

Why was #include <linux/smp_lock.h> removed from <linux/hardirq.h> ?

I added #include <linux/smp_lock.h> to i387.h, but them mm/filemap.c build fails with the same error:

linux-next-20101117/mm/filemap.c: In function 'iov_iter_copy_from_user_atomic':
linux-next-20101117/mm/filemap.c:1936: error: implicit declaration of function 'kernel_locked'

Was this fixed before Linus took that patch? Also, the #include of

This build error was in linux-next of NOV. 17. What mainline base did it use? I don't exactly know how to answer your question...

Quoted 5 lines

linux/smp_lock.h in linux/hardirq.h was the only line between #ifdef CONFIG_PREEMPT and #endif ... was this patch even reviewed?

Maybe (after it was reviewed) it should have been given more time in linux-next before being merged.

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

Hi Randy,

Quoted 7 lines · On Wed, 17 Nov 2010 15:24:51 -0800 Randy Dunlap <[email protected]> wrote:
Quoted 2 lines · Stephen Rothwell

Was this fixed before Linus took that patch? Also, the #include of

This build error was in linux-next of NOV. 17. What mainline base did it use? I don't exactly know how to answer your question...

It was a question for Linus and Arnd, as Linus took Arnd's patch this morning (my time) i.e. after next-20101117. That patch was in linux-next for only one day (Nov 17) as it broke my builds the day before and was not included then.

Signature · 3 lines
Cheers,
Stephen Rothwell                    [email protected]
http://www.canb.auug.org.au/~sfr/
#6 lore raw
In reply to Stephen Rothwell

Salve!

2010/11/17 Stephen Rothwell <[email protected]>:

Quoted 3 lines

Hi all,

Changes since 20101116:

Might be something new

CC kernel/rcutiny.o
In file included from /home/test/linux-2.6/kernel/rcutiny_plugin.h:264:0,

                 from /home/test/linux-2.6/kernel/rcutiny.c:53:

/home/test/linux-2.6/kernel/rtmutex_common.h: In function 'task_has_pi_waiters':
/home/test/linux-2.6/kernel/rtmutex_common.h:81:29: error: 'struct task_struct' has no member named 'pi_waiters' /home/test/linux-2.6/kernel/rtmutex_common.h: In function 'task_top_pi_waiter':
/home/test/linux-2.6/kernel/rtmutex_common.h:87:9: error: 'struct task_struct' has no member named 'pi_waiters'
make[2]: *** [kernel/rcutiny.o] Error 1
make[1]: *** [kernel] Error 2
make: *** [sub-make] Error 2

Probably know issue
CC sound/oss/ad1848.o
/home/test/linux-2.6/sound/oss/ad1848.c:2867:32: warning: 'id_table' defined but not used
CC sound/oss/mpu401.o
make[3]: *** No rule to make target /etc/sound/trxpro.hex', needed by sound/oss/trix_boot.h'. Stop.
make[2]: *** [sound/oss] Error 2
make[1]: *** [sound] Error 2
make: *** [sub-make] Error 2

Signature · 7 lines
Slawa!
N.P.S.

Les fleurs du mal unfold
Comme les fleurs du mal
Dark demons of my soul
Un amour fatal
#7 lore raw

On Wed, 17 Nov 2010 23:53:14 +0100 Zimny Lech wrote:

[adding Paul McKenney]

Quoted 23 lines

Salve!

2010/11/17 Stephen Rothwell <[email protected]>:

Quoted 3 lines

Hi all,

Changes since 20101116:

Might be something new

CC kernel/rcutiny.o
In file included from /home/test/linux-2.6/kernel/rcutiny_plugin.h:264:0,

                 from /home/test/linux-2.6/kernel/rcutiny.c:53:

/home/test/linux-2.6/kernel/rtmutex_common.h: In function 'task_has_pi_waiters':
/home/test/linux-2.6/kernel/rtmutex_common.h:81:29: error: 'struct task_struct' has no member named 'pi_waiters' /home/test/linux-2.6/kernel/rtmutex_common.h: In function 'task_top_pi_waiter':
/home/test/linux-2.6/kernel/rtmutex_common.h:87:9: error: 'struct task_struct' has no member named 'pi_waiters'
make[2]: *** [kernel/rcutiny.o] Error 1
make[1]: *** [kernel] Error 2
make: *** [sub-make] Error 2

Quoted 10 lines

Probably know issue
CC sound/oss/ad1848.o
/home/test/linux-2.6/sound/oss/ad1848.c:2867:32: warning: 'id_table' defined but not used
CC sound/oss/mpu401.o
make[3]: *** No rule to make target /etc/sound/trxpro.hex', needed by sound/oss/trix_boot.h'. Stop.
make[2]: *** [sound/oss] Error 2
make[1]: *** [sound] Error 2
make: *** [sub-make] Error 2

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

#8 lore raw

PATCH 1/1 staging: clearpad_tm1217 depends on INPUT

In reply to Stephen Rothwell

From: Randy Dunlap <[email protected]>

clearpad_tm1217 driver uses many input_() interfaces, so it should depend on INPUT.

clearpad_tm1217.c:(.text+0xf19ac): undefined reference to input_unregister_device' clearpad_tm1217.c:(.text+0xf1b19): undefined reference to input_event' clearpad_tm1217.c:(.text+0xf1b31): undefined reference to input_event' clearpad_tm1217.c:(.text+0xf1bb4): undefined reference to input_event' clearpad_tm1217.c:(.text+0xf1bf2): undefined reference to input_event' drivers/built-in.o:clearpad_tm1217.c:(.text+0xf1c08): more undefined references to input_event' follow clearpad_tm1217.c:(.text+0xf1df3): undefined reference to input_allocate_device' clearpad_tm1217.c:(.text+0xf1eac): undefined reference to input_set_abs_params' clearpad_tm1217.c:(.text+0xf1ed1): undefined reference to input_set_abs_params' clearpad_tm1217.c:(.text+0xf1ed8): undefined reference to input_register_device' clearpad_tm1217.c:(.text+0xf2040): undefined reference to input_unregister_device' clearpad_tm1217.c:(.text+0xf204b): undefined reference to input_free_device'

Cc Ramesh Agarwal <[email protected]>
---
 drivers/staging/cptm1217/Kconfig |    1 +
 1 file changed, 1 insertion(+)
drivers/staging/cptm1217/Kconfig +1 -0
@@ -2,6 +2,7 @@ config TOUCHSCREEN_CLEARPAD_TM1217
 	tristate "Synaptics Clearpad TM1217"
 	depends on I2C
 	depends on GPIOLIB
+	depends on INPUT
 	help
 	  Say Y here if you have a Synaptics Clearpad TM1217 Controller