linux-next: Tree for January 2
Subsystems (3)
Hi all,
Changes since 20081231:
Removed tree:
boot-params (became 2.6.30 material)
Dropped trees (temporarily):
driver-core (build problem)
usb (depends on driver-core)
kvm (build problem)
rr_cpumask (complex conflict)
rr (depends on rr_cpumask)
semaphore-removal (due to unfixed conflicts against Linus' tree) cpu_alloc (build problem)
audit (difficult conflicts)
staging (depends on usb)
Linus' tree lost its build fix.
The tip-core tree lost its conflict.
The ftrace tree gained a build failure for which I applied a temporary patch.
The timers tree lost its conflict.
The nfsd tree lost its 2 conflicts.
The kvm tree gained a conflict against the x86 tree but still has a build failure and so remains dropped.
The ocfs2 tree lost its conflict.
The rr_cpumask tree gained a conflict against the timers tree and a comples one against the cpus4096 tree and was dropped.
The kmemcheck tree lost its 3 conflicts (but inherited one from another tree).
The cputime tree lost its conflict.
----------------------------------------------------------------------------
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, 44x_defconfig and allyesconfig (minus CONFIG_PROFILE_ALL_BRANCHES) and i386, sparc and sparc64 defconfig.
Below is a summary of the state of the merge.
We are up to 131 trees (counting Linus' and 15 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 · 151 lines
Cheers, Stephen Rothwell [email protected] $ git checkout master $ git reset --hard stable Merging origin/master 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 CONFLICT (content): Merge conflict in drivers/char/tty_audit.c 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 mips/mips-for-linux-next 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 x86/auto-x86-next Merging xtensa/master Merging tip-core/auto-core-next Merging cpus4096/auto-cpus4096-next Merging ftrace/auto-ftrace-next Merging genirq/auto-genirq-next Merging safe-poison-pointers/auto-safe-poison-pointers-next Merging sched/auto-sched-next Merging stackprotector/auto-stackprotector-next Merging timers/auto-timers-next Merging pci/linux-next Merging quilt/device-mapper CONFLICT (content): Merge conflict in drivers/md/dm.c Merging hid/for-next Merging quilt/i2c Merging quilt/jdelvare-hwmon Merging quilt/kernel-doc Merging v4l-dvb/master Merging jfs/next Merging kbuild/master Merging quilt/ide Merging libata/NEXT Merging nfs/linux-next Merging xfs/master Merging infiniband/for-next Merging acpi/test Merging nfsd/nfsd-next Merging ieee1394/for-next Merging ubi/linux-next Merging kvm/master CONFLICT (content): Merge conflict in arch/x86/kernel/reboot.c $ git reset --hard HEAD^ Merging dlm/next Merging scsi/master Merging ocfs2/linux-next Merging ext4/next Merging async_tx/next Applying: net: async_tx merge fix Merging udf/for_next Merging net/master Merging mtd/master CONFLICT (content): Merge conflict in arch/arm/mach-pxa/corgi.c CONFLICT (content): Merge conflict in arch/arm/mach-pxa/poodle.c CONFLICT (content): Merge conflict in arch/arm/mach-pxa/spitz.c Merging wireless/master Merging crypto/master Merging vfs/for-next Merging sound/for-next Merging cpufreq/next Merging v9fs/for-next Merging rr_cpumask/master CONFLICT (content): Merge conflict in arch/x86/kernel/io_apic.c CONFLICT (content): Merge conflict in kernel/rcuclassic.c CONFLICT (content): Merge conflict in kernel/sched.c CONFLICT (content): Merge conflict in kernel/time/tick-common.c $ git reset --hard Merging cifs/master Merging mmc/next Merging gfs2/master Merging input/next Merging semaphore/semaphore Merging bkl-removal/bkl-removal CONFLICT (content): Merge conflict in fs/ioctl.c Merging ubifs/linux-next Merging lsm/for-next Merging block/for-next Merging embedded/master Merging firmware/master CONFLICT (content): Merge conflict in drivers/net/tg3.c CONFLICT (content): Merge conflict in firmware/Makefile CONFLICT (content): Merge conflict in firmware/WHENCE 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 kmemcheck/auto-kmemcheck-next CONFLICT (content): Merge conflict in MAINTAINERS Merging generic-ipi/auto-generic-ipi-next Merging mfd/for-next Merging hdlc/hdlc-next Merging drm/drm-next Merging voltage/for-next Merging security-testing/next Merging lblnet/master CONFLICT (content): Merge conflict in Documentation/feature-removal-schedule.txt Merging quilt/ttydev CONFLICT (content): Merge conflict in fs/devpts/inode.c Merging agp/agp-next Merging oprofile/auto-oprofile-next Merging fastboot/auto-fastboot-next Merging sparseirq/auto-sparseirq-next Merging iommu/auto-iommu-next Merging uwb/for-upstream CONFLICT (content): Merge conflict in drivers/uwb/wlp/eda.c Merging watchdog/master Merging proc/proc Merging bdev/master Merging dwmw2-iommu/master Merging cputime/cputime Merging osd/linux-next Merging fatfs/master Merging fuse/for-next Merging jc_docs/docs-next Merging nommu/master CONFLICT (content): Merge conflict in kernel/fork.c Merging trivial/for-next Applying tracing/kmemtrace: fix for build fix
Quoted 9 lines · Stephen Rothwell
Hi all,
Changes since 20081231:
Removed tree:
boot-params (became 2.6.30 material)Dropped trees (temporarily):
driver-core (build problem)
Can you please tell me what exactly the build problem with the driver-core tree is? Maybe I can fix it.
Thanks,
Rafael
Quoted 5 lines · Rafael J. Wysocki
Quoted 4 lines · Stephen Rothwell
Hi all,
Changes since 20081231:
Quoted 8 lines
Quoted 5 lines
Removed tree:
boot-params (became 2.6.30 material)Dropped trees (temporarily):
driver-core (build problem)Can you please tell me what exactly the build problem with the driver-core tree is? Maybe I can fix it.
Sorry about that, I've now fixed it, and pushed it up to kernel.org. But I think I missed the pull time for this release of linux-next.
thanks,
greg k-h
PATCH 1/1 9p: fix RDMA dependency
In reply to Stephen RothwellFrom: Randy Dunlap <[email protected]>
NET_9P_RDMA uses Infiniband RDMA, which is controlled by the INFINIBAND_ADDR_TRANS kconfig symbol, so fix NET_9P so that it builds cleanly.
Found by inspection (suspicion) and then forced via kconfig.
ERROR: "rdma_destroy_id" [net/9p/9pnet_rdma.ko] undefined!
ERROR: "rdma_connect" [net/9p/9pnet_rdma.ko] undefined!
ERROR: "rdma_create_id" [net/9p/9pnet_rdma.ko] undefined!
ERROR: "rdma_create_qp" [net/9p/9pnet_rdma.ko] undefined!
ERROR: "rdma_resolve_route" [net/9p/9pnet_rdma.ko] undefined!
ERROR: "rdma_disconnect" [net/9p/9pnet_rdma.ko] undefined!
ERROR: "rdma_resolve_addr" [net/9p/9pnet_rdma.ko] undefined!
--- net/9p/Kconfig | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
net/9p/Kconfig +1 -1
@@ -23,7 +23,7 @@ config NET_9P_VIRTIO guest partitions and a host partition. config NET_9P_RDMA - depends on INET && INFINIBAND && EXPERIMENTAL + depends on INET && INFINIBAND_ADDR_TRANS && EXPERIMENTAL tristate "9P RDMA Transport (Experimental)" help This builds support for an RDMA transport.
Signature · 1 line
~Randy
Re: [PATCH -next] 9p: fix RDMA dependency
net/9p/Kconfig config NET_9P_VIRTIO · line 27
Quoted 4 lines
config
NET_9P_RDMAnet/9p/Kconfig +1
-1- depends on INET && INFINIBAND && EXPERIMENTAL + depends on INET && INFINIBAND_ADDR_TRANS && EXPERIMENTAL tristate "9P RDMA Transport (Experimental)"
This actually allows the broken config INFINIBAND=m and NET_9P_RDMA=y. I think the answer is to add INFINIBAND_ADDR_TRANS but leave INFINIBAND too. The SUNRPC_XPRT_RDMA patch would have the same problem, but since SUNRPC_XPRT_RDMA is a hidden option (with help text ?!) that gets set automatically, there's no way to create the problem config.
- R.
PATCH 1/1 sunrpc: fix RDMA dependency
In reply to Stephen RothwellFrom: Randy Dunlap <[email protected]>
SUNRPC_XPRT_RDMA uses Infiniband RDMA support, so make it depend on that kconfig symbol for clean builds.
net/built-in.o: In function `rpcrdma_ep_disconnect':
(.text+0x9c2a8): undefined reference to rdma_disconnect' net/built-in.o: In function rpcrdma_create_id':
verbs.c:(.text+0x9c39f): undefined reference to rdma_create_id' verbs.c:(.text+0x9c3e3): undefined reference to rdma_resolve_addr' verbs.c:(.text+0x9c439): undefined reference to rdma_resolve_route' verbs.c:(.text+0x9c482): undefined reference to rdma_destroy_id' net/built-in.o: In function `rpcrdma_ep_destroy':
(.text+0x9c84d): undefined reference to rdma_destroy_qp' net/built-in.o: In function rpcrdma_ia_close':
(.text+0x9cb44): undefined reference to rdma_destroy_qp' net/built-in.o: In function rpcrdma_ia_close':
(.text+0x9cb4b): undefined reference to rdma_destroy_id' net/built-in.o: In function rpcrdma_ia_open':
(.text+0x9cdb4): undefined reference to rdma_destroy_id' net/built-in.o: In function rpcrdma_ep_connect':
(.text+0x9d2dd): undefined reference to rdma_destroy_id' net/built-in.o: In function rpcrdma_ep_connect':
(.text+0x9d2eb): undefined reference to rdma_destroy_qp' net/built-in.o: In function rpcrdma_ep_connect':
(.text+0x9d2f8): undefined reference to rdma_destroy_id' net/built-in.o: In function rpcrdma_ep_connect':
(.text+0x9d319): undefined reference to rdma_create_qp' net/built-in.o: In function rpcrdma_ep_connect':
(.text+0x9d3e0): undefined reference to rdma_connect' net/built-in.o: In function svc_rdma_detach':
svc_rdma_transport.c:(.text+0x9ddbb): undefined reference to rdma_disconnect' net/built-in.o: In function __svc_rdma_free':
svc_rdma_transport.c:(.text+0x9f041): undefined reference to rdma_destroy_id' net/built-in.o: In function svc_rdma_accept':
svc_rdma_transport.c:(.text+0x9f362): undefined reference to rdma_create_qp' svc_rdma_transport.c:(.text+0x9f388): undefined reference to rdma_create_qp' svc_rdma_transport.c:(.text+0x9f553): undefined reference to rdma_accept' svc_rdma_transport.c:(.text+0x9f682): undefined reference to rdma_destroy_id' net/built-in.o: In function `svc_rdma_create':
svc_rdma_transport.c:(.text+0x9f70e): undefined reference to rdma_create_id' svc_rdma_transport.c:(.text+0x9f739): undefined reference to rdma_bind_addr' svc_rdma_transport.c:(.text+0x9f762): undefined reference to rdma_listen' svc_rdma_transport.c:(.text+0x9f79e): undefined reference to rdma_destroy_id'
cc: J. Bruce Fields <[email protected]> cc: Trond Myklebust <[email protected]> cc: Roland Dreier <[email protected]> --- fs/Kconfig | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
fs/Kconfig +1 -1
@@ -1305,7 +1305,7 @@ config SUNRPC_GSS config SUNRPC_XPRT_RDMA tristate - depends on SUNRPC && INFINIBAND && EXPERIMENTAL + depends on SUNRPC && INFINIBAND_ADDR_TRANS && EXPERIMENTAL default SUNRPC && INFINIBAND help This option enables an RPC client transport capability that
Signature · 1 line
~Randy