From: Jan-Benedict G. <jb...@he...> - 2006-11-03 07:57:34
|
drivers/ata/ahci.c | 8 ++++ drivers/ata/pata_amd.c | 2 + drivers/infiniband/core/addr.c | 28 ++++++++++++++- drivers/infiniband/core/cma.c | 31 +++++++++++----- drivers/infiniband/core/uverbs_cmd.c | 2 - drivers/infiniband/hw/amso1100/c2_alloc.c | 13 +++--- drivers/infiniband/hw/amso1100/c2_cq.c | 18 +++------ drivers/infiniband/hw/amso1100/c2_rnic.c | 56 ++++++++++++------------------ drivers/infiniband/hw/ehca/ehca_tools.h | 1 drivers/infiniband/hw/mthca/mthca_cmd.c | 14 +++---- drivers/infiniband/ulp/iser/iscsi_iser.c | 4 +- fs/cifs/CHANGES | 5 ++ fs/cifs/connect.c | 7 +++ fs/cifs/inode.c | 14 ++++--- fs/cifs/readdir.c | 9 ++++ include/linux/pci_ids.h | 1 include/rdma/ib_addr.h | 20 ++++++++++ include/rdma/ib_user_verbs.h | 2 - 18 files changed, 154 insertions(+), 81 deletions(-) New commits: commit 2de6c39f389f25442389c3ab0f2d9b50e3f4a77d gitweb-commit: http://www.kernel.org/git/?p=linux/kernel/git/jbglaw/vax-linux.git;a=commit;h=2de6c39f389f25442389c3ab0f2d9b50e3f4a77d gitweb-diff: http://www.kernel.org/git/?p=linux/kernel/git/jbglaw/vax-linux.git;a=commitdiff;h=2de6c39f389f25442389c3ab0f2d9b50e3f4a77d Merge: 0b0e0b5f1a22c20c0f127fb9b457136d6c3ca8ed 4fa2eeeac5e13a8579ee45bc172eed690d28fbb7 Author: Linus Torvalds <tor...@g5...> Date: Thu Nov 2 17:23:13 2006 -0800 Merge branch 'upstream-linus' of master.kernel.org:/pub/scm/linux/kernel/git/jgarzik/libata-dev * 'upstream-linus' of master.kernel.org:/pub/scm/linux/kernel/git/jgarzik/libata-dev: pci_ids.h: Add NVIDIA PCI ID commit 0b0e0b5f1a22c20c0f127fb9b457136d6c3ca8ed gitweb-commit: http://www.kernel.org/git/?p=linux/kernel/git/jbglaw/vax-linux.git;a=commit;h=0b0e0b5f1a22c20c0f127fb9b457136d6c3ca8ed gitweb-diff: http://www.kernel.org/git/?p=linux/kernel/git/jbglaw/vax-linux.git;a=commitdiff;h=0b0e0b5f1a22c20c0f127fb9b457136d6c3ca8ed Merge: 895663cd92574367054e0eb604a7428852f359b8 8e87d4dc159148f04f515bc072df22a2c089e7f2 Author: Linus Torvalds <tor...@g5...> Date: Thu Nov 2 17:22:24 2006 -0800 Merge git://git.kernel.org/pub/scm/linux/kernel/git/sfrench/cifs-2.6 * git://git.kernel.org/pub/scm/linux/kernel/git/sfrench/cifs-2.6: [CIFS] report rename failure when target file is locked by Windows [CIFS] Allow null user connections [CIFS] Fix readdir breakage when blocksize set too small commit 4fa2eeeac5e13a8579ee45bc172eed690d28fbb7 gitweb-commit: http://www.kernel.org/git/?p=linux/kernel/git/jbglaw/vax-linux.git;a=commit;h=4fa2eeeac5e13a8579ee45bc172eed690d28fbb7 gitweb-diff: http://www.kernel.org/git/?p=linux/kernel/git/jbglaw/vax-linux.git;a=commitdiff;h=4fa2eeeac5e13a8579ee45bc172eed690d28fbb7 Author: Peer Chen <pc...@nv...> Date: Thu Nov 2 18:55:48 2006 -0500 pci_ids.h: Add NVIDIA PCI ID Signed-off-by: Jeff Garzik <je...@ga...> commit 895663cd92574367054e0eb604a7428852f359b8 gitweb-commit: http://www.kernel.org/git/?p=linux/kernel/git/jbglaw/vax-linux.git;a=commit;h=895663cd92574367054e0eb604a7428852f359b8 gitweb-diff: http://www.kernel.org/git/?p=linux/kernel/git/jbglaw/vax-linux.git;a=commitdiff;h=895663cd92574367054e0eb604a7428852f359b8 Author: Peer Chen <pc...@nv...> Date: Thu Nov 2 17:59:46 2006 -0500 [libata] Add support for AHCI controllers of MCP67. Signed-off-by: Peer Chen <pc...@nv...> Signed-off-by: Jeff Garzik <je...@ga...> commit 05e2867a7bcc76de37e103a97ed48ba6872db797 gitweb-commit: http://www.kernel.org/git/?p=linux/kernel/git/jbglaw/vax-linux.git;a=commit;h=05e2867a7bcc76de37e103a97ed48ba6872db797 gitweb-diff: http://www.kernel.org/git/?p=linux/kernel/git/jbglaw/vax-linux.git;a=commitdiff;h=05e2867a7bcc76de37e103a97ed48ba6872db797 Author: Peer Chen <pc...@nv...> Date: Thu Nov 2 17:58:21 2006 -0500 [libata] Add support for PATA controllers of MCP67 to pata_amd.c. Signed-off-by: Peer Chen <pc...@nv...> Signed-off-by: Jeff Garzik <je...@ga...> commit 40eb006685387b2861bd7196be0ab7144c5d5b71 gitweb-commit: http://www.kernel.org/git/?p=linux/kernel/git/jbglaw/vax-linux.git;a=commit;h=40eb006685387b2861bd7196be0ab7144c5d5b71 gitweb-diff: http://www.kernel.org/git/?p=linux/kernel/git/jbglaw/vax-linux.git;a=commitdiff;h=40eb006685387b2861bd7196be0ab7144c5d5b71 Merge: e957b00a8caece90cbc2afd0a4cb4c4d61b9efa8 7a118df3ea23820b9922a1b51cd2f24e464f4c17 Author: Linus Torvalds <tor...@g5...> Date: Thu Nov 2 14:36:05 2006 -0800 Merge branch 'for-linus' of master.kernel.org:/pub/scm/linux/kernel/git/roland/infiniband * 'for-linus' of master.kernel.org:/pub/scm/linux/kernel/git/roland/infiniband: RDMA/addr: Use client registration to fix module unload race IB/mthca: Fix MAD extended header format for MAD_IFC firmware command IB/uverbs: Return sq_draining value in query_qp response IB/amso1100: Fix incorrect pr_debug() IB/amso1100: Use dma_alloc_coherent() instead of kmalloc/dma_map_single IB/ehca: Fix eHCA driver compilation for uniprocessor RDMA/cma: rdma_bind_addr() leaks a cma_dev reference count IB/iser: Start connection after enabling iSER commit 7a118df3ea23820b9922a1b51cd2f24e464f4c17 gitweb-commit: http://www.kernel.org/git/?p=linux/kernel/git/jbglaw/vax-linux.git;a=commit;h=7a118df3ea23820b9922a1b51cd2f24e464f4c17 gitweb-diff: http://www.kernel.org/git/?p=linux/kernel/git/jbglaw/vax-linux.git;a=commitdiff;h=7a118df3ea23820b9922a1b51cd2f24e464f4c17 Author: Sean Hefty <sea...@in...> Date: Tue Oct 31 11:12:59 2006 -0800 RDMA/addr: Use client registration to fix module unload race Require registration with ib_addr module to prevent caller from unloading while a callback is in progress. Signed-off-by: Sean Hefty <sea...@in...> Signed-off-by: Roland Dreier <ro...@ci...> commit 8e87d4dc159148f04f515bc072df22a2c089e7f2 gitweb-commit: http://www.kernel.org/git/?p=linux/kernel/git/jbglaw/vax-linux.git;a=commit;h=8e87d4dc159148f04f515bc072df22a2c089e7f2 gitweb-diff: http://www.kernel.org/git/?p=linux/kernel/git/jbglaw/vax-linux.git;a=commitdiff;h=8e87d4dc159148f04f515bc072df22a2c089e7f2 Author: Steve French <sf...@us...> Date: Thu Nov 2 03:45:24 2006 +0000 [CIFS] report rename failure when target file is locked by Windows Fixes Samba bugzilla bug # 4182 Rename by handle failures (retry after rename by path) were not being returned back. Signed-off-by: Steve French <sf...@us...> commit 68586b67ab1a2fd618f79e29a06f10ae886f4b46 gitweb-commit: http://www.kernel.org/git/?p=linux/kernel/git/jbglaw/vax-linux.git;a=commit;h=68586b67ab1a2fd618f79e29a06f10ae886f4b46 gitweb-diff: http://www.kernel.org/git/?p=linux/kernel/git/jbglaw/vax-linux.git;a=commitdiff;h=68586b67ab1a2fd618f79e29a06f10ae886f4b46 Author: Michael S. Tsirkin <ms...@me...> Date: Mon Oct 30 16:31:52 2006 +0200 IB/mthca: Fix MAD extended header format for MAD_IFC firmware command Several fields in an incoming MAD extended info header were passed into the MAD_IFC firmware command at incorrect offsets (mostly off by 4 bytes). As the result, the HCA will fail to generate traps in which this info is needed (e.g. traps which include the GRH of the incoming packet), in violation of the IB spec. Signed-off-by: Michael S. Tsirkin <ms...@me...> Signed-off-by: Roland Dreier <ro...@ci...> commit 0b26c88f29ad8bcf91a2ea8f25a36f2028ebabea gitweb-commit: http://www.kernel.org/git/?p=linux/kernel/git/jbglaw/vax-linux.git;a=commit;h=0b26c88f29ad8bcf91a2ea8f25a36f2028ebabea gitweb-diff: http://www.kernel.org/git/?p=linux/kernel/git/jbglaw/vax-linux.git;a=commitdiff;h=0b26c88f29ad8bcf91a2ea8f25a36f2028ebabea Author: Jack Morgenstein <ja...@de...> Date: Wed Oct 25 12:54:20 2006 +0200 IB/uverbs: Return sq_draining value in query_qp response Return the sq_draining value back to user space for query_qp instead of the en_sqd_async notify value, which is valid only for modify_qp. For query_qp, the draining status should returned. Signed-off-by: Jack Morgenstein <ja...@me...> Signed-off-by: Roland Dreier <ro...@ci...> commit d7b748d63c908a0a85099ce546594192ae0926f6 gitweb-commit: http://www.kernel.org/git/?p=linux/kernel/git/jbglaw/vax-linux.git;a=commit;h=d7b748d63c908a0a85099ce546594192ae0926f6 gitweb-diff: http://www.kernel.org/git/?p=linux/kernel/git/jbglaw/vax-linux.git;a=commitdiff;h=d7b748d63c908a0a85099ce546594192ae0926f6 Author: Steve Wise <sw...@op...> Date: Mon Oct 30 20:52:53 2006 -0800 IB/amso1100: Fix incorrect pr_debug() pr_debug() was printing the wrong stuff. Signed-off-by: Steve Wise <sw...@op...> Signed-off-by: Roland Dreier <ro...@ci...> commit 8de94ce19dd3c6fc6e9d9658da11cf3d76841ee5 gitweb-commit: http://www.kernel.org/git/?p=linux/kernel/git/jbglaw/vax-linux.git;a=commit;h=8de94ce19dd3c6fc6e9d9658da11cf3d76841ee5 gitweb-diff: http://www.kernel.org/git/?p=linux/kernel/git/jbglaw/vax-linux.git;a=commitdiff;h=8de94ce19dd3c6fc6e9d9658da11cf3d76841ee5 Author: Steve Wise <sw...@op...> Date: Fri Oct 27 17:28:35 2006 -0500 IB/amso1100: Use dma_alloc_coherent() instead of kmalloc/dma_map_single The Ammasso driver needs to use dma_alloc_coherent() for allocating memory that will be used by the HW for dma. Signed-off-by: Steve Wise <sw...@op...> Signed-off-by: Roland Dreier <ro...@ci...> commit 04d03bc576f244bfa9692452aab83fa357ac0d57 gitweb-commit: http://www.kernel.org/git/?p=linux/kernel/git/jbglaw/vax-linux.git;a=commit;h=04d03bc576f244bfa9692452aab83fa357ac0d57 gitweb-diff: http://www.kernel.org/git/?p=linux/kernel/git/jbglaw/vax-linux.git;a=commitdiff;h=04d03bc576f244bfa9692452aab83fa357ac0d57 Author: Paul Mackerras <pa...@sa...> Date: Wed Oct 25 15:28:08 2006 +1000 IB/ehca: Fix eHCA driver compilation for uniprocessor The eHCA driver does not compile for a uniprocessor configuration (CONFIG_SMP=n), due to H_SUCCESS and other symbols being undefined. This fixes it. Signed-off-by: Paul Mackerras <pa...@sa...> Acked-by: Hoang-Nam Nguyen <HN...@de...> Signed-off-by: Roland Dreier <ro...@ci...> commit 255d0c14b3757e8bd85add874e4dca4c3621b39e gitweb-commit: http://www.kernel.org/git/?p=linux/kernel/git/jbglaw/vax-linux.git;a=commit;h=255d0c14b3757e8bd85add874e4dca4c3621b39e gitweb-diff: http://www.kernel.org/git/?p=linux/kernel/git/jbglaw/vax-linux.git;a=commitdiff;h=255d0c14b3757e8bd85add874e4dca4c3621b39e Author: Krishna Kumar <krk...@in...> Date: Tue Oct 24 13:22:28 2006 -0700 RDMA/cma: rdma_bind_addr() leaks a cma_dev reference count rdma_bind_addr() leaks a cma_dev reference count in failure case. Signed-off-by: Krishna Kumar <krk...@in...> Signed-off-by: Sean Hefty <sea...@in...> commit 2e7a7426282bfa2d7dff6eddc5485af8c79a68f3 gitweb-commit: http://www.kernel.org/git/?p=linux/kernel/git/jbglaw/vax-linux.git;a=commit;h=2e7a7426282bfa2d7dff6eddc5485af8c79a68f3 gitweb-diff: http://www.kernel.org/git/?p=linux/kernel/git/jbglaw/vax-linux.git;a=commitdiff;h=2e7a7426282bfa2d7dff6eddc5485af8c79a68f3 Author: Erez Zilber <er...@vo...> Date: Sun Oct 22 10:28:38 2006 +0200 IB/iser: Start connection after enabling iSER When a connection is started (a new connection or a recovered one), iSER should prepare its resources for full-featured mode and only then notify the iSCSI layer that it is ready to start queueing commands. Signed-off-by: Erez Zilber <er...@vo...> Signed-off-by: Roland Dreier <ro...@ci...> commit 4b952a9b0877dbe8f0f69b2747abe79e3bbd2865 gitweb-commit: http://www.kernel.org/git/?p=linux/kernel/git/jbglaw/vax-linux.git;a=commit;h=4b952a9b0877dbe8f0f69b2747abe79e3bbd2865 gitweb-diff: http://www.kernel.org/git/?p=linux/kernel/git/jbglaw/vax-linux.git;a=commitdiff;h=4b952a9b0877dbe8f0f69b2747abe79e3bbd2865 Author: Steve French <sf...@us...> Date: Mon Oct 30 21:46:13 2006 +0000 [CIFS] Allow null user connections Some servers are configured to only allow null user mounts for guest access. Allow nul user (anonymous) mounts e.g. mount -t cifs //server/share /mnt -o username= Signed-off-by: Steve French <sf...@us...> commit 7ca85ba752e521f1b5ead1f3b91c562cc3910c7b gitweb-commit: http://www.kernel.org/git/?p=linux/kernel/git/jbglaw/vax-linux.git;a=commit;h=7ca85ba752e521f1b5ead1f3b91c562cc3910c7b gitweb-diff: http://www.kernel.org/git/?p=linux/kernel/git/jbglaw/vax-linux.git;a=commitdiff;h=7ca85ba752e521f1b5ead1f3b91c562cc3910c7b Author: Steve French <sf...@us...> Date: Mon Oct 30 21:42:57 2006 +0000 [CIFS] Fix readdir breakage when blocksize set too small Do not treat filldir running out of space as an error that needs to be returned. Fixes Redhat bugzilla bug # 211070 Signed-off-by: Steve French <sf...@us...> |