linux-next: Tree for September 3
Subsystems (2)
Hi all,
Changes since 20100902:
The powerpc tree gained a build failure for which I applied a patch.
The galak tree gained a conflict against the powerpc-merge tree.
The net tree lost its build failure.
The input tree lost a conflict.
I still have a patch to the drivers-x86 tree to remove a Kconfig warning.
The tty tree gained a conflict against the microblaze tree.
The usb tree lost its conflicts and build failure.
----------------------------------------------------------------------------
I have created today's linux-next tree atgit://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 171 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 · 196 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 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 CONFLICT (content): Merge conflict in arch/arm/mach-s3c64xx/Makefile CONFLICT (content): Merge conflict in arch/arm/mach-s3c64xx/mach-smdk6410.c CONFLICT (content): Merge conflict in arch/arm/plat-samsung/Kconfig CONFLICT (content): Merge conflict in drivers/input/touchscreen/s3c2410_ts.c 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 CONFLICT (content): Merge conflict in arch/powerpc/platforms/85xx/mpc85xx_mds.c Merging s390/features Merging sh/master Merging genesis/master 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 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 Merging hid/for-next Merging quilt/i2c Merging bjdooks-i2c/next-i2c Merging quilt/jdelvare-hwmon Merging quilt/kernel-doc Merging v4l-dvb/master CONFLICT (content): Merge conflict in drivers/media/IR/ir-raw-event.c CONFLICT (add/add): Merge conflict in drivers/media/video/s5p-fimc/fimc-core.c 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 swiotlb-xen/master Merging ibft/master Merging scsi/master Merging async_tx/next Merging net/master Merging wireless/master CONFLICT (content): Merge conflict in net/mac80211/main.c Merging mtd/master Merging crypto/master Merging sound-asoc/for-next CONFLICT (content): Merge conflict in arch/arm/mach-s3c64xx/mach-smdk6410.c Merging sound/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 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 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 Merging irda/for-next CONFLICT (content): Merge conflict in drivers/net/irda/irda-usb.c Merging catalin/for-next Merging alacrity/linux-next CONFLICT (content): Merge conflict in include/linux/Kbuild Merging i7core_edac/linux_next CONFLICT (content): Merge conflict in MAINTAINERS Merging devicetree/next-devicetree Merging spi/next-spi Merging limits/writable_limits Merging omap_dss2/for-next Merging xen/upstream/xen Merging rcu/rcu/next Merging tip/auto-latest Merging lost-spurious-irq/lost-spurious-irq CONFLICT (content): Merge conflict in drivers/ata/libata-core.c CONFLICT (content): Merge conflict in include/linux/libata.h 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 drivers-x86/linux-next Applying: Fix Kconfig mistaken update 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 CONFLICT (content): Merge conflict in drivers/serial/uartlite.c Merging quilt/usb Merging staging-next/staging-next Merging slabh/slabh Merging scsi-post-merge/merge-base:master $ git checkout scsi-post-merge/master Applying: powerpc: define a compat_sys_recv cond_syscall
PATCH 1/1 staging: mrst touchscreen depends on SPI
From: Randy Dunlap <[email protected]>
Moorestown touchscreen driver should depend on SPI. Fixes these build errors:
intel-mid-touch.c:(.init.text+0xdd34): undefined reference to spi_register_driver' drivers/built-in.o:(.data+0x21778): undefined reference to spi_bus_type'
--- drivers/staging/mrst-touchscreen/Kconfig | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/staging/mrst-touchscreen/Kconfig +1 -1
@@ -1,6 +1,6 @@ config TOUCHSCREEN_INTEL_MID tristate "Intel MID platform resistive touchscreen" - depends on INTEL_SCU_IPC + depends on INTEL_SCU_IPC && SPI default y help Say Y here if you have a Intel MID based touchscreen
Re: linux-next: Tree for September 3 (ar6k)
In reply to Stephen RothwellQuoted 3 lines · On Fri, 3 Sep 2010 13:52:06 +1000 Stephen Rothwell wrote:
Hi all,
Changes since 20100902:
drivers/staging/ath6kl/htc2/AR6000/ar6k.c:29:43: error: AR6002/hw2.0/hw/mbox_host_reg.h: No such file or directory
which leads to lots of these (this is just a sample):
drivers/staging/ath6kl/htc2/AR6000/ar6k.c:227: error: implicit declaration of function 'INT_STATUS_ENABLE_ERROR_SET' drivers/staging/ath6kl/htc2/AR6000/ar6k.c:228: error: implicit declaration of function 'INT_STATUS_ENABLE_CPU_SET' drivers/staging/ath6kl/htc2/AR6000/ar6k.c:229: error: implicit declaration of function 'INT_STATUS_ENABLE_COUNTER_SET' drivers/staging/ath6kl/htc2/AR6000/ar6k.c:232: error: implicit declaration of function 'INT_STATUS_ENABLE_MBOX_DATA_SET' drivers/staging/ath6kl/htc2/AR6000/ar6k.c:245: error: implicit declaration of function 'CPU_INT_STATUS_ENABLE_BIT_SET' drivers/staging/ath6kl/htc2/AR6000/ar6k.c:249: error: implicit declaration of function 'ERROR_STATUS_ENABLE_RX_UNDERFLOW_SET' drivers/staging/ath6kl/htc2/AR6000/ar6k.c:250: error: implicit declaration of function 'ERROR_STATUS_ENABLE_TX_OVERFLOW_SET' drivers/staging/ath6kl/htc2/AR6000/ar6k.c:254: error: implicit declaration of function 'COUNTER_INT_STATUS_ENABLE_BIT_SET' drivers/staging/ath6kl/htc2/AR6000/ar6k.c:263: error: 'INT_STATUS_ENABLE_ADDRESS' undeclared (first use in this function) drivers/staging/ath6kl/htc2/AR6000/ar6k.c:296: error: 'INT_STATUS_ENABLE_ADDRESS' undeclared (first use in this function)
---
~Randy
*** Remember to use Documentation/SubmitChecklist when testing your code ***
RE: linux-next: Tree for September 3 (ar6k)
Apologies for the inconvenience. I synced to the linux-next tree and looked into the drivers/staging/ath6kl directory. I was able to compile the driver without any issues.
One of the reasons this might happen is if the following symbolic link is broken.
drivers/staging/ath6kl/include/common/AR6002/hw2.0/hw
The link should point to drivers/staging/ath6kl/include/common/AR6002/hw2.0/hw.0
Can you pls send me the output of
ls -al drivers/staging/ath6kl/include/common/AR6002/hw2.0/
or if someone can help with the steps to reproduce the problem.
Regards,
Vipin
Quoted 44 lines
-----Original Message-----
From: Randy Dunlap [mailto:[email protected]]
Sent: Friday, September 03, 2010 6:06 PM
To: Stephen Rothwell; [email protected]
Cc: [email protected]; LKML; Vipin Mehta
Subject: Re: linux-next: Tree for September 3 (ar6k)Quoted 3 lines · On Fri, 3 Sep 2010 13:52:06 +1000 Stephen Rothwell wrote:
Hi all,
Changes since 20100902:
drivers/staging/ath6kl/htc2/AR6000/ar6k.c:29:43: error:AR6002/hw2.0/hw/mbox_host_reg.h: No such file or directorywhich leads to lots of these (this is just a sample):
drivers/staging/ath6kl/htc2/AR6000/ar6k.c:227: error: implicit declaration of function 'INT_STATUS_ENABLE_ERROR_SET'drivers/staging/ath6kl/htc2/AR6000/ar6k.c:228: error: implicit declaration of function 'INT_STATUS_ENABLE_CPU_SET'drivers/staging/ath6kl/htc2/AR6000/ar6k.c:229: error: implicit declaration of function 'INT_STATUS_ENABLE_COUNTER_SET'drivers/staging/ath6kl/htc2/AR6000/ar6k.c:232: error: implicit declaration of function 'INT_STATUS_ENABLE_MBOX_DATA_SET'drivers/staging/ath6kl/htc2/AR6000/ar6k.c:245: error: implicit declaration of function 'CPU_INT_STATUS_ENABLE_BIT_SET'drivers/staging/ath6kl/htc2/AR6000/ar6k.c:249: error: implicit declaration of function 'ERROR_STATUS_ENABLE_RX_UNDERFLOW_SET'drivers/staging/ath6kl/htc2/AR6000/ar6k.c:250: error: implicit declaration of function 'ERROR_STATUS_ENABLE_TX_OVERFLOW_SET'drivers/staging/ath6kl/htc2/AR6000/ar6k.c:254: error: implicit declaration of function 'COUNTER_INT_STATUS_ENABLE_BIT_SET'drivers/staging/ath6kl/htc2/AR6000/ar6k.c:263: error:
'INT_STATUS_ENABLE_ADDRESS' undeclared (first use in this function)drivers/staging/ath6kl/htc2/AR6000/ar6k.c:296: error:
'INT_STATUS_ENABLE_ADDRESS' undeclared (first use in this function)---
~Randy
*** Remember to useDocumentation/SubmitChecklistwhen testing your code
***
Re: linux-next: Tree for September 3 (ar6k)
Quoted 7 lines · Vipin Mehta
Apologies for the inconvenience. I synced to the linux-next tree and looked into the
drivers/staging/ath6kldirectory. I was able to compile the driver without any issues.One of the reasons this might happen is if the following symbolic link is broken.
drivers/staging/ath6kl/include/common/AR6002/hw2.0/hwThe link should point to
drivers/staging/ath6kl/include/common/AR6002/hw2.0/hw.0
I applied the patch and the symlink "should" be there, but in general, we shouldn't rely on a symlink in the kernel tree to work properly.
Can you send me a patch to fix this up so it works without a symlink?
thanks,
greg k-h
RE: linux-next: Tree for September 3 (ar6k)
Sure. Will do that.
Regards,
Vipin
Quoted 28 lines
-----Original Message-----
From: Greg KH [mailto:[email protected]]
Sent: Friday, September 03, 2010 7:16 PM
To: Vipin Mehta
Cc: Randy Dunlap; Stephen Rothwell; [email protected]; LKML
Subject: Re: linux-next: Tree for September 3 (ar6k)Quoted 1 line · Vipin Mehta
Apologies for the inconvenience. I synced to the linux-next tree and
looked into the
drivers/staging/ath6kldirectory. I was able to compile the driver without any issues.Quoted 2 lines
One of the reasons this might happen is if the following symbolic link
is broken.
Quoted 4 lines
drivers/staging/ath6kl/include/common/AR6002/hw2.0/hwThe link should point to
drivers/staging/ath6kl/include/common/AR6002/hw2.0/hw.0I applied the patch and the symlink "should" be there, but in general, we shouldn't rely on a symlink in the kernel tree to work properly.
Can you send me a patch to fix this up so it works without a symlink?
thanks,
greg k-h
Re: linux-next: Tree for September 3 (ar6k)
In reply to Randy DunlapQuoted 11 lines · Randy Dunlap
Quoted 3 lines · On Fri, 3 Sep 2010 13:52:06 +1000 Stephen Rothwell wrote:
Hi all,
Changes since 20100902:
drivers/staging/ath6kl/htc2/AR6000/ar6k.c:29:43: error:AR6002/hw2.0/hw/mbox_host_reg.h: No such file or directorywhich leads to lots of these (this is just a sample):
Quoted 10 lines
drivers/staging/ath6kl/htc2/AR6000/ar6k.c:227: error: implicit declaration of function 'INT_STATUS_ENABLE_ERROR_SET'drivers/staging/ath6kl/htc2/AR6000/ar6k.c:228: error: implicit declaration of function 'INT_STATUS_ENABLE_CPU_SET'drivers/staging/ath6kl/htc2/AR6000/ar6k.c:229: error: implicit declaration of function 'INT_STATUS_ENABLE_COUNTER_SET'drivers/staging/ath6kl/htc2/AR6000/ar6k.c:232: error: implicit declaration of function 'INT_STATUS_ENABLE_MBOX_DATA_SET'drivers/staging/ath6kl/htc2/AR6000/ar6k.c:245: error: implicit declaration of function 'CPU_INT_STATUS_ENABLE_BIT_SET'drivers/staging/ath6kl/htc2/AR6000/ar6k.c:249: error: implicit declaration of function 'ERROR_STATUS_ENABLE_RX_UNDERFLOW_SET'drivers/staging/ath6kl/htc2/AR6000/ar6k.c:250: error: implicit declaration of function 'ERROR_STATUS_ENABLE_TX_OVERFLOW_SET'drivers/staging/ath6kl/htc2/AR6000/ar6k.c:254: error: implicit declaration of function 'COUNTER_INT_STATUS_ENABLE_BIT_SET'drivers/staging/ath6kl/htc2/AR6000/ar6k.c:263: error: 'INT_STATUS_ENABLE_ADDRESS' undeclared (first use in this function)drivers/staging/ath6kl/htc2/AR6000/ar6k.c:296: error: 'INT_STATUS_ENABLE_ADDRESS' undeclared (first use in this function)
Vipin, can you please take care of this?
thanks,
greg k-h