From mboxrd@z Thu Jan 1 00:00:00 1970 From: akpm@linux-foundation.org Subject: + net-9p-fix-build-error.patch added to -mm tree Date: Wed, 12 Nov 2008 14:54:27 -0800 Message-ID: <200811122254.mACMsRYL005758@imap1.linux-foundation.org> Reply-To: linux-kernel@vger.kernel.org Return-path: Received: from smtp1.linux-foundation.org ([140.211.169.13]:57008 "EHLO smtp1.linux-foundation.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1753620AbYKLWyp (ORCPT ); Wed, 12 Nov 2008 17:54:45 -0500 Sender: mm-commits-owner@vger.kernel.org List-Id: mm-commits@vger.kernel.org To: mm-commits@vger.kernel.org Cc: randy.dunlap@oracle.com, ericvh@hera.kernel.org, tom@opengridcomputing.com The patch titled net/9p: fix build error has been added to the -mm tree. Its filename is net-9p-fix-build-error.patch Before you just go and hit "reply", please: a) Consider who else should be cc'ed b) Prefer to cc a suitable mailing list as well c) Ideally: find the original patch on the mailing list and do a reply-to-all to that, adding suitable additional cc's *** Remember to use Documentation/SubmitChecklist when testing your code *** See http://userweb.kernel.org/~akpm/stuff/added-to-mm.txt to find out what to do about this The current -mm tree may be found at http://userweb.kernel.org/~akpm/mmotm/ ------------------------------------------------------ Subject: net/9p: fix build error From: Randy Dunlap linux-next: Make 9p's RDMA option depend on INET since it uses Infiniband rdma_* functions and that code depends on INET. Otherwise 9p can try to use symbols which don't exist. 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! I used an if/endif block so that the menu items would remain presented together. Also correct an article adjective. Signed-off-by: Randy Dunlap Cc: Eric Van Hensbergen Cc: Tom Tucker Signed-off-by: Andrew Morton --- net/9p/Kconfig | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff -puN net/9p/Kconfig~net-9p-fix-build-error net/9p/Kconfig --- a/net/9p/Kconfig~net-9p-fix-build-error +++ a/net/9p/Kconfig @@ -13,22 +13,24 @@ menuconfig NET_9P If unsure, say N. +if NET_9P + config NET_9P_VIRTIO - depends on NET_9P && EXPERIMENTAL && VIRTIO + depends on EXPERIMENTAL && VIRTIO tristate "9P Virtio Transport (Experimental)" help This builds support for a transports between guest partitions and a host partition. config NET_9P_RDMA - depends on NET_9P && INFINIBAND && EXPERIMENTAL + depends on INET && INFINIBAND && EXPERIMENTAL tristate "9P RDMA Transport (Experimental)" help - This builds support for a RDMA transport. + This builds support for an RDMA transport. config NET_9P_DEBUG bool "Debug information" - depends on NET_9P help Say Y if you want the 9P subsystem to log debug information. +endif _ Patches currently in -mm which might be from randy.dunlap@oracle.com are origin.patch doc-add-printk-formatstxt.patch doc-update-xip-method-info.patch linux-next.patch kgdb-fix-kernel-doc-error.patch arm-fix-kernel-doc-syntax.patch audit-remove-excess-kernel-doc.patch genksyms-track-symbol-checksum-changes.patch genksyms-allow-to-ignore-symbol-checksum-changes.patch mtd-remove-excess-kernel-doc-notation.patch e1000e-make-e1000e-default-to-the-same-kconfig-setting-as-e1000.patch gdth-fix-section-mismatch-warnings.patch esp-fix-section-mismatch-warning.patch fusion-remove-excess-kernel-doc-notation.patch block-remove-excess-kernel-doc.patch drivers-staging-usbip-stub_txc-cleanup-kerneldoc.patch net-9p-fix-build-error.patch fs-ncpfs-getoptc-cleanup-keneldoc.patch max3100-spi-uart-driver-select-serial_core.patch max3100-spi-uart-driver-select-serial_core-fix.patch drivers-message-i2o-iopc-cleanup-kerneldoc.patch drivers-xen-xenbus-xenbus_clientc-cleanup-kerneldoc.patch fs-ecryptfs-inodec-cleanup-kerneldoc.patch kmod-fix-varargs-kernel-doc.patch docs-document-how-to-write-varargs-in-kernel-doc.patch rapidio-remove-excess-kernel-doc-notation.patch documentation-update-header-file-paths.patch documentation-update-s390-header-file-paths.patch documentation-move-ioctl-numbertxt-to-doc-ioctl.patch documentation-move-msi-howtotxt-to-doc-pci.patch profile-likely-unlikely-macros.patch