linux-next: Tree for July 6
Subsystems (4)
Hi all,
Changes since 20100705:
My fixes tree contains:
kbuild: Fix path to scripts/setlocalversion
The omap tree lost its conflict.
The genesis tree lost its conflict.
The v4l-dvb tree gained a conflict against Linus' tree.
The block tree gained a conflict against the rr tree.
The device-mapper tree gained a conflict against the block tree.
The trivial tree gained a conflict against the v4l-dvb tree.
The usb tree gained a conflict against the v4l-dvb tree.
The staging-next tree gained a conflict against the v4l-dvb tree.
----------------------------------------------------------------------------
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 164 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 · 199 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 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 CONFLICT (content): Merge conflict in drivers/serial/mpc52xx_uart.c Merging galak/next Merging s390/features Merging sh/master Merging genesis/master Merging sparc/master Merging tile/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 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 squashfs/master Merging udf/for_next Merging v9fs/for-next Merging ubifs/linux-next Merging xfs/master Merging vfs/for-next CONFLICT (content): Merge conflict in fs/nilfs2/super.c CONFLICT (content): Merge conflict in fs/xfs/linux-2.6/xfs_super.c Applying: v9fs: fixup for inode_setattr being removed Applying: xfs: update tracing for clear_inode to evit_inode transition 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 CONFLICT (content): Merge conflict in drivers/staging/tm6000/tm6000-alsa.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 ibft/master Merging swiotlb/master Merging scsi/master Merging async_tx/next Merging net/master Merging wireless/master Merging mtd/master Merging crypto/master Merging sound/for-next CONFLICT (content): Merge conflict in Documentation/kernel-parameters.txt Merging cpufreq/next Merging quilt/rr CONFLICT (content): Merge conflict in kernel/module.c Merging input/next Merging lsm/for-next Merging block/for-next CONFLICT (content): Merge conflict in drivers/block/virtio_blk.c Merging quilt/device-mapper CONFLICT (content): Merge conflict in drivers/md/dm.c Applying: device-mapper: fix for bio API change 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 CONFLICT (delete/modify): drivers/media/video/ov511.c deleted in HEAD and modified in trivial/for-next. Version trivial/for-next of drivers/media/video/ov511.c left in tree. $ git rm -f drivers/media/video/ov511.c 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 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 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 drivers-x86/linux-next Merging hwpoison/hwpoison CONFLICT (content): Merge conflict in mm/memory-failure.c 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 CONFLICT (content): Merge conflict in drivers/media/video/uvc/uvcvideo.h CONFLICT (content): Merge conflict in include/linux/usb/video.h Merging staging-next/staging-next CONFLICT (content): Merge conflict in drivers/staging/batman-adv/bat_sysfs.c CONFLICT (delete/modify): drivers/staging/batman-adv/device.c deleted in staging-next/staging-next and modified in HEAD. Version HEAD of drivers/staging/batman-adv/device.c left in tree. CONFLICT (delete/modify): drivers/staging/cx25821/cx25821-audups11.c deleted in HEAD and modified in staging-next/staging-next. Version staging-next/staging-next of drivers/staging/cx25821/cx25821-audups11.c left in tree. $ git rm -f drivers/staging/batman-adv/device.c $ git rm -f drivers/staging/cx25821/cx25821-audups11.c Merging slabh/slabh Merging scsi-post-merge/master
Re: linux-next: Tree for July 6 (NET_DSA + PHYLIB kconfig)
Quoted 8 lines · On Tue, 6 Jul 2010 19:05:19 +1000 Stephen Rothwell wrote:
Hi all,
Changes since 20100705:
My fixes tree contains:
kbuild: Fix path toscripts/setlocalversion----------------------------------------------------------------------------
kconfig now detects symbol dependency errors and warns about them. E.g.:
warning: (NET_DSA && NET && EXPERIMENTAL && !S390 || MACB && NETDEVICES && NET_ETHERNET && (AVR32 || ARCH_AT91SAM9260 || ARCH_AT91SAM9263 || ARCH_AT91SAM9G20 || ARCH_AT91SAM9G45 || ARCH_AT91CAP9) || IXP4XX_ETH && NETDEVICES && NET_ETHERNET && ARM && ARCH_IXP4XX && IXP4XX_NPE && IXP4XX_QMGR || W90P910_ETH && NETDEVICES && NET_ETHERNET && ARM && ARCH_W90X900 || MIPS_AU1X00_ENET && NETDEVICES && NET_ETHERNET && SOC_AU1X00 || SH_ETH && NETDEVICES && NET_ETHERNET && SUPERH && (CPU_SUBTYPE_SH7710 {{20 lines deleted}} selects PHYLIB which has unmet direct dependencies (!S390 && NET_ETHERNET)
says that NET_DSA & PHYLIB have some kind of problem.NET_DSA selects PHYLIB. PHYLIB depends on NET_ETHERNET, which is not enabled in this randconfig. net/dsa code does need PHYLIB code, so PHYLIB symbol should either drop "depends on NET_ETHERNET" or it should be changed to
depends on NET_ETHERNET || NET_DSA
Preference?
---
~Randy
*** Remember to use Documentation/SubmitChecklist when testing your code ***
David Miller
maintainerRe: linux-next: Tree for July 6 (NET_DSA + PHYLIB kconfig)
From: Randy Dunlap <[email protected]>
Date: Tue, 6 Jul 2010 10:34:17 -0700
Quoted 6 lines
NET_DSAselects PHYLIB. PHYLIB depends onNET_ETHERNET, which is not enabled in this randconfig. net/dsa code does need PHYLIB code, so PHYLIB symbol should either drop "depends onNET_ETHERNET" or it should be changed todepends on NET_ETHERNET || NET_DSAPreference?
The situations seems to suggest NET_DSA depends upon NET_ETHERNET, so adding NET_ETHERNET to NET_DSA's dependencies probably works better.
PATCH 1/1 net: NET_DSA depends on NET_ETHERNET
From: Randy Dunlap <[email protected]>
NET_DSA code selects and uses PHYLIB code, but PHYLIB depends on NET_ETHERNET. However, "select" does not follow kconfig dependencies, so explicitly list that requirement here instead.
Fixes this kconfig warning:
warning: (NET_DSA && NET && EXPERIMENTAL && !S390 ...) selects PHYLIB which has unmet direct dependencies (!S390 && NET_ETHERNET)
--- net/dsa/Kconfig | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
Is there some reason that NET_DSA is bool instead of tristate? I.e., net/dsa/ code cannot be built as loadable modules?
net/dsa/Kconfig +1 -1
@@ -1,7 +1,7 @@ menuconfig NET_DSA bool "Distributed Switch Architecture support" default n - depends on EXPERIMENTAL && !S390 + depends on EXPERIMENTAL && !S390 && NET_ETHERNET select PHYLIB ---help--- This allows you to use hardware switch chips that use
David Miller
maintainerRe: [PATCH -next] net: NET_DSA depends on NET_ETHERNET
From: Randy Dunlap <[email protected]>
Date: Tue, 20 Jul 2010 16:03:32 -0700
Quoted 11 lines
From: Randy Dunlap <[email protected]>
NET_DSAcode selects and uses PHYLIB code, but PHYLIB depends onNET_ETHERNET. However, "select" does not follow kconfig dependencies, so explicitly list that requirement here instead.Fixes this kconfig warning:
warning: (
NET_DSA&& NET && EXPERIMENTAL && !S390 ...) selects PHYLIB which has unmet direct dependencies (!S390 &&NET_ETHERNET)Signed-off-by Randy Dunlap <[email protected]>
Randy, this has been fixed in net-2.6 for some time now.
And I'm pretty sure I sent a copy of this to you when I checked it in :-)
--------------------
Quoted 1 line
From
336a283b9cbe47748ccd68fd8c5158f67cee644bMon Sep 17 00:00:00 2001
From: David S. Miller <[email protected]>
Date: Mon, 12 Jul 2010 20:03:42 -0700
Subject: [PATCH 09/24] dsa: Fix Kconfig dependencies.
Based upon a report by Randy Dunlap.
DSA needs PHYLIB, but PHYLIB needs NET_ETHERNET. So, in order to select PHYLIB we have to make DSA depend upon NET_ETHERNET.
--- net/dsa/Kconfig | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-)
net/dsa/Kconfig +1 -1
@@ -1,7 +1,7 @@ menuconfig NET_DSA bool "Distributed Switch Architecture support" default n - depends on EXPERIMENTAL && !S390 + depends on EXPERIMENTAL && NET_ETHERNET && !S390 select PHYLIB ---help--- This allows you to use hardware switch chips that use
Signature · 1 line
1.7.1.1
Re: [PATCH -next] net: NET_DSA depends on NET_ETHERNET
Quoted 9 lines · David Miller
From: Randy Dunlap <[email protected]>
Date: Tue, 20 Jul 2010 16:03:32 -0700Quoted 6 lines
From: Randy Dunlap <[email protected]>
NET_DSAcode selects and uses PHYLIB code, but PHYLIB depends onNET_ETHERNET. However, "select" does not follow kconfig dependencies, so explicitly list that requirement here instead.
Quoted 7 lines
Quoted 5 lines
Fixes this kconfig warning:
warning: (
NET_DSA&& NET && EXPERIMENTAL && !S390 ...) selects PHYLIB which has unmet direct dependencies (!S390 &&NET_ETHERNET)Signed-off-by Randy Dunlap <[email protected]>Randy, this has been fixed in net-2.6 for some time now.
OK, I did see the commit get merged today.
Quoted 2 lines
And I'm pretty sure I sent a copy of this to you when I checked it in :-)
I missed it somehow. Thanks.
Quoted 29 lines
--------------------
From336a283b9cbe47748ccd68fd8c5158f67cee644bMon Sep 17 00:00:00 2001
From: David S. Miller <[email protected]>
Date: Mon, 12 Jul 2010 20:03:42 -0700
Subject: [PATCH 09/24] dsa: FixKconfigdependencies.Based upon a report by Randy Dunlap.
DSA needs PHYLIB, but PHYLIB needs
NET_ETHERNET. So, in order to select PHYLIB we have to make DSA depend uponNET_ETHERNET.Signed-off-by David S. Miller <[email protected]>--- net/dsa/Kconfig | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-)net/dsa/Kconfig +1
-1@@ -1,7 +1,7 @@ menuconfig NET_DSA bool "Distributed Switch Architecture support" default n - depends on EXPERIMENTAL && !S390 + depends on EXPERIMENTAL && NET_ETHERNET && !S390 select PHYLIB ---help--- This allows you to use hardware switch chips that use
Signature · 2 lines
~Randy *** Remember to use Documentation/SubmitChecklist when testing your code ***