Skip to contentSkip to conversation

linux-next: Tree for December 9

PATCH New Stephen Rothwell 5 participants 7 messages Dec 9, 2010

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

Hi all,

Changes since 20101208:

The v4l-dvb tree still has its build failure for which I applied a patch.

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

The net tree gained a build failure so I used the version from next-20101208.

The tip tree still has its build failures so I have reverted 3 commits.

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

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 181 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 · 218 lines
Cheers,
Stephen Rothwell                    [email protected]

$ git checkout master
$ git reset --hard stable
Merging origin/master
Merging fixes/fixes
Merging arm-current/master
Merging m68k-current/for-linus
Merging powerpc-merge/merge
Merging sparc-current/master
Merging scsi-rc-fixes/master
Merging net-current/master
Merging sound-current/for-linus
Merging pci-current/for-linus
Merging wireless-current/master
Merging kbuild-current/rc-fixes
Merging 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 ux500-core/ux500-core
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
CONFLICT (content): Merge conflict in arch/arm/mach-shmobile/Kconfig
Applying: rmobile: merge fixup for clkdev changes
Merging sparc/master
Merging tile/master
Merging xtensa/master
CONFLICT (content): Merge conflict in arch/xtensa/configs/iss_defconfig
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 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
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
Applying: media: const and __devinitdata do not mix
Merging kbuild/for-next
Merging kconfig/for-next
Merging ide/master
Merging libata/NEXT
Merging infiniband/for-next
Merging acpi/test
$ git reset --hard HEAD^
Merging refs/next/20101201/acpi
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 wireless/master
Merging net/master
CONFLICT (content): Merge conflict in drivers/net/wireless/ath/ath9k/ar9003_eeprom.c
$ git reset --hard HEAD^
Merging refs/next/20101208/net
Merging bluetooth/master
CONFLICT (content): Merge conflict in net/bluetooth/Makefile
Merging mtd/master
Merging crypto/master
Merging sound/for-next
CONFLICT (content): Merge conflict in sound/soc/sh/fsi.c
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
CONFLICT (content): Merge conflict in drivers/leds/Kconfig
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
CONFLICT (content): Merge conflict in drivers/mfd/wm8994-core.c
Merging hdlc/hdlc-next
Merging drm/drm-next
Merging fbdev/master
Merging viafb/viafb-next
Merging omap_dss2/for-next
Merging voltage/for-next
CONFLICT (content): Merge conflict in drivers/regulator/core.c
Merging security-testing/next
Merging selinux/master
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 (content): Merge conflict in drivers/scsi/bfa/bfa_fcpim.c
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 drivers/Makefile
CONFLICT (content): Merge conflict in include/linux/Kbuild
CONFLICT (content): Merge conflict in lib/Kconfig
Merging i7core_edac/linux_next
Merging i7300_edac/linux_next
Merging devicetree/next-devicetree
Merging spi/next-spi
Merging tip/auto-latest
$ git commit -v -a[master c903434] Revert "x86, nmi_watchdog: Remove all stub function calls from old nmi_watchdog"
$ git commit -v -a[master f1c1db4] Revert "x86, nmi_watchdog: Remove the old nmi_watchdog"
[master 9d97997] Revert "perf, arch: Cleanup perf-pmu init vs lockup-detector"
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
CONFLICT (content): Merge conflict in arch/sh/Kconfig
CONFLICT (content): Merge conflict in drivers/usb/musb/blackfin.c
Merging staging/staging-next
Merging slabh/slabh
Merging bkl-trivial/trivial
Merging bkl-llseek/llseek
Merging bkl-vfs/vfs
Merging bkl-config/config
CONFLICT (content): Merge conflict in arch/powerpc/kernel/setup_64.c
CONFLICT (content): Merge conflict in include/linux/hardirq.h
CONFLICT (content): Merge conflict in include/linux/smp_lock.h
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
#1 lore raw

Ave

2010/12/9 Stephen Rothwell <[email protected]>:

Quoted 4 lines

Hi all,

Changes since 20101208:

LD drivers/built-in.o
drivers/staging/built-in.o:(.data+0xec80): multiple definition of `log_level' drivers/scsi/built-in.o:(.data+0xa71c): first defined here make[2]: *** [drivers/built-in.o] Error 1
make[1]: *** [drivers] Error 2
make: *** [sub-make] Error 2

Signature · 7 lines
Slawa!
Zimny "Spie dziadu!" Lech z Wawelu

Piekielny strach zagrzmiał
Patrzę na sufit
Krew tam
Strzępy głów w bólach jęczą coś
#2 lore raw
Quoted 10 lines · Zimny Lech

Ave

2010/12/9 Stephen Rothwell <[email protected]>:

Quoted 4 lines

Hi all,

Changes since 20101208:

LD drivers/built-in.o
drivers/staging/built-in.o:(.data+0xec80): multiple definition of `log_level'

