linux-next: Tree for June 19
Subsystems (3)
Hi all,
Changes since 20090618:
My fixes tree contains this one commit:
kallsyms: fix inverted valid symbol checking (hopefully this will
make arm configs build reliably again).
This tree fails to build for powerpc allyesconfig.
Linus' tree gained a build failure due to a compiler bug. I have reverted a commit.
The ext4 tree lost its build failure.
The acpi tree lost its conflicts and build failure.
The slab tree gained a build failure due to a change in Linus' tree. I have applied a patch.
The md tree lost its conflicts.
----------------------------------------------------------------------------
I have created today's linux-next tree atgit://git.kernel.org/pub/scm/linux/kernel/git/sfr/linux-next.git
(patches at
http://www.kernel.org/pub/linux/kernel/people/sfr/linux-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) 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 128 trees (counting Linus' and 19 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 · 162 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/master Merging quilt/driver-core.current Merging quilt/usb.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 dwmw2/master Merging arm/devel 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 CONFLICT (add/add): Merge conflict in arch/mips/cavium-octeon/executive/cvmx-helper-errata.c CONFLICT (content): Merge conflict in arch/mips/mm/tlbex.c CONFLICT (content): Merge conflict in arch/mips/sibyte/swarm/setup.c CONFLICT (content): Merge conflict in drivers/char/hw_random/Kconfig CONFLICT (content): Merge conflict in drivers/char/hw_random/Makefile Merging parisc/master Merging powerpc/next Merging 4xx/next Merging galak/next Merging pxa/for-next Merging s390/features Merging sh/master Merging sparc/master Merging xtensa/master Merging cifs/master Merging configfs/linux-next CONFLICT (content): Merge conflict in fs/configfs/dir.c Merging ext4/next Merging fatfs/master Merging fuse/for-next Merging gfs2/master Merging jfs/next Merging nfs/linux-next Merging nfsd/nfsd-next Merging nilfs2/for-next Merging ocfs2/linux-next Merging squashfs/master Merging v9fs/for-next CONFLICT (content): Merge conflict in net/9p/protocol.c Merging ubifs/linux-next Merging xfs/master Merging reiserfs-bkl/reiserfs/kill-bkl-rc6 CONFLICT (content): Merge conflict in fs/reiserfs/super.c Merging vfs/for-next Merging pci/linux-next Merging hid/for-next Merging quilt/i2c Merging quilt/jdelvare-hwmon Merging quilt/kernel-doc Merging v4l-dvb/master Merging quota/for_next Merging kbuild/master Merging ide/for-next Merging libata/NEXT Merging infiniband/for-next Merging acpi/test Merging ieee1394/for-next Merging ubi/linux-next Merging kvm/master $ git reset --hard HEAD^ Merging refs/next/20090617/kvm CONFLICT (content): Merge conflict in arch/x86/include/asm/mce.h Applying: kvm/powerpc: make 32 bit constant unsigned long Merging dlm/next Merging scsi/master Merging async_tx/next Merging udf/for_next Merging net/master Merging wireless/master CONFLICT (content): Merge conflict in drivers/platform/x86/eeepc-laptop.c Merging mtd/master Merging crypto/master Merging sound/for-next Merging cpufreq/next Merging quilt/rr CONFLICT (content): Merge conflict in arch/sh/include/asm/smp.h CONFLICT (content): Merge conflict in drivers/net/sfc/efx.c Merging mmc/next Merging input/next Merging bkl-removal/bkl-removal 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 CONFLICT (content): Merge conflict in mm/Makefile Applying: slqb: fix for macro name change Merging uclinux/for-next Merging md/for-next Merging mfd/for-next Merging hdlc/hdlc-next Merging drm/drm-next Merging voltage/for-next Merging security-testing/next Merging lblnet/master Merging quilt/ttydev Merging agp/agp-next Merging uwb/for-upstream Merging watchdog/master CONFLICT (content): Merge conflict in drivers/watchdog/Makefile Merging bdev/master Merging dwmw2-iommu/master CONFLICT (content): Merge conflict in drivers/pci/intel-iommu.c CONFLICT (content): Merge conflict in drivers/pci/intr_remapping.c Merging cputime/cputime Merging osd/linux-next Merging jc_docs/docs-next Merging nommu/master Merging trivial/for-next Merging audit/for-next Merging omap/for-next Merging quilt/aoe Merging suspend/linux-next Merging bluetooth/master Merging edac-amd/for-next Merging fsnotify/for-next Merging irda/for-next Merging tip/auto-latest Merging asm-generic/next Merging quilt/driver-core CONFLICT (rename/modify): Merge conflict in drivers/net/wireless/ath/ath5k/Kconfig CONFLICT (content): Merge conflict in drivers/block/ps3disk.c CONFLICT (content): Merge conflict in drivers/block/ps3vram.c CONFLICT (content): Merge conflict in drivers/scsi/lpfc/lpfc_debugfs.c CONFLICT (content): Merge conflict in kernel/trace/trace.c CONFLICT (content): Merge conflict in scripts/tracing/draw_functrace.py Merging quilt/usb Merging quilt/staging CONFLICT (content): Merge conflict in drivers/staging/Makefile CONFLICT (add/add): Merge conflict in drivers/staging/octeon/Kconfig Merging scsi-post-merge/master [master d6355d0] Revert "fbdev: move logo externs to header file"
Stephen Rothwell [Fri, Jun 19, 2009 at 05:26:22PM +1000]:
Quoted 3 lines
Hi all,
Changes since 20090618:
This one stops my boot process, when trying to startup uml-utilities. 2.6.30-07040-g0732f87 (linus) works.
amd64, config attached.
Nico
Signature · 3 lines
Currently moving *.schottelius.org to http://www.nico.schottelius.org/ ... PGP: BFE4 C736 ABE5 406F 8F42 F7CF B8BE F92A 9885 188C
PATCH 1/1 dm: dm-log-userspace depends on NET
In reply to Stephen RothwellFrom: Randy Dunlap <[email protected]>
DM_LOG_USERSPACE selects CONNECTOR, but when NET is not enabled, this is useless and the build fails, so make DM_LOG_USERSPACE depend on NET.
ERROR: "netlink_has_listeners" [drivers/connector/cn.ko] undefined!
ERROR: "proc_net_fops_create" [drivers/connector/cn.ko] undefined!
ERROR: "netlink_kernel_create" [drivers/connector/cn.ko] undefined!
ERROR: "proc_net_remove" [drivers/connector/cn.ko] undefined!
ERROR: "netlink_kernel_release" [drivers/connector/cn.ko] undefined!
ERROR: "init_net" [drivers/connector/cn.ko] undefined!
ERROR: "__alloc_skb" [drivers/connector/cn.ko] undefined!
ERROR: "netlink_broadcast" [drivers/connector/cn.ko] undefined!
ERROR: "kfree_skb" [drivers/connector/cn.ko] undefined!
ERROR: "skb_put" [drivers/connector/cn.ko] undefined!
--- drivers/md/Kconfig | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/md/Kconfig +1 -1
@@ -233,7 +233,7 @@ config DM_MIRROR config DM_LOG_USERSPACE tristate "Mirror userspace logging (EXPERIMENTAL)" - depends on DM_MIRROR && EXPERIMENTAL + depends on DM_MIRROR && EXPERIMENTAL && NET select CONNECTOR ---help--- The userspace logging module provides a mechanism for
Signature · 3 lines
~Randy LPC 2009, Sept. 23-25, Portland, Oregon http://linuxplumbersconf.org/2009/
Re: [dm-devel] [PATCH -next] dm: dm-log-userspace depends on NET
Thanks, I've pulled this into my patch.
brassow
Quoted 46 lines · Randy Dunlap
From: Randy Dunlap <[email protected]>
DM_LOG_USERSPACEselects CONNECTOR, but when NET is not enabled, this is useless and the build fails, so makeDM_LOG_USERSPACEdepend on NET.ERROR: "
netlink_has_listeners" [drivers/connector/cn.ko] undefined!
ERROR: "proc_net_fops_create" [drivers/connector/cn.ko] undefined!
ERROR: "netlink_kernel_create" [drivers/connector/cn.ko] undefined!
ERROR: "proc_net_remove" [drivers/connector/cn.ko] undefined!
ERROR: "netlink_kernel_release" [drivers/connector/cn.ko] undefined!
ERROR: "init_net" [drivers/connector/cn.ko] undefined!
ERROR: "__alloc_skb" [drivers/connector/cn.ko] undefined!
ERROR: "netlink_broadcast" [drivers/connector/cn.ko] undefined!
ERROR: "kfree_skb" [drivers/connector/cn.ko] undefined!
ERROR: "skb_put" [drivers/connector/cn.ko] undefined!Signed-off-by Randy Dunlap <[email protected]>Cc Jonathan Brassow <[email protected]>---
drivers/md/Kconfig| 2 +-1 file changed, 1 insertion(+), 1 deletion(-)drivers/md/Kconfig +0
-0@@ -233,7 +233,7 @@ config DM_MIRRORconfig
DM_LOG_USERSPACE
tristate "Mirror userspace logging (EXPERIMENTAL)"drivers/md/Kconfig +1
-1- depends on DM_MIRROR && EXPERIMENTAL + depends on DM_MIRROR && EXPERIMENTAL && NETselect CONNECTOR ---help--- The userspace logging module provides a mechanism forSignature · 8 lines
~Randy LPC 2009, Sept. 23-25, Portland, Oregon http://linuxplumbersconf.org/2009/ -- dm-devel mailing list [email protected] https://www.redhat.com/mailman/listinfo/dm-devel
PATCH 1/1 dm: fix dm-log-userspace printk format
In reply to Stephen RothwellFrom: Randy Dunlap <[email protected]>
Fix printk format warning:
drivers/md/dm-log-userspace-transfer.c:110: warning: format '%lu' expects type 'long unsigned int', but argument 4 has type 'size_t'
--- drivers/md/dm-log-userspace-transfer.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/md/dm-log-userspace-transfer.c +1 -1
@@ -108,7 +108,7 @@ static int fill_pkg(struct cn_msg *msg, *(pkg->data_size) =0 ; }else if (tfr->data_size > *(pkg->data_size)) {DMERR ("Insufficient space to receive package [%u] " -"(%u vs %lu)" , tfr->request_type, +"(%u vs %zu)" , tfr->request_type, tfr->data_size, *(pkg->data_size)); *(pkg->data_size) =0 ;
Signature · 3 lines
~Randy LPC 2009, Sept. 23-25, Portland, Oregon http://linuxplumbersconf.org/2009/
Re: [dm-devel] [PATCH -next] dm: fix dm-log-userspace printk format
thanks, I've pulled this into my patch as well.
brassow
Quoted 35 lines · Randy Dunlap
From: Randy Dunlap <[email protected]>
Fix printk format warning:
drivers/md/dm-log-userspace-transfer.c:110: warning: format '%lu' expects type 'long unsigned int', but argument 4 has type 'size_t'Signed-off-by Randy Dunlap <[email protected]>Cc Jonathan Brassow <[email protected]>---
drivers/md/dm-log-userspace-transfer.c| 2 +-1 file changed, 1 insertion(+), 1 deletion(-)drivers/md/dm-log-userspace-transfer.c +1
-1@@ -108,7 +108,7 @@ static int fill_pkg(struct cn_msg *msg, *(pkg->data_size) =0 ; }else if (tfr->data_size > *(pkg->data_size)) {DMERR ("Insufficient space to receive package [%u] " -"(%u vs %lu)" , tfr->request_type, +"(%u vs %zu)" , tfr->request_type, tfr->data_size, *(pkg->data_size)); *(pkg->data_size) =0 ;Signature · 9 lines
-- ~Randy LPC 2009, Sept. 23-25, Portland, Oregon http://linuxplumbersconf.org/2009/ -- dm-devel mailing list [email protected] https://www.redhat.com/mailman/listinfo/dm-devel
Stephen,
Please add the Simple Firmware Interface "sfi-test" branch to linux-next:
git://git.kernel.org/pub/scm/linux/kernel/git/lenb/linux-sfi-2.6.git sfi-test
A description of the project is on the SFI home page: http://simplefirmware.org/
Note: like ACPI's test branch, this branch will be occasionally re-based as the patches in it evolve.
thanks,
Len Brown, Intel Open Source Technology Center
Hi Len,
Quoted 4 lines · On Sat, 20 Jun 2009 00:16:49 -0400 (EDT) Len Brown <[email protected]> wrote:
Please add the Simple Firmware Interface "sfi-test" branch to linux-next:
git://git.kernel.org/pub/scm/linux/kernel/git/lenb/linux-sfi-2.6.gitsfi-test
Is this 2.6.31 or 32 material?
Quoted 4 lines
A description of the project is on the SFI home page: http://simplefirmware.org/
Note: like ACPI's test branch, this branch will be occasionally re-based as the patches in it evolve.
That's fine.
Should I put just you as the contact, or add the mailing list as well?
What I tell everyone: all patches/commits in the tree/series must have been:
posted to a relevant mailing list
reviewed
unit tested
destined for the next merge window (or the current release)
*before* they are included. The linux-next tree is for integration testing and to lower the impact of conflicts between subsystems in the next merge window.
Basically, this should be just what you would send to Linus (or ask him to fetch). It is allowed to be rebased if you deem it necessary.
Signature · 3 lines
Cheers, Stephen Rothwell [email protected] http://www.canb.auug.org.au/~sfr/
Hi guys,
Quoted 10 lines · On Sat, 20 Jun 2009 15:04:33 +1000 Stephen Rothwell <[email protected]>…
Quoted 4 lines · On Sat, 20 Jun 2009 00:16:49 -0400 (EDT) Len Brown <[email protected]> wrote:
Please add the Simple Firmware Interface "sfi-test" branch to linux-next:
git://git.kernel.org/pub/scm/linux/kernel/git/lenb/linux-sfi-2.6.gitsfi-testIs this 2.6.31 or 32 material?
Quoted 1 line
A description of the project is on the SFI home page: http://simplefirmware.org/
Just so you know (since it seems to mostly affect x86) that this will be entering linux-next either Monday or after -rc1 depending on whether it is 2.6.31 or 2.6.32 material.
Signature · 3 lines
Cheers, Stephen Rothwell [email protected] http://www.canb.auug.org.au/~sfr/
Quoted 7 lines · On Sat, 20 Jun 2009 00:16:49 -0400 (EDT) Len Brown <[email protected]> wrote:
Quoted 4 lines
Please add the Simple Firmware Interface "sfi-test" branch to linux-next:
git://git.kernel.org/pub/scm/linux/kernel/git/lenb/linux-sfi-2.6.gitsfi-testIs this 2.6.31 or 32 material?
yes:-)
Most that is in in sfi-test at this moment I hope to catch .31. There will be much more in .32 -- mostly things that depend on the first batch...
Quoted 8 lines
Quoted 4 lines
A description of the project is on the SFI home page: http://simplefirmware.org/
Note: like ACPI's test branch, this branch will be occasionally re-based as the patches in it evolve.
That's fine.
Should I put just you as the contact, or add the mailing list as well?
The mailing list is fine (on cc), and I'm on that. It is redundant to send to both.
Quoted 8 lines
What I tell everyone: all patches/commits in the tree/series must have been:
posted to a relevant mailing list
reviewed
unit tested
destined for the next merge window (or the current release)
Quoted 6 lines
*before* they are included. The linux-next tree is for integration testing and to lower the impact of conflicts between subsystems in the next merge window.
Basically, this should be just what you would send to Linus (or ask him to fetch). It is allowed to be rebased if you deem it necessary.
The patches are tested on the pre-release platform that makes use of them. There have been several internal reviews and re-writes, but since we just got permission to release the patches last week, they've not been publically vetted yet.
The content is quite close to what I plan to propose for upstream, but the format is not. I'll be re-factoring the series into "clean history" and senting them to LKML on Sunday night.
I don't expect much comment on the generic part,
but will want x86 maintainers to buy into the
parts that touch their architecture.
thanks,
-Len Brown, Intel Open Source Technology Center
Hi Len,
Quoted 10 lines · On Sat, 20 Jun 2009 14:27:59 -0400 (EDT) Len Brown <[email protected]> wrote:
Quoted 2 lines · Stephen Rothwell
Is this 2.6.31 or 32 material?
yes:-)
Most that is in in sfi-test at this moment I hope to catch .31. There will be much more in .32 -- mostly things that depend on the first batch...
OK, so then don't add any (more) .32 material into that branch until after Linus' releases 31-rc1, please.
Quoted 4 lines
Quoted 1 line
Should I put just you as the contact, or add the mailing list as well?
The mailing list is fine (on cc), and I'm on that. It is redundant to send to both.
Then please ensure that I can post to that list (I don't want to subscribe obviously).
Quoted 8 lines
Quoted 2 lines
Basically, this should be just what you would send to Linus (or ask him to fetch). It is allowed to be rebased if you deem it necessary.
The patches are tested on the pre-release platform that makes use of them. There have been several internal reviews and re-writes, but since we just got permission to release the patches last week, they've not been publically vetted yet.
Quoted 7 lines
The content is quite close to what I plan to propose for upstream, but the format is not. I'll be re-factoring the series into "clean history" and senting them to LKML on Sunday night.
I don't expect much comment on the generic part,
but will want x86 maintainers to buy into the
parts that touch their architecture.
OK, then I think I need to hear from the x86 maintainers, at least, before we include this.
Signature · 3 lines
Cheers, Stephen Rothwell [email protected] http://www.canb.auug.org.au/~sfr/
Hi All,
Quoted 3 lines · On Mon, 22 Jun 2009 01:54:27 +1000 Stephen Rothwell <[email protected]>…
OK, then I think I need to hear from the x86 maintainers, at least, before we include this.
Ping?
Signature · 3 lines
Cheers, Stephen Rothwell [email protected] http://www.canb.auug.org.au/~sfr/
Quoted 14 lines · Stephen Rothwell
Quoted 14 lines
Quoted 3 lines
Basically, this should be just what you would send to Linus (or ask him to fetch). It is allowed to be rebased if you deem it necessary.
The patches are tested on the pre-release platform that makes use of them. There have been several internal reviews and re-writes, but since we just got permission to release the patches last week, they've not been publically vetted yet.
The content is quite close to what I plan to propose for upstream, but the format is not. I'll be re-factoring the series into "clean history" and senting them to LKML on Sunday night.
Quoted 6 lines
Quoted 3 lines
I don't expect much comment on the generic part, but will want x86 maintainers to buy into the parts that touch their architecture.
OK, then I think I need to hear from the x86 maintainers, at least, before we include this.
Yep, feel free, the SFI bits looked good in principle.
Ingo
Hi Ingo,
Quoted 3 lines · On Mon, 29 Jun 2009 09:14:51 +0200 Ingo Molnar <[email protected]> wrote:
Yep, feel free, the SFI bits looked good in principle.
OK, thanks, I will add the tree tomorrow.
Signature · 3 lines
Cheers, Stephen Rothwell [email protected] http://www.canb.auug.org.au/~sfr/
Quoted 6 lines
Quoted 6 lines
Quoted 4 lines
git://git.kernel.org/pub/scm/linux/kernel/git/lenb/linux-sfi-2.6.gitsfi-testA description of the project is on the SFI home page:
http://simplefirmware.org/Is this 2.6.31 or 32 material?
Hi Stephen,
On second though, I'll wait for 2.6.32 merge window to push upstream.
So go ahead and delay pulling sfi-test until after 2.6.31-rc1 is declared.
thanks,
-Len Brown, Intel Open Source Technology Center
Hi Len,
Quoted 4 lines · On Tue, 23 Jun 2009 02:34:07 -0400 (EDT) Len Brown <[email protected]> wrote:
On second though, I'll wait for 2.6.32 merge window to push upstream.
So go ahead and delay pulling sfi-test until after 2.6.31-rc1 is declared.
OK, queued.
Signature · 3 lines
Cheers, Stephen Rothwell [email protected] http://www.canb.auug.org.au/~sfr/