linux-next: Tree for July 12
Subsystems (2)
Hi all,
Changes since 20100709:
The vfs tree gained a build failure for which I applied a merge fix patch.
The v4l-dvb tree lost its conflict.
The infiniband tree lost its build failure.
The block tree lost its build failure and all but one conflict.
The trivial tree lost its conflict.
----------------------------------------------------------------------------
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 · 214 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 CONFLICT (content): Merge conflict in arch/arm/mach-omap2/board-3430sdp.c CONFLICT (content): Merge conflict in arch/arm/mach-omap2/board-3630sdp.c CONFLICT (content): Merge conflict in arch/arm/mach-omap2/board-am3517evm.c CONFLICT (content): Merge conflict in arch/arm/mach-omap2/board-cm-t35.c CONFLICT (content): Merge conflict in arch/arm/mach-omap2/board-devkit8000.c CONFLICT (content): Merge conflict in arch/arm/mach-omap2/board-igep0020.c CONFLICT (content): Merge conflict in arch/arm/mach-omap2/board-ldp.c CONFLICT (content): Merge conflict in arch/arm/mach-omap2/board-omap3beagle.c CONFLICT (content): Merge conflict in arch/arm/mach-omap2/board-omap3evm.c CONFLICT (content): Merge conflict in arch/arm/mach-omap2/board-omap3pandora.c CONFLICT (content): Merge conflict in arch/arm/mach-omap2/board-omap3touchbook.c CONFLICT (content): Merge conflict in arch/arm/mach-omap2/board-overo.c CONFLICT (content): Merge conflict in arch/arm/mach-omap2/board-zoom2.c CONFLICT (content): Merge conflict in arch/arm/mach-omap2/board-zoom3.c 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 Applying: nilfs2: inode.c needs to include btnode.h directly now Merging pci/linux-next Merging hid/for-next Merging quilt/i2c CONFLICT (content): Merge conflict in drivers/i2c/i2c-core.c 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 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 CONFLICT (content): Merge conflict in drivers/net/wireless/wl12xx/wl1271_cmd.h 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 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 CONFLICT (content): Merge conflict in include/linux/serial_core.h 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/cx25821/cx25821-audups11.c $ git rm -f drivers/staging/batman-adv/device.c Merging slabh/slabh Merging scsi-post-merge/master
Re: linux-next: Tree for July 12 (debugfs/sysfs/rcu)
Quoted 3 lines · On Mon, 12 Jul 2010 15:51:09 +1000 Stephen Rothwell wrote:
Hi all,
Changes since 20100709:
Greg,
What is there about debugfs that requires sysfs?
(lib/Kconfig.debug:)
config DEBUG_FS
bool "Debug Filesystem"
depends on SYSFS
I ask because kconfig now (in linux-next) warns about kconfig dependency problems, like this one:
warning: (TREE_RCU_TRACE || AMD_IOMMU_STATS && AMD_IOMMU || MTD_UBI_DEBUG && MTD && SYSFS && MTD_UBI || UBIFS_FS_DEBUG && MISC_FILESYSTEMS && UBIFS_FS || DEBUG_KMEMLEAK && DEBUG_KERNEL && EXPERIMENTAL && !MEMORY_HOTPLUG && (X86 || ARM || PPC || S390 || SPARC64 || SUPERH || MICROBLAZE) && SYSFS || TRACING || X86_PTDUMP && DEBUG_KERNEL || BLK_DEV_IO_TRACE && TRACING_SUPPORT && FTRACE && SYSFS && BLOCK) selects DEBUG_FS which has unmet direct dependencies (SYSFS)
because TREE_RCU_TRACE selects DEBUG_FS, even when SYSFS is not enabled. I first made a patch to have TREE_RCU_TRACE depend on SYSFS, but then I just removed the DEBUG_FS "depends on SYSFS" and the kernel builds fine, hence the first question.
thanks,
---
~Randy
*** Remember to use Documentation/SubmitChecklist when testing your code ***
Re: linux-next: Tree for July 12 (debugfs/sysfs/rcu)
Quoted 8 lines · Randy Dunlap
Quoted 3 lines · On Mon, 12 Jul 2010 15:51:09 +1000 Stephen Rothwell wrote:
Hi all,
Changes since 20100709:
Greg,
What is there about debugfs that requires sysfs?
Look at commit 3348e05a4f25489908d9f7ed4e80ac291ead18f4 almost 5 years ago:
[PATCH] DEBUG_FS must depend on SYSFS
CONFIG_DEBUG_FS=y and CONFIG_SYSFS=n results in the following compile
error:
<-- snip -->
...
LD vmlinux
fs/built-in.o: In function `debugfs_init':
inode.c:(.init.text+0x31be): undefined reference to `kernel_subsys'
make: *** [vmlinux] Error 1
<-- snip -->But, there is no "kernel_subsys" anymore, it is called kernel_kobj, and is in kernel/ksysfs.c and always is built now, even if CONFIG_SYSFS is disabled.
So it should be safe to remove that dependancy if you want to.
thanks,
greg k-h
PATCH 1/1 debugfs: no longer needs to depend on SYSFS
From: Randy Dunlap <[email protected]>
debugfs no longer uses 'kernel_subsys' (which is gone), and other kernel/ksysfs.c code is always built, so DEBUG_FS does not need to depend on SYSFS.
Fixes this kconfig warning:
warning: (TREE_RCU_TRACE || AMD_IOMMU_STATS && AMD_IOMMU || MTD_UBI_DEBUG && MTD && SYSFS && MTD_UBI || UBIFS_FS_DEBUG && MISC_FILESYSTEMS && UBIFS_FS || DEBUG_KMEMLEAK && DEBUG_KERNEL && EXPERIMENTAL && !MEMORY_HOTPLUG && (X86 || ARM || PPC || S390 || SPARC64 || SUPERH || MICROBLAZE) && SYSFS || TRACING || X86_PTDUMP && DEBUG_KERNEL || BLK_DEV_IO_TRACE && TRACING_SUPPORT && FTRACE && SYSFS && BLOCK) selects DEBUG_FS which has unmet direct dependencies (SYSFS)
--- lib/Kconfig.debug | 1 - 1 file changed, 1 deletion(-)
lib/Kconfig.debug +0 -1
@@ -76,7 +76,6 @@ config UNUSED_SYMBOLS config DEBUG_FS bool "Debug Filesystem" - depends on SYSFS help debugfs is a virtual file system that kernel developers use to put debugging files into. Enable this option to be able to read and
[email protected]
Appliedpatch "debugfs: no longer needs to depend on SYSFS" added to gregkh-2.6 tree
This is a note to let you know that I've just added the patch titled
debugfs: no longer needs to depend on SYSFS
to my gregkh-2.6 tree which can be found in directory form at:
http://www.kernel.org/pub/linux/kernel/people/gregkh/gregkh-2.6/patches/
and in git form at:
git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/patches.git
The filename of this patch is:
debugfs-no-longer-needs-to-depend-on-sysfs.patch
The patch will show up in the next release of the linux-next tree (usually sometime within the next 24 hours during the week.)
If this patch meets the merge guidelines for a bugfix, it should be merged into Linus's tree before the next major kernel release. If not, it will be merged into Linus's tree during the next merge window.
Either way, you will probably be copied on the patch when it gets sent to Linus for merging so that others can see what is happening in kernel development.
If you have any questions about this process, please let me know.
Quoted 1 line
From [email protected] Wed Jul 21 13:04:45 2010
Message-ID: <[email protected]>
Date: Tue, 20 Jul 2010 16:04:51 -0700
From: Randy Dunlap <[email protected]>
To: Greg KH <[email protected]>
Cc: Stephen Rothwell <[email protected]>,
[email protected], LKML <[email protected]>
Subject: debugfs: no longer needs to depend on SYSFS
From: Randy Dunlap <[email protected]>
debugfs no longer uses 'kernel_subsys' (which is gone), and other kernel/ksysfs.c code is always built, so DEBUG_FS does not need to depend on SYSFS.
Fixes this kconfig warning:
warning: (TREE_RCU_TRACE || AMD_IOMMU_STATS && AMD_IOMMU || MTD_UBI_DEBUG && MTD && SYSFS && MTD_UBI || UBIFS_FS_DEBUG && MISC_FILESYSTEMS && UBIFS_FS || DEBUG_KMEMLEAK && DEBUG_KERNEL && EXPERIMENTAL && !MEMORY_HOTPLUG && (X86 || ARM || PPC || S390 || SPARC64 || SUPERH || MICROBLAZE) && SYSFS || TRACING || X86_PTDUMP && DEBUG_KERNEL || BLK_DEV_IO_TRACE && TRACING_SUPPORT && FTRACE && SYSFS && BLOCK) selects DEBUG_FS which has unmet direct dependencies (SYSFS)
--- lib/Kconfig.debug | 1 - 1 file changed, 1 deletion(-)
lib/Kconfig.debug +0 -1
@@ -76,7 +76,6 @@ config UNUSED_SYMBOLS config DEBUG_FS bool "Debug Filesystem" - depends on SYSFS help debugfs is a virtual file system that kernel developers use to put debugging files into. Enable this option to be able to read and