That's coming from the cxt1e1 driver, I'll fix that up to be a "sane" global name.

Quoted 1 line

drivers/scsi/built-in.o:(.data+0xa71c): first defined here

That's coming from the drivers/scsi/bfa/ driver, and it too should be fixed as it shouldn't have a global variable with this name in it. Care to let the maintainer of that driver know about this as well?

thanks,

greg k-h

#3 lore raw

2010/12/9 Greg KH <[email protected]>:

Quoted 12 lines · Zimny Lech
Quoted 10 lines

Ave

2010/12/9 Stephen Rothwell <[email protected]>:

Quoted 4 lines

Hi all,

Changes since 20101208:

  LD      drivers/built-in.o drivers/staging/built-in.o:(.data+0xec80): multiple definition of `log_level'

Quoted 8 lines

That's coming from the cxt1e1 driver, I'll fix that up to be a "sane" global name.

Quoted 1 line

drivers/scsi/built-in.o:(.data+0xa71c): first defined here

That's coming from the drivers/scsi/bfa/ driver, and it too should be fixed as it shouldn't have a global variable with this name in it.  Care to let the maintainer of that driver know about this as well?

Ok, CC'ing driver maintainer

Quoted 5 lines

thanks,

greg k-h

Signature · 7 lines
Slawa!
Zimny "Spie dziadu!" Lech z Wawelu

Piekielny strach zagrzmiał
Patrzę na sufit
Krew tam
Strzępy głów w bólach jęczą coś
#4 lore raw
Quoted 22 lines

2010/12/9 Greg KH <[email protected]>:

Quoted 20 lines · Zimny Lech
Quoted 10 lines

Ave

2010/12/9 Stephen Rothwell <[email protected]>:

Quoted 4 lines

Hi all,

Changes since 20101208:

  LD      drivers/built-in.o drivers/staging/built-in.o:(.data+0xec80): multiple definition of `log_level'

That's coming from the cxt1e1 driver, I'll fix that up to be a "sane" global name.

Quoted 1 line

drivers/scsi/built-in.o:(.data+0xa71c): first defined here

That's coming from the drivers/scsi/bfa/ driver, and it too should be fixed as it shouldn't have a global variable with this name in it. Care to let the maintainer of that driver know about this as well?

Hi Zimny,

I will provide a fix for linux-next soon.
Thanks
Jing

#5 lore raw

PATCH 1/1 staging: solo6010 depends on I2C

In reply to Stephen Rothwell

From: Randy Dunlap <[email protected]>

This driver uses i2c interfaces, so it should depend on I2C (unless someone wants to break it into pieces or make it more config-dependent).

drivers/staging/solo6x10/solo6010-i2c.c:47: error: implicit declaration of function 'i2c_transfer' drivers/staging/solo6x10/solo6010-i2c.c:299: error: implicit declaration of function 'i2c_add_adapter' drivers/staging/solo6x10/solo6010-i2c.c:310: error: implicit declaration of function 'i2c_del_adapter'

Cc Greg Kroah-Hartman <[email protected]>
Cc Ben Collins <[email protected]>
---
 drivers/staging/solo6x10/Kconfig |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/staging/solo6x10/Kconfig +1 -1
@@ -1,6 +1,6 @@
 config SOLO6X10
 	tristate "Softlogic 6x10 MPEG codec cards"
-	depends on PCI && VIDEO_DEV && SND
+	depends on PCI && VIDEO_DEV && SND && I2C
 	select VIDEOBUF_DMA_SG
 	---help---
 	  This driver supports the Softlogic based MPEG-4 and h.264 codec
#6 lore raw
In reply to Stephen Rothwell

Salve

2010/12/9 Stephen Rothwell <[email protected]>:

Quoted 3 lines

Hi all,

Changes since 20101208:

CC [M] drivers/net/wireless/ath/ath9k/main.o
/home/test/linux-2.6/drivers/net/wireless/ath/ath9k/main.c: In function 'ath_isr':
/home/test/linux-2.6/drivers/net/wireless/ath/ath9k/main.c:769:8:
error: expected expression before 'do'
make[6]: *** [drivers/net/wireless/ath/ath9k/main.o] Error 1 make[5]: *** [drivers/net/wireless/ath/ath9k] Error 2 make[4]: *** [drivers/net/wireless/ath] Error 2 make[3]: *** [drivers/net/wireless] Error 2
make[2]: *** [drivers/net] Error 2
make[1]: *** [drivers] Error 2
make: *** [sub-make] Error 2

Signature · 6 lines
Slawa!
Zimny "Spie dziadu!" Lech z Wawelu

Hej, tam!
Wydarłem klejnot szans
http://www.youtube.com/watch?v=VXWTlYzVFUA