)]}' { "log": [ { "commit": "a493f1a24a496711d96b91c4dc0a1bd35eb6954b", "tree": "6eaae9b9c9e42b8d2bf5a47324e2ea900d2d29a9", "parents": [ "01b225e18fcb540c5d615ca79ef832473451f118", "3874397c0bdec3c21ce071711cd105165179b8eb", "580da35a31f91a594f3090b7a2c39b85cb051a12", "8ee887d74b3d741991edaa1836d22636c28926d9" ], "author": { "name": "Roland Dreier", "email": "roland@purestorage.com", "time": "Tue Nov 29 18:01:53 2011 -0800" }, "committer": { "name": "Roland Dreier", "email": "roland@purestorage.com", "time": "Tue Nov 29 18:01:53 2011 -0800" }, "message": "Merge branches \u0027cxgb4\u0027, \u0027ipoib\u0027, \u0027misc\u0027 and \u0027qib\u0027 into for-next\n" }, { "commit": "580da35a31f91a594f3090b7a2c39b85cb051a12", "tree": "8cb8f106fe3c5df725dbde3efd2bfd19e0f38a2e", "parents": [ "1ea6b8f48918282bdca0b32a34095504ee65bab5" ], "author": { "name": "Eric Dumazet", "email": "eric.dumazet@gmail.com", "time": "Tue Nov 29 22:31:23 2011 +0100" }, "committer": { "name": "Roland Dreier", "email": "roland@purestorage.com", "time": "Tue Nov 29 13:37:11 2011 -0800" }, "message": "IB: Fix RCU lockdep splats\n\nCommit f2c31e32b37 (\"net: fix NULL dereferences in check_peer_redir()\")\nforgot to take care of infiniband uses of dst neighbours.\n\nMany thanks to Marc Aurele who provided a nice bug report and feedback.\n\nReported-by: Marc Aurele La France \u003ctsi@ualberta.ca\u003e\nSigned-off-by: Eric Dumazet \u003ceric.dumazet@gmail.com\u003e\nCc: David Miller \u003cdavem@davemloft.net\u003e\nCc: \u003cstable@kernel.org\u003e\nSigned-off-by: Roland Dreier \u003croland@purestorage.com\u003e\n" }, { "commit": "3874397c0bdec3c21ce071711cd105165179b8eb", "tree": "d4ad5784650fff68d798d38af6c0533f25b4ed78", "parents": [ "1ea6b8f48918282bdca0b32a34095504ee65bab5" ], "author": { "name": "Mike Marciniszyn", "email": "mike.marciniszyn@qlogic.com", "time": "Mon Nov 21 08:43:54 2011 -0500" }, "committer": { "name": "Roland Dreier", "email": "roland@purestorage.com", "time": "Tue Nov 29 13:20:02 2011 -0800" }, "message": "IB/ipoib: Prevent hung task or softlockup processing multicast response\n\nThis following can occur with ipoib when processing a multicast reponse:\n\n BUG: soft lockup - CPU#0 stuck for 67s! [ib_mad1:982]\n Modules linked in: ...\n CPU 0:\n Modules linked in: ...\n Pid: 982, comm: ib_mad1 Not tainted 2.6.32-131.0.15.el6.x86_64 #1 ProLiant DL160 G5\n RIP: 0010:[\u003cffffffff814ddb27\u003e] [\u003cffffffff814ddb27\u003e] _spin_unlock_irqrestore+0x17/0x20\n RSP: 0018:ffff8802119ed860 EFLAGS: 00000246\n 0000000000000004 RBX: ffff8802119ed860 RCX: 000000000000a299\n RDX: ffff88021086c700 RSI: 0000000000000246 RDI: 0000000000000246\n RBP: ffffffff8100bc8e R08: ffff880210ac229c R09: 0000000000000000\n R10: ffff88021278aab8 R11: 0000000000000000 R12: ffff8802119ed860\n R13: ffffffff8100be6e R14: 0000000000000001 R15: 0000000000000003\n FS: 0000000000000000(0000) GS:ffff880028200000(0000) knlGS:0000000000000000\n CS: 0010 DS: 0018 ES: 0018 CR0: 000000008005003b\n CR2: 00000000006d4840 CR3: 0000000209aa5000 CR4: 00000000000406f0\n DR0: 0000000000000000 DR1: 0000000000000000 DR2: 0000000000000000\n DR3: 0000000000000000 DR6: 00000000ffff0ff0 DR7: 0000000000000400\n Call Trace:\n [\u003cffffffffa032c247\u003e] ? ipoib_mcast_send+0x157/0x480 [ib_ipoib]\n [\u003cffffffff8100bc8e\u003e] ? apic_timer_interrupt+0xe/0x20\n [\u003cffffffff8100bc8e\u003e] ? apic_timer_interrupt+0xe/0x20\n [\u003cffffffffa03283d4\u003e] ? ipoib_path_lookup+0x124/0x2d0 [ib_ipoib]\n [\u003cffffffffa03286fc\u003e] ? ipoib_start_xmit+0x17c/0x430 [ib_ipoib]\n [\u003cffffffff8141e758\u003e] ? dev_hard_start_xmit+0x2c8/0x3f0\n [\u003cffffffff81439d0a\u003e] ? sch_direct_xmit+0x15a/0x1c0\n [\u003cffffffff81423098\u003e] ? dev_queue_xmit+0x388/0x4d0\n [\u003cffffffffa032d6b7\u003e] ? ipoib_mcast_join_finish+0x2c7/0x510 [ib_ipoib]\n [\u003cffffffffa032dab8\u003e] ? ipoib_mcast_sendonly_join_complete+0x1b8/0x1f0 [ib_ipoib]\n [\u003cffffffffa02a0946\u003e] ? mcast_work_handler+0x1a6/0x710 [ib_sa]\n [\u003cffffffffa015f01e\u003e] ? ib_send_mad+0xfe/0x3c0 [ib_mad]\n [\u003cffffffffa00f6c93\u003e] ? ib_get_cached_lmc+0xa3/0xb0 [ib_core]\n [\u003cffffffffa02a0f9b\u003e] ? join_handler+0xeb/0x200 [ib_sa]\n [\u003cffffffffa029e4fc\u003e] ? ib_sa_mcmember_rec_callback+0x5c/0xa0 [ib_sa]\n [\u003cffffffffa029e79c\u003e] ? recv_handler+0x3c/0x70 [ib_sa]\n [\u003cffffffffa01603a4\u003e] ? ib_mad_completion_handler+0x844/0x9d0 [ib_mad]\n [\u003cffffffffa015fb60\u003e] ? ib_mad_completion_handler+0x0/0x9d0 [ib_mad]\n [\u003cffffffff81088830\u003e] ? worker_thread+0x170/0x2a0\n [\u003cffffffff8108e160\u003e] ? autoremove_wake_function+0x0/0x40\n [\u003cffffffff810886c0\u003e] ? worker_thread+0x0/0x2a0\n [\u003cffffffff8108ddf6\u003e] ? kthread+0x96/0xa0\n [\u003cffffffff8100c1ca\u003e] ? child_rip+0xa/0x20\n\nCoinciding with stack trace is the following message:\n\n ib0: ib_address_create failed\n\nThe code below in ipoib_mcast_join_finish() will note the above\nfailure in the address handle but otherwise continue:\n\n ah \u003d ipoib_create_ah(dev, priv-\u003epd, \u0026av);\n if (!ah) {\n ipoib_warn(priv, \"ib_address_create failed\\n\");\n } else {\n\nThe while loop at the bottom of ipoib_mcast_join_finish() will attempt\nto send queued multicast packets in mcast-\u003epkt_queue and eventually\nend up in ipoib_mcast_send():\n\n if (!mcast-\u003eah) {\n if (skb_queue_len(\u0026mcast-\u003epkt_queue) \u003c IPOIB_MAX_MCAST_QUEUE)\n skb_queue_tail(\u0026mcast-\u003epkt_queue, skb);\n else {\n ++dev-\u003estats.tx_dropped;\n dev_kfree_skb_any(skb);\n }\n\nMy read is that the code will requeue the packet and return to the\nipoib_mcast_join_finish() while loop and the stage is set for the\n\"hung\" task diagnostic as the while loop never sees a non-NULL ah, and\nwill do nothing to resolve.\n\nThere are GFP_ATOMIC allocates in the provider routines, so this is\npossible and should be dealt with.\n\nThe test that induced the failure is associated with a host SM on the\nsame server during a shutdown.\n\nThis patch causes ipoib_mcast_join_finish() to exit with an error\nwhich will flush the queued mcast packets. Nothing is done to unwind\nthe QP attached state so that subsequent sends from above will retry\nthe join.\n\nReviewed-by: Ram Vepa \u003cram.vepa@qlogic.com\u003e\nReviewed-by: Gary Leshner \u003cgary.leshner@qlogic.com\u003e\nSigned-off-by: Mike Marciniszyn \u003cmike.marciniszyn@qlogic.com\u003e\nSigned-off-by: Roland Dreier \u003croland@purestorage.com\u003e\n" }, { "commit": "32aaeffbd4a7457bf2f7448b33b5946ff2a960eb", "tree": "faf7ad871d87176423ff9ed1d1ba4d9c688fc23f", "parents": [ "208bca0860406d16398145ddd950036a737c3c9d", "67b84999b1a8b1af5625b1eabe92146c5eb42932" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Sun Nov 06 19:44:47 2011 -0800" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Sun Nov 06 19:44:47 2011 -0800" }, "message": "Merge branch \u0027modsplit-Oct31_2011\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/paulg/linux\n\n* \u0027modsplit-Oct31_2011\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/paulg/linux: (230 commits)\n Revert \"tracing: Include module.h in define_trace.h\"\n irq: don\u0027t put module.h into irq.h for tracking irqgen modules.\n bluetooth: macroize two small inlines to avoid module.h\n ip_vs.h: fix implicit use of module_get/module_put from module.h\n nf_conntrack.h: fix up fallout from implicit moduleparam.h presence\n include: replace linux/module.h with \"struct module\" wherever possible\n include: convert various register fcns to macros to avoid include chaining\n crypto.h: remove unused crypto_tfm_alg_modname() inline\n uwb.h: fix implicit use of asm/page.h for PAGE_SIZE\n pm_runtime.h: explicitly requires notifier.h\n linux/dmaengine.h: fix implicit use of bitmap.h and asm/page.h\n miscdevice.h: fix up implicit use of lists and types\n stop_machine.h: fix implicit use of smp.h for smp_processor_id\n of: fix implicit use of errno.h in include/linux/of.h\n of_platform.h: delete needless include \u003clinux/module.h\u003e\n acpi: remove module.h include from platform/aclinux.h\n miscdevice.h: delete unnecessary inclusion of module.h\n device_cgroup.h: delete needless include \u003clinux/module.h\u003e\n net: sch_generic remove redundant use of \u003clinux/module.h\u003e\n net: inet_timewait_sock doesnt need \u003clinux/module.h\u003e\n ...\n\nFix up trivial conflicts (other header files, and removal of the ab3550 mfd driver) in\n - drivers/media/dvb/frontends/dibx000_common.c\n - drivers/media/video/{mt9m111.c,ov6650.c}\n - drivers/mfd/ab3550-core.c\n - include/linux/dmaengine.h\n" }, { "commit": "52439540ea30396982b69662dd21aede6b336288", "tree": "2604bc377ec689ce1a23fa45e1a317196bd96a82", "parents": [ "2c4ce609347f2a45792c8d9ebb5af11217766cb6" ], "author": { "name": "Or Gerlitz", "email": "ogerlitz@mellanox.com", "time": "Fri Nov 04 00:21:27 2011 +0200" }, "committer": { "name": "Roland Dreier", "email": "roland@purestorage.com", "time": "Fri Nov 04 09:32:44 2011 -0700" }, "message": "IB/iser: DMA unmap TX bufs used for iSCSI/iSER headers\n\nThe current driver never does DMA unmapping on these buffers. Fix that\nby adding DMA unmapping to the task cleanup callback, and DMA mapping to\nthe task init function (drop the headers_initialized micro-optimization).\n\nSigned-off-by: Or Gerlitz \u003cogerlitz@mellanox.com\u003e\nSigned-off-by: Roland Dreier \u003croland@purestorage.com\u003e\n" }, { "commit": "2c4ce609347f2a45792c8d9ebb5af11217766cb6", "tree": "a78125a35d5a277d395003651b4241eafc7dd52d", "parents": [ "f470f8d4e702593ee1d0852871ad80373bce707b" ], "author": { "name": "Or Gerlitz", "email": "ogerlitz@mellanox.com", "time": "Fri Nov 04 00:19:46 2011 +0200" }, "committer": { "name": "Roland Dreier", "email": "roland@purestorage.com", "time": "Fri Nov 04 09:30:52 2011 -0700" }, "message": "IB/iser: Use separate buffers for the login request/response\n\nThe driver counted on the transactional nature of iSCSI login/text\nflows and used the same buffer for both the request and the response.\nWe also went further and did DMA mapping only once, with\nDMA_FROM_DEVICE, which violates the DMA mapping API. Fix that by\nusing different buffers, one for requests and one for responses, and\nuse the correct DMA mapping direction for each.\n\nSigned-off-by: Or Gerlitz \u003cogerlitz@mellanox.com\u003e\nSigned-off-by: Roland Dreier \u003croland@purestorage.com\u003e\n" }, { "commit": "f470f8d4e702593ee1d0852871ad80373bce707b", "tree": "85a67e65c5e5b9777639bd8f4c763a4cf8787e0e", "parents": [ "dc47d3810cdcb4f32bfa31d50f26af97aced0638", "504255f8d0480cf293962adf4bc3aecac645ae71" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Tue Nov 01 10:51:38 2011 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Tue Nov 01 10:51:38 2011 -0700" }, "message": "Merge branch \u0027for-linus\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/roland/infiniband\n\n* \u0027for-linus\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/roland/infiniband: (62 commits)\n mlx4_core: Deprecate log_num_vlan module param\n IB/mlx4: Don\u0027t set VLAN in IBoE WQEs\u0027 control segment\n IB/mlx4: Enable 4K mtu for IBoE\n RDMA/cxgb4: Mark QP in error before disabling the queue in firmware\n RDMA/cxgb4: Serialize calls to CQ\u0027s comp_handler\n RDMA/cxgb3: Serialize calls to CQ\u0027s comp_handler\n IB/qib: Fix issue with link states and QSFP cables\n IB/mlx4: Configure extended active speeds\n mlx4_core: Add extended port capabilities support\n IB/qib: Hold links until tuning data is available\n IB/qib: Clean up checkpatch issue\n IB/qib: Remove s_lock around header validation\n IB/qib: Precompute timeout jiffies to optimize latency\n IB/qib: Use RCU for qpn lookup\n IB/qib: Eliminate divide/mod in converting idx to egr buf pointer\n IB/qib: Decode path MTU optimization\n IB/qib: Optimize RC/UC code by IB operation\n IPoIB: Use the right function to do DMA unmap pages\n RDMA/cxgb4: Use correct QID in insert_recv_cqe()\n RDMA/cxgb4: Make sure flush CQ entries are collected on connection close\n ...\n" }, { "commit": "504255f8d0480cf293962adf4bc3aecac645ae71", "tree": "5ae8663d2bc2eb9e796bfb689f3e462a14742e06", "parents": [ "2be6053318aa4f2787b7bc5cf5160017d7d1586b", "615eb715ae10cbaa8079ab8cacf8f4596be4087a", "f7cc25d018f1e9af6767ee7774bbe83452e9fdf4", "d32ae393dbf0daf778f9e33b0bc6591cd102391e", "a5e12dff757b562bbecd6a2359fdc4c43d4d97de", "3e60a77ea218d1915bdc9127f88ab866fd2ac643", "787adb9d6ad9afb498a1580a7d8ad05f779c488a", "caf6e3f221ddc12ccabd1cd0ba149561db0090d4", "cb29688aaa4caa4d54df2976118fe99a839bb433", "0f0bee8bbc2b3e49baa703118041f99db9ef41a1", "16d99812d58b8af2df29cd337a74cd965b53da04", "42849b2697c36abdafa6aef64186b15055392046" ], "author": { "name": "Roland Dreier", "email": "roland@purestorage.com", "time": "Tue Nov 01 09:37:08 2011 -0700" }, "committer": { "name": "Roland Dreier", "email": "roland@purestorage.com", "time": "Tue Nov 01 09:37:08 2011 -0700" }, "message": "Merge branches \u0027amso1100\u0027, \u0027cma\u0027, \u0027cxgb3\u0027, \u0027cxgb4\u0027, \u0027fdr\u0027, \u0027ipath\u0027, \u0027ipoib\u0027, \u0027misc\u0027, \u0027mlx4\u0027, \u0027misc\u0027, \u0027nes\u0027, \u0027qib\u0027 and \u0027xrc\u0027 into for-next\n" }, { "commit": "fec14d2fcebe824377ef0305babc365d039f6b39", "tree": "9fa6b49e51183f84a9ca208a3125a7b221efb983", "parents": [ "b108d9764cff25262bf764542ed1998d3e568962" ], "author": { "name": "Paul Gortmaker", "email": "paul.gortmaker@windriver.com", "time": "Tue Aug 30 12:32:52 2011 -0400" }, "committer": { "name": "Paul Gortmaker", "email": "paul.gortmaker@windriver.com", "time": "Mon Oct 31 19:31:36 2011 -0400" }, "message": "infiniband: add moduleparam.h to drivers/infiniband as required\n\nThese files were getting the moduleparam infrastructure from the\nimplicit presence of module.h being everywhere, but that is going\naway soon.\n\nSigned-off-by: Paul Gortmaker \u003cpaul.gortmaker@windriver.com\u003e\n" }, { "commit": "b108d9764cff25262bf764542ed1998d3e568962", "tree": "12e08e711d77d0f84e4b2fe905a1219dc91c7e46", "parents": [ "e4dd23d753c3cb0d8533d353069e8b2e8a666360" ], "author": { "name": "Paul Gortmaker", "email": "paul.gortmaker@windriver.com", "time": "Fri May 27 15:29:33 2011 -0400" }, "committer": { "name": "Paul Gortmaker", "email": "paul.gortmaker@windriver.com", "time": "Mon Oct 31 19:31:35 2011 -0400" }, "message": "infiniband: add in export.h for files using EXPORT_SYMBOL/THIS_MODULE\n\nThese were getting it implicitly via device.h --\u003e module.h but\nwe are going to stop that when we clean up the headers.\n\nFix these in advance so the tree remains biscect-clean.\n\nSigned-off-by: Paul Gortmaker \u003cpaul.gortmaker@windriver.com\u003e\n" }, { "commit": "e4dd23d753c3cb0d8533d353069e8b2e8a666360", "tree": "8c28dcf2675a55549689fdee90f8ec0a2fb23cf8", "parents": [ "fc87af74af7f856bb8e7585308fb1fdaaa69ec73" ], "author": { "name": "Paul Gortmaker", "email": "paul.gortmaker@windriver.com", "time": "Fri May 27 15:35:46 2011 -0400" }, "committer": { "name": "Paul Gortmaker", "email": "paul.gortmaker@windriver.com", "time": "Mon Oct 31 19:31:35 2011 -0400" }, "message": "infiniband: Fix up module files that need to include module.h\n\nThey had been getting it implicitly via device.h but we can\u0027t\nrely on that for the future, due to a pending cleanup so fix\nit now.\n\nSigned-off-by: Paul Gortmaker \u003cpaul.gortmaker@windriver.com\u003e\n" }, { "commit": "ec7ae517537ae5c7b0b2cd7f562dfa3e7a05b954", "tree": "e6b0c64a51a7c0aa0efd09d4f7a80872e3b1657a", "parents": [ "97d2eb13a019ec09cc1a7ea2d3705c0b117b3c0d", "590134fa78fbdbe5fea78c7ae0b2c3364bc9572f" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Fri Oct 28 16:44:18 2011 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Fri Oct 28 16:44:18 2011 -0700" }, "message": "Merge git://git.kernel.org/pub/scm/linux/kernel/git/jejb/scsi-misc-2.6\n\n* git://git.kernel.org/pub/scm/linux/kernel/git/jejb/scsi-misc-2.6: (204 commits)\n [SCSI] qla4xxx: export address/port of connection (fix udev disk names)\n [SCSI] ipr: Fix BUG on adapter dump timeout\n [SCSI] megaraid_sas: Fix instance access in megasas_reset_timer\n [SCSI] hpsa: change confusing message to be more clear\n [SCSI] iscsi class: fix vlan configuration\n [SCSI] qla4xxx: fix data alignment and use nl helpers\n [SCSI] iscsi class: fix link local mispelling\n [SCSI] iscsi class: Replace iscsi_get_next_target_id with IDA\n [SCSI] aacraid: use lower snprintf() limit\n [SCSI] lpfc 8.3.27: Change driver version to 8.3.27\n [SCSI] lpfc 8.3.27: T10 additions for SLI4\n [SCSI] lpfc 8.3.27: Fix queue allocation failure recovery\n [SCSI] lpfc 8.3.27: Change algorithm for getting physical port name\n [SCSI] lpfc 8.3.27: Changed worst case mailbox timeout\n [SCSI] lpfc 8.3.27: Miscellanous logic and interface fixes\n [SCSI] megaraid_sas: Changelog and version update\n [SCSI] megaraid_sas: Add driver workaround for PERC5/1068 kdump kernel panic\n [SCSI] megaraid_sas: Add multiple MSI-X vector/multiple reply queue support\n [SCSI] megaraid_sas: Add support for MegaRAID 9360/9380 12GB/s controllers\n [SCSI] megaraid_sas: Clear FUSION_IN_RESET before enabling interrupts\n ...\n" }, { "commit": "9e903e085262ffbf1fc44a17ac06058aca03524a", "tree": "4acefc97ba38c1733474d25c0b2053b56af97db1", "parents": [ "dd767856a36e00b631d65ebc4bb81b19915532d6" ], "author": { "name": "Eric Dumazet", "email": "eric.dumazet@gmail.com", "time": "Tue Oct 18 21:00:24 2011 +0000" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Wed Oct 19 03:10:46 2011 -0400" }, "message": "net: add skb frag size accessors\n\nTo ease skb-\u003etruesize sanitization, its better to be able to localize\nall references to skb frags size.\n\nDefine accessors : skb_frag_size() to fetch frag size, and\nskb_frag_size_{set|add|sub}() to manipulate it.\n\nSigned-off-by: Eric Dumazet \u003ceric.dumazet@gmail.com\u003e\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "787adb9d6ad9afb498a1580a7d8ad05f779c488a", "tree": "9ab5e25a27fac6b66b1af0c903f3f9cb4517a69c", "parents": [ "976d167615b64e14bc1491ca51d424e2ba9a5e84" ], "author": { "name": "Dotan Barak", "email": "dotanb@dev.mellanox.co.il", "time": "Tue Oct 18 15:22:14 2011 +0200" }, "committer": { "name": "Roland Dreier", "email": "roland@purestorage.com", "time": "Tue Oct 18 10:08:31 2011 -0700" }, "message": "IPoIB: Use the right function to do DMA unmap pages\n\nPages that were mapped using ib_dma_map_page() should be unmapped\nusing ib_dma_unmap_page().\n\nSigned-off-by: Dotan Barak \u003cdotanb@dev.mellanox.co.il\u003e\nReviewed-by: Jack Morgenstein \u003cjackm@dev.mellanox.co.il\u003e\nSigned-off-by: Roland Dreier \u003croland@purestorage.com\u003e\n" }, { "commit": "96104eda01695a26da2c8f7423ec0ba3509c8c97", "tree": "04e38bfe564245ebd9a62738d54a111b2d24da4a", "parents": [ "59991f94eb32e954aa767f659eb642461e9e8b37" ], "author": { "name": "Sean Hefty", "email": "sean.hefty@intel.com", "time": "Mon May 23 16:31:36 2011 -0700" }, "committer": { "name": "Roland Dreier", "email": "roland@purestorage.com", "time": "Thu Oct 13 09:13:26 2011 -0700" }, "message": "RDMA/core: Add SRQ type field\n\nCurrently, there is only a single (\"basic\") type of SRQ, but with XRC\nsupport we will add a second. Prepare for this by defining an SRQ type\nand setting all current users to IB_SRQT_BASIC.\n\nSigned-off-by: Sean Hefty \u003csean.hefty@intel.com\u003e\nSigned-off-by: Roland Dreier \u003croland@purestorage.com\u003e\n" }, { "commit": "e36fb88a9a0fb8ac4b87c8ac709214a408de6d97", "tree": "51012bbd19e812b80a7a9628b9503f4f8a29ad6f", "parents": [ "71eeba161d7611238ecb6f525a82325aa35339f0" ], "author": { "name": "Marcel Apfelbaum", "email": "marcela@dev.mellanox.co.il", "time": "Tue Oct 04 15:28:23 2011 +0300" }, "committer": { "name": "Roland Dreier", "email": "roland@purestorage.com", "time": "Tue Oct 11 11:57:08 2011 -0700" }, "message": "IPoIB: Handle extended rates in debugfs\n\nUse new function ib_rate_to_mbps() to handle printing rate in debugfs,\nso that we handle extended rates.\n\nSigned-off-by: Marcel Apfelbaum \u003cmarcela@dev.mellanox.co.il\u003e\nSigned-off-by: Roland Dreier \u003croland@purestorage.com\u003e\n" }, { "commit": "8decf868790b48a727d7e7ca164f2bcd3c1389c0", "tree": "b759a5f861f842af7ea76f9011b579d06e9d5508", "parents": [ "3fc72370186be2f9d4d6ef06d99e1caa5d92c564", "d93dc5c4478c1fd5de85a3e8aece9aad7bbae044" ], "author": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Thu Sep 22 03:23:13 2011 -0400" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Thu Sep 22 03:23:13 2011 -0400" }, "message": "Merge branch \u0027master\u0027 of github.com:davem330/net\n\nConflicts:\n\tMAINTAINERS\n\tdrivers/net/Kconfig\n\tdrivers/net/ethernet/broadcom/bnx2x/bnx2x_link.c\n\tdrivers/net/ethernet/broadcom/tg3.c\n\tdrivers/net/wireless/iwlwifi/iwl-pci.c\n\tdrivers/net/wireless/iwlwifi/iwl-trans-tx-pcie.c\n\tdrivers/net/wireless/rt2x00/rt2800usb.c\n\tdrivers/net/wireless/wl12xx/main.c\n" }, { "commit": "f27fb2ef7bd88c9c5f67befe4d85e2155aa0e1a8", "tree": "6c313f71cc2c0701a4e873e8231571c442b131e2", "parents": [ "b78dbba0053c6f14384d55b929d21b85d03c38bb" ], "author": { "name": "Mike Christie", "email": "michaelc@cs.wisc.edu", "time": "Mon Jul 25 13:48:45 2011 -0500" }, "committer": { "name": "James Bottomley", "email": "JBottomley@Parallels.com", "time": "Sat Aug 27 08:36:14 2011 -0600" }, "message": "[SCSI] iscsi class: sysfs group is_visible callout for iscsi host attrs\n\nThe iscsi class currently does not support writable sysfs\nattrs for LLD sysfs settings. This patch converts the\niscsi class and driver\u0027s host attrs to use the attribute\ncontainer sysfs group and the sysfs group\u0027s is_visible callout\nto be able to support readable or writable sysfs attrs.\n\nSigned-off-by: Mike Christie \u003cmichaelc@cs.wisc.edu\u003e\nSigned-off-by: James Bottomley \u003cJBottomley@Parallels.com\u003e\n" }, { "commit": "1d063c17298d7cd26cfe350f1e93e1727b4aa53f", "tree": "ce7996d0b3fe0903287eac2649c79658b5c9c528", "parents": [ "3128c6c73cdf3df92c3165bfb785ae50114d18bf" ], "author": { "name": "Mike Christie", "email": "michaelc@cs.wisc.edu", "time": "Mon Jul 25 13:48:43 2011 -0500" }, "committer": { "name": "James Bottomley", "email": "JBottomley@Parallels.com", "time": "Sat Aug 27 08:36:06 2011 -0600" }, "message": "[SCSI] iscsi class: sysfs group is_visible callout for session attrs\n\nThe iscsi class currently does not support writable sysfs\nattrs for LLD sysfs settings. This patch converts the\niscsi class and driver\u0027s session attrs to use the attribute\ncontainer sysfs group and the sysfs group\u0027s is_visible callout\nto be able to support readable or writable sysfs attrs.\n\nSigned-off-by: Mike Christie \u003cmichaelc@cs.wisc.edu\u003e\nSigned-off-by: James Bottomley \u003cJBottomley@Parallels.com\u003e\n" }, { "commit": "3128c6c73cdf3df92c3165bfb785ae50114d18bf", "tree": "49af7993064b0140bda96c795a47fa336525d02c", "parents": [ "ed1086e041b4870313dd0c0755f4bbc3b62d0d08" ], "author": { "name": "Mike Christie", "email": "michaelc@cs.wisc.edu", "time": "Mon Jul 25 13:48:42 2011 -0500" }, "committer": { "name": "James Bottomley", "email": "JBottomley@Parallels.com", "time": "Sat Aug 27 08:36:03 2011 -0600" }, "message": "[SCSI] iscsi cls: sysfs group is_visible callout for conn attrs\n\nThe iscsi class currently does not support writable sysfs\nattrs for LLD sysfs settings. This patch converts the\niscsi class and drivers to use the attribute container\nsysfs group and the sysfs group\u0027s is_visible callout\nto be able to support readable or writable sysfs attrs.\n\nSigned-off-by: Mike Christie \u003cmichaelc@cs.wisc.edu\u003e\nSigned-off-by: James Bottomley \u003cJBottomley@Parallels.com\u003e\n" }, { "commit": "5581be3b48914b0f9126b14daa02d334928322b0", "tree": "209a32b5a8bc19a28a188bb4b48ec5a695a664e0", "parents": [ "cf383ebb1300e910377c124e8eb582c6bc27d2b6" ], "author": { "name": "Ian Campbell", "email": "Ian.Campbell@citrix.com", "time": "Wed Aug 24 22:28:10 2011 +0000" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Fri Aug 26 12:38:42 2011 -0400" }, "message": "IPoIB: convert to SKB paged frag API.\n\nSigned-off-by: Ian Campbell \u003cian.campbell@citrix.com\u003e\nReviewed-by: Konrad Rzeszutek Wilk \u003ckonrad.wilk@oracle.com\u003e\nCc: Roland Dreier \u003croland@kernel.org\u003e\nCc: Sean Hefty \u003csean.hefty@intel.com\u003e\nCc: Hal Rosenstock \u003chal.rosenstock@gmail.com\u003e\nCc: linux-rdma@vger.kernel.org\nCc: netdev@vger.kernel.org\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "afc4b13df143122f99a0eb10bfefb216c2806de0", "tree": "5a90e0a8226ce4173d8d366f5bed0322c9623cdd", "parents": [ "01789349ee52e4a3faf376f1485303d9723c4f1f" ], "author": { "name": "Jiri Pirko", "email": "jpirko@redhat.com", "time": "Tue Aug 16 06:29:01 2011 +0000" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Wed Aug 17 20:22:03 2011 -0700" }, "message": "net: remove use of ndo_set_multicast_list in drivers\n\nreplace it by ndo_set_rx_mode\n\nSigned-off-by: Jiri Pirko \u003cjpirko@redhat.com\u003e\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "80b43de83781ed67810d54c7892ac9cb2a2601df", "tree": "78969a4c8355302cce821475bfe44d5dc69e5d23", "parents": [ "22cfb0bf6721bb1f865f67bc21e3c36c272faf36", "200ae1a08bec8f3fedfcfe94c892d9a024db4e46" ], "author": { "name": "Roland Dreier", "email": "roland@purestorage.com", "time": "Wed Aug 17 10:57:43 2011 -0700" }, "committer": { "name": "Roland Dreier", "email": "roland@purestorage.com", "time": "Wed Aug 17 10:57:43 2011 -0700" }, "message": "Merge branches \u0027ipoib\u0027 and \u0027iser\u0027 into for-next\n" }, { "commit": "200ae1a08bec8f3fedfcfe94c892d9a024db4e46", "tree": "a5ea0224f3bb7998991a4c9e39f6f8aea7c70ba4", "parents": [ "0ace64b85ea7b90e3bffe408b9d7c3364692bfa4" ], "author": { "name": "Or Gerlitz", "email": "ogerlitz@mellanox.com", "time": "Mon Aug 01 21:14:09 2011 +0000" }, "committer": { "name": "Roland Dreier", "email": "roland@purestorage.com", "time": "Wed Aug 17 09:45:07 2011 -0700" }, "message": "IB/iser: Support iSCSI PDU padding\n\nRFC3270 mandates that iSCSI PDUs are padded to the closest integer\nnumber of four byte words. Fix the iser code to support that on both\nthe TX/RX flows.\n\nSigned-off-by: Or Gerlitz \u003cogerlitz@mellanox.co.il\u003e\nSigned-off-by: Roland Dreier \u003croland@purestorage.com\u003e\n" }, { "commit": "0ace64b85ea7b90e3bffe408b9d7c3364692bfa4", "tree": "2606a343505441fe0c1f4cf638c6ebc9bb9929b5", "parents": [ "322a8b034003c0d46d39af85bf24fee27b902f48" ], "author": { "name": "Or Gerlitz", "email": "ogerlitz@mellanox.com", "time": "Mon Aug 01 21:12:09 2011 +0000" }, "committer": { "name": "Roland Dreier", "email": "roland@purestorage.com", "time": "Wed Aug 17 09:40:55 2011 -0700" }, "message": "IBiser: Fix wrong mask when sizeof (dma_addr_t) \u003e sizeof (unsigned long)\n\nThe code that prepares the SG associated with SCSI command for FMR was\nbuggy for systems with DMA addresses that don\u0027t fit in unsigned long,\ne.g under the 32-bit based XenServer dom0 sizeof(dma_addr_t) is 8.\n\nFix that by casting to unsigned long long a masking constant used by\nthe code. This resolves a crash in iser_sg_to_page_vec on this system.\n\nSigned-off-by: Or Gerlitz \u003cogerlitz@mellanox.co.il\u003e\nSigned-off-by: Roland Dreier \u003croland@purestorage.com\u003e\n" }, { "commit": "22cfb0bf6721bb1f865f67bc21e3c36c272faf36", "tree": "d70baecd0e7aa0e63cafa82178a16a39587df7cb", "parents": [ "322a8b034003c0d46d39af85bf24fee27b902f48" ], "author": { "name": "Bernd Schubert", "email": "bernd.schubert@itwm.fraunhofer.de", "time": "Tue Aug 16 10:56:54 2011 +0000" }, "committer": { "name": "Roland Dreier", "email": "roland@purestorage.com", "time": "Tue Aug 16 10:19:20 2011 -0700" }, "message": "IPoIB: Fix possible NULL dereference in ipoib_start_xmit()\n\nFix a bug introduced in 69cce1d14049 (\"net: Abstract dst-\u003eneighbour\naccesses behind helpers.\") where we might dereference skb_dst(skb)\neven if it is NULL, which causes:\n\n [ 240.944030] BUG: unable to handle kernel NULL pointer dereference at 0000000000000040\n [ 240.948007] IP: [\u003cffffffffa0366ce9\u003e] ipoib_start_xmit+0x39/0x280 [ib_ipoib]\n [...]\n [ 240.948007] Call Trace:\n [ 240.948007] \u003cIRQ\u003e\n [ 240.948007] [\u003cffffffff812cd5e0\u003e] dev_hard_start_xmit+0x2a0/0x590\n [ 240.948007] [\u003cffffffff8131f680\u003e] ? arp_create+0x70/0x200\n [ 240.948007] [\u003cffffffff812e8e1f\u003e] sch_direct_xmit+0xef/0x1c0\n\nAddresses: https://bugzilla.kernel.org/show_bug.cgi?id\u003d41212\nSigned-off-by: Bernd Schubert \u003cbernd.schubert@itwm.fraunhofer.de\u003e\nSigned-off-by: Roland Dreier \u003croland@purestorage.com\u003e\n" }, { "commit": "91d41fdf31f74e6e2e5f3cb018eca4200e36e202", "tree": "81ef11f06bd8047031a2d93706dc263fa1bacd56", "parents": [ "c1095c6da518b0b64e724f629051fa67655cd8d9", "277c5f27a2c86a9a733c0ec0f6a9b1032dfa3e15" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Wed Jul 27 13:21:40 2011 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Wed Jul 27 13:21:40 2011 -0700" }, "message": "Merge branch \u0027for-next\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/nab/target-pending\n\n* \u0027for-next\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/nab/target-pending:\n target: Convert to DIV_ROUND_UP_SECTOR_T usage for sectors / dev_max_sectors\n kernel.h: Add DIV_ROUND_UP_ULL and DIV_ROUND_UP_SECTOR_T macro usage\n iscsi-target: Add iSCSI fabric support for target v4.1\n iscsi: Add Serial Number Arithmetic LT and GT into iscsi_proto.h\n iscsi: Use struct scsi_lun in iscsi structs instead of u8[8]\n iscsi: Resolve iscsi_proto.h naming conflicts with drivers/target/iscsi\n" }, { "commit": "60063497a95e716c9a689af3be2687d261f115b4", "tree": "6ce0d68db76982c53df46aee5f29f944ebf2c320", "parents": [ "148817ba092f9f6edd35bad3c6c6b8e8f90fe2ed" ], "author": { "name": "Arun Sharma", "email": "asharma@fb.com", "time": "Tue Jul 26 16:09:06 2011 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Tue Jul 26 16:49:47 2011 -0700" }, "message": "atomic: use \u003clinux/atomic.h\u003e\n\nThis allows us to move duplicated code in \u003casm/atomic.h\u003e\n(atomic_inc_not_zero() for now) to \u003clinux/atomic.h\u003e\n\nSigned-off-by: Arun Sharma \u003casharma@fb.com\u003e\nReviewed-by: Eric Dumazet \u003ceric.dumazet@gmail.com\u003e\nCc: Ingo Molnar \u003cmingo@elte.hu\u003e\nCc: David Miller \u003cdavem@davemloft.net\u003e\nCc: Eric Dumazet \u003ceric.dumazet@gmail.com\u003e\nAcked-by: Mike Frysinger \u003cvapier@gentoo.org\u003e\nSigned-off-by: Andrew Morton \u003cakpm@linux-foundation.org\u003e\nSigned-off-by: Linus Torvalds \u003ctorvalds@linux-foundation.org\u003e\n" }, { "commit": "123521830c0ea35055b900d2ff0b73bb129e08cb", "tree": "e0f2a4b46d6b7759a17b91f4953627b51ce20d5a", "parents": [ "bbd9d6f7fbb0305c9a592bf05a32e87eb364a4ff" ], "author": { "name": "Nicholas Bellinger", "email": "nab@linux-iscsi.org", "time": "Fri May 27 11:16:33 2011 +0000" }, "committer": { "name": "Nicholas Bellinger", "email": "nab@linux-iscsi.org", "time": "Mon Jul 25 07:18:45 2011 +0000" }, "message": "iscsi: Resolve iscsi_proto.h naming conflicts with drivers/target/iscsi\n\nThis patch renames the following iscsi_proto.h structures to avoid\nnamespace issues with drivers/target/iscsi/iscsi_target_core.h:\n\n*) struct iscsi_cmd -\u003e struct iscsi_scsi_req\n*) struct iscsi_cmd_rsp -\u003e struct iscsi_scsi_rsp\n*) struct iscsi_login -\u003e struct iscsi_login_req\n\nThis patch includes useful ISCSI_FLAG_LOGIN_[CURRENT,NEXT]_STAGE*,\nand ISCSI_FLAG_SNACK_TYPE_* definitions used by iscsi_target_mod, and\nfixes the incorrect definition of struct iscsi_snack to following\nRFC-3720 Section 10.16. SNACK Request.\n\nAlso, this patch updates libiscsi, iSER, be2iscsi, and bn2xi to\nuse the updated structure definitions in a handful of locations.\n\nSigned-off-by: Mike Christie \u003cmichaelc@cs.wisc.edu\u003e\nSigned-off-by: Nicholas A. Bellinger \u003cnab@linux-iscsi.org\u003e\n" }, { "commit": "ece236ce2fad9c27a6fd2530f899289025194bce", "tree": "474b793205872206a2a3f7d409ff9b1f81f3a9a8", "parents": [ "441c196e84b11aad3123baa9320eee7abc6b5c98", "4460207561290c3be7e6c7538f22690028170c1d" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Fri Jul 22 14:50:12 2011 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Fri Jul 22 14:50:12 2011 -0700" }, "message": "Merge branch \u0027for-linus\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/roland/infiniband\n\n* \u0027for-linus\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/roland/infiniband: (26 commits)\n IB/qib: Defer HCA error events to tasklet\n mlx4_core: Bump the driver version to 1.0\n RDMA/cxgb4: Use printk_ratelimited() instead of printk_ratelimit()\n IB/mlx4: Support PMA counters for IBoE\n IB/mlx4: Use flow counters on IBoE ports\n IB/pma: Add include file for IBA performance counters definitions\n mlx4_core: Add network flow counters\n mlx4_core: Fix location of counter index in QP context struct\n mlx4_core: Read extended capabilities into the flags field\n mlx4_core: Extend capability flags to 64 bits\n IB/mlx4: Generate GID change events in IBoE code\n IB/core: Add GID change event\n RDMA/cma: Don\u0027t allow IPoIB port space for IBoE\n RDMA: Allow for NULL .modify_device() and .modify_port() methods\n IB/qib: Update active link width\n IB/qib: Fix potential deadlock with link down interrupt\n IB/qib: Add sysfs interface to read free contexts\n IB/mthca: Remove unnecessary read of PCI_CAP_ID_EXP\n IB/qib: Remove double define\n IB/qib: Remove unnecessary read of PCI_CAP_ID_EXP\n ...\n" }, { "commit": "69cce1d1404968f78b177a0314f5822d5afdbbfb", "tree": "26223264fd69ea8078d0013fd5a76eb7aeb04c12", "parents": [ "9cbb7ecbcff85077bb12301aaf4c9b5a56c5993d" ], "author": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Sun Jul 17 23:09:49 2011 -0700" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Sun Jul 17 23:11:35 2011 -0700" }, "message": "net: Abstract dst-\u003eneighbour accesses behind helpers.\n\ndst_{get,set}_neighbour()\n\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "fd1b6c4a693c9cac59375ffb36ffe5d7c079037c", "tree": "c1d4420f05e737d3e0049c2568ec393ae8c684ad", "parents": [ "620917de59eeb934b9f8cf35cc2d95c1ac8ed0fc" ], "author": { "name": "Bart Van Assche", "email": "bvanassche@acm.org", "time": "Wed Jul 13 09:19:16 2011 -0700" }, "committer": { "name": "Roland Dreier", "email": "roland@purestorage.com", "time": "Wed Jul 13 09:19:16 2011 -0700" }, "message": "IB/srp: Avoid duplicate devices from LUN scan\n\nSCSI scanning of a channel:id:lun triplet in Linux works as follows\n(function scsi_scan_target() in drivers/scsi/scsi_scan.c):\n\n- If lun \u003d\u003d SCAN_WILD_CARD, send a REPORT LUNS command to the target\n and process the result.\n\n- If lun !\u003d SCAN_WILD_CARD, send an INQUIRY command to the LUN\n corresponding to the specified channel:id:lun triplet to verify\n whether the LUN exists.\n\nSo a SCSI driver must either take the channel and target id values in\naccount in its quecommand() function or it should declare that it only\nsupports one channel and one target id.\n\nCurrently the ib_srp driver does neither. As a result scanning the\nSCSI bus via e.g. rescan-scsi-bus.sh causes many duplicate SCSI\ndevices to be created. For each 0:0:L device, several duplicates are\ncreated with the same LUN number and with (C:I) !\u003d (0:0). Fix this by\ndeclaring that the ib_srp driver only supports one channel and one\ntarget id.\n\nSigned-off-by: Bart Van Assche \u003cbvanassche@acm.org\u003e\nCc: \u003cstable@kernel.org\u003e\nAcked-by: David Dillow \u003cdillowda@ornl.gov\u003e\nSigned-off-by: Roland Dreier \u003croland@purestorage.com\u003e\n" }, { "commit": "a6b7a407865aab9f849dd99a71072b7cd1175116", "tree": "42995f2e25b777e8930b5ac180599f8d4e655df6", "parents": [ "aedfebbaa7a4883dc568d8d32b7b32a0f9833f41" ], "author": { "name": "Alexey Dobriyan", "email": "adobriyan@gmail.com", "time": "Mon Jun 06 10:43:46 2011 +0000" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Mon Jun 06 22:55:11 2011 -0700" }, "message": "net: remove interrupt.h inclusion from netdevice.h\n\n* remove interrupt.g inclusion from netdevice.h -- not needed\n* fixup fallout, add interrupt.h and hardirq.h back where needed.\n\nSigned-off-by: Alexey Dobriyan \u003cadobriyan@gmail.com\u003e\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "4c171acc20794af16a27da25e11ec4e9cad5d9fa", "tree": "fb097384d709b7bda982902d999f658bb4f07b2c", "parents": [ "20e0ec119b2c6cc412addefbe169f4f5e38701e8", "8dc4abdf4c82d0e1c47f14b6615406d31975ea66" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Thu May 26 12:13:57 2011 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Thu May 26 12:13:57 2011 -0700" }, "message": "Merge branch \u0027for-linus\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/roland/infiniband\n\n* \u0027for-linus\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/roland/infiniband:\n RDMA/cma: Save PID of ID\u0027s owner\n RDMA/cma: Add support for netlink statistics export\n RDMA/cma: Pass QP type into rdma_create_id()\n RDMA: Update exported headers list\n RDMA/cma: Export enum cma_state in \u003crdma/rdma_cm.h\u003e\n RDMA/nes: Add a check for strict_strtoul()\n RDMA/cxgb3: Don\u0027t post zero-byte read if endpoint is going away\n RDMA/cxgb4: Use completion objects for event blocking\n IB/srp: Fix integer -\u003e pointer cast warnings\n IB: Add devnode methods to cm_class and umad_class\n IB/mad: Return EPROTONOSUPPORT when an RDMA device lacks the QP required\n IB/uverbs: Add devnode method to set path/mode\n RDMA/ucma: Add .nodename/.mode to tell userspace where to create device node\n RDMA: Add netlink infrastructure\n RDMA: Add error handling to ib_core_init()\n" }, { "commit": "8dc4abdf4c82d0e1c47f14b6615406d31975ea66", "tree": "846f8c987c1b2a0baf7bd47f568100a4ce23dd6a", "parents": [ "04ea2f81973f55db715bfdac7dd258f8a8485a6d", "807838686eb9e40d73b8a3f2384881358f51fff0", "c337374bf23b88620bcc66a7a09f141cc640f548", "52f81dbaf1378faf64c3ecea5129cebf826ef126", "83e9502d8db142822f3302e6a46a45082d3a27b7", "737b94eb41cb99250ccce9148ca411b55d4dc96a", "71c29bd5c23559c9cabcca3bfb3152ecc5efcd75" ], "author": { "name": "Roland Dreier", "email": "roland@purestorage.com", "time": "Wed May 25 13:47:20 2011 -0700" }, "committer": { "name": "Roland Dreier", "email": "roland@purestorage.com", "time": "Wed May 25 13:47:20 2011 -0700" }, "message": "Merge branches \u0027cma\u0027, \u0027cxgb3\u0027, \u0027cxgb4\u0027, \u0027misc\u0027, \u0027nes\u0027, \u0027netlink\u0027, \u0027srp\u0027 and \u0027uverbs\u0027 into for-next\n" }, { "commit": "b26f9b9949013fec31b23c426fc463164ae08891", "tree": "072bbf5abb93baea33a4aebaad2381ff69563a0b", "parents": [ "9a7147b506ccae8552b0cf218b3c02982012eb4d" ], "author": { "name": "Sean Hefty", "email": "sean.hefty@intel.com", "time": "Thu Apr 01 17:08:41 2010 +0000" }, "committer": { "name": "Roland Dreier", "email": "roland@purestorage.com", "time": "Wed May 25 13:46:23 2011 -0700" }, "message": "RDMA/cma: Pass QP type into rdma_create_id()\n\nThe RDMA CM currently infers the QP type from the port space selected\nby the user. In the future (eg with RDMA_PS_IB or XRC), there may not\nbe a 1-1 correspondence between port space and QP type. For netlink\nexport of RDMA CM state, we want to export the QP type to userspace,\nso it is cleaner to explicitly associate a QP type to an ID.\n\nModify rdma_create_id() to allow the user to specify the QP type, and\nuse it to make our selections of datagram versus connected mode.\n\nSigned-off-by: Sean Hefty \u003csean.hefty@intel.com\u003e\nSigned-off-by: Roland Dreier \u003croland@purestorage.com\u003e\n" }, { "commit": "737b94eb41cb99250ccce9148ca411b55d4dc96a", "tree": "431b5c05c3140be705adc77307dce3fd1bdfdd26", "parents": [ "257313b2a87795e07a0bdf58d0fffbdba8b31051" ], "author": { "name": "Roland Dreier", "email": "roland@purestorage.com", "time": "Mon May 23 11:30:04 2011 -0700" }, "committer": { "name": "Roland Dreier", "email": "roland@purestorage.com", "time": "Mon May 23 11:30:04 2011 -0700" }, "message": "IB/srp: Fix integer -\u003e pointer cast warnings\n\nFix\n\n drivers/infiniband/ulp/srp/ib_srp.c: In function \u0027srp_handle_recv\u0027:\n drivers/infiniband/ulp/srp/ib_srp.c:1150: warning: cast to pointer from integer of different size\n drivers/infiniband/ulp/srp/ib_srp.c: In function \u0027srp_send_completion\u0027:\n drivers/infiniband/ulp/srp/ib_srp.c:1234: warning: cast to pointer from integer of different size\n\nby adding an intermediate cast to uintptr_t.\n\nSigned-off-by: Roland Dreier \u003croland@purestorage.com\u003e\nAcked-by: David Dillow \u003cdillowda@ornl.gov\u003e\n" }, { "commit": "3d96c74d8983b16bc7ecb196e61a2173fcc3f09f", "tree": "3ecb598a9e24e916854e43f7f0ce5016ebebc22e", "parents": [ "6204b47ec4394f7e472885c8d05d9cda96d97a25" ], "author": { "name": "Michał Mirosław", "email": "mirq-linux@rere.qmqm.pl", "time": "Tue Apr 19 00:43:20 2011 +0000" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Wed Apr 20 01:30:42 2011 -0700" }, "message": "net: infiniband/ulp/ipoib: convert to hw_features\n\nSigned-off-by: Michał Mirosław \u003cmirq-linux@rere.qmqm.pl\u003e\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "25985edcedea6396277003854657b5f3cb31a628", "tree": "f026e810210a2ee7290caeb737c23cb6472b7c38", "parents": [ "6aba74f2791287ec407e0f92487a725a25908067" ], "author": { "name": "Lucas De Marchi", "email": "lucas.demarchi@profusion.mobi", "time": "Wed Mar 30 22:57:33 2011 -0300" }, "committer": { "name": "Lucas De Marchi", "email": "lucas.demarchi@profusion.mobi", "time": "Thu Mar 31 11:26:23 2011 -0300" }, "message": "Fix common misspellings\n\nFixes generated by \u0027codespell\u0027 and manually reviewed.\n\nSigned-off-by: Lucas De Marchi \u003clucas.demarchi@profusion.mobi\u003e\n" }, { "commit": "0625bef6060fab4aab0e484130b59af5e9ac81bc", "tree": "2774beafe6bcab689ab5da5413726d8f8f606241", "parents": [ "a6a1d6485e77f28c11cdf943a3ed2a3fd83ac727", "ba82638247c10cfda32268c894f78f8124f54084" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Thu Mar 24 07:59:46 2011 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Thu Mar 24 07:59:46 2011 -0700" }, "message": "Merge branch \u0027for-linus\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/roland/infiniband\n\n* \u0027for-linus\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/roland/infiniband:\n IB: Increase DMA max_segment_size on Mellanox hardware\n IB/mad: Improve an error message so error code is included\n RDMA/nes: Don\u0027t print success message at level KERN_ERR\n RDMA/addr: Fix return of uninitialized ret value\n IB/srp: try to use larger FMR sizes to cover our mappings\n IB/srp: add support for indirect tables that don\u0027t fit in SRP_CMD\n IB/srp: rework mapping engine to use multiple FMR entries\n IB/srp: allow sg_tablesize to be set for each target\n IB/srp: move IB CM setup completion into its own function\n IB/srp: always avoid non-zero offsets into an FMR\n" }, { "commit": "be8b981453a4904399cb090c1660618e250092d8", "tree": "74def65115c67e7713fb5ca0a90d50b581abaa73", "parents": [ "c07d424d6118d528ef71b22b7424bfc359c307a5" ], "author": { "name": "David Dillow", "email": "dillowda@ornl.gov", "time": "Tue Jan 18 21:58:09 2011 -0500" }, "committer": { "name": "David Dillow", "email": "dillowda@ornl.gov", "time": "Tue Mar 15 19:41:30 2011 -0400" }, "message": "IB/srp: try to use larger FMR sizes to cover our mappings\n\nNow that we can get larger SG lists, we can take advantage of HCAs that\nallow us to use larger FMR sizes. In many cases, we can use up to 512\nentries, so start there and work our way down.\n\nSigned-off-by: David Dillow \u003cdillowda@ornl.gov\u003e\n" }, { "commit": "c07d424d6118d528ef71b22b7424bfc359c307a5", "tree": "1d61da8aea0fa80c2c7bc13b03d15ddb470bcfa6", "parents": [ "8f26c9ff9cd0317ad867bce972f69e0c6c2cbe3c" ], "author": { "name": "David Dillow", "email": "dillowda@ornl.gov", "time": "Sun Jan 16 13:57:10 2011 -0500" }, "committer": { "name": "David Dillow", "email": "dillowda@ornl.gov", "time": "Tue Mar 15 19:37:23 2011 -0400" }, "message": "IB/srp: add support for indirect tables that don\u0027t fit in SRP_CMD\n\nThis allows us to guarantee the ability to submit up to 8 MB requests\nbased on the current value of SCSI_MAX_SG_CHAIN_SEGMENTS. While FMR will\nusually condense the requests into 8 SG entries, it is imperative that\nthe target support external tables in case the FMR mapping fails or is\nnot supported.\n\nWe add a safety valve to allow targets without the needed support to\nreap the benefits of the large tables, but fail in a manner that lets\nthe user know that the data didn\u0027t make it to the device. The user must\nadd \"allow_ext_sg\u003d1\" to the target parameters to indicate that the\ntarget has the needed support.\n\nIf indirect_sg_entries is not specified in the modules options, then\nthe sg_tablesize for the target will default to cmd_sg_entries unless\noverridden by the target options.\n\nSigned-off-by: David Dillow \u003cdillowda@ornl.gov\u003e\n" }, { "commit": "8f26c9ff9cd0317ad867bce972f69e0c6c2cbe3c", "tree": "e130e878b4e13cbac4892011cc18aa8fef5257fb", "parents": [ "4924864404d0ce2c32a6d20b27b5b6fcb31e481d" ], "author": { "name": "David Dillow", "email": "dillowda@ornl.gov", "time": "Fri Jan 14 19:45:50 2011 -0500" }, "committer": { "name": "David Dillow", "email": "dillowda@ornl.gov", "time": "Tue Mar 15 19:35:16 2011 -0400" }, "message": "IB/srp: rework mapping engine to use multiple FMR entries\n\nInstead of forcing all of the S/G entries to fit in one FMR, and falling\nback to indirect descriptors if that fails, allow the use of as many\nFMRs as needed to map the request. This lays the groundwork for allowing\nindirect descriptor tables that are larger than can fit in the command\nIU, but should marginally improve performance now by reducing the number\nof indirect descriptors needed.\n\nWe increase the minimum page size for the FMR pool to 4K, as larger\npages help increase the coverage of each FMR, and it is rare that the\nkernel would send down a request with scattered 512 byte fragments.\n\nThis patch also move some of the target initialization code afte the\nparsing of options, to keep it together with the new code that needs to\nallocate memory based on the options given.\n\nSigned-off-by: David Dillow \u003cdillowda@ornl.gov\u003e\n" }, { "commit": "4924864404d0ce2c32a6d20b27b5b6fcb31e481d", "tree": "2157ed7ed90b1fddf4013c560467082374d7c688", "parents": [ "961e0be89a5120a1409ebc525cca6f603615a8a8" ], "author": { "name": "David Dillow", "email": "dillowda@ornl.gov", "time": "Fri Jan 14 18:23:24 2011 -0500" }, "committer": { "name": "David Dillow", "email": "dillowda@ornl.gov", "time": "Tue Mar 15 19:35:05 2011 -0400" }, "message": "IB/srp: allow sg_tablesize to be set for each target\n\nDifferent configurations of target software allow differing max sizes of\nthe command IU. Allowing this to be changed per-target allows all\ntargets on an initiator to get an optimal setting.\n\nWe deprecate srp_sg_tablesize and replace it with cmd_sg_entries in\npreparation for allowing more indirect descriptors than can fit in the\nIU.\n\nSigned-off-by: David Dillow \u003cdillowda@ornl.gov\u003e\n" }, { "commit": "961e0be89a5120a1409ebc525cca6f603615a8a8", "tree": "4a56b84ef3a6aee8b0c23bdd4c8bf92f3e1b7110", "parents": [ "8c4037b501acd2ec3abc7925e66af8af40a2da9d" ], "author": { "name": "David Dillow", "email": "dillowda@ornl.gov", "time": "Fri Jan 14 17:32:07 2011 -0500" }, "committer": { "name": "David Dillow", "email": "dillowda@ornl.gov", "time": "Tue Mar 15 19:34:48 2011 -0400" }, "message": "IB/srp: move IB CM setup completion into its own function\n\nThis is to clean up prior to further changes.\n\nSigned-off-by: David Dillow \u003cdillowda@ornl.gov\u003e\n" }, { "commit": "8c4037b501acd2ec3abc7925e66af8af40a2da9d", "tree": "49c39371ceef4a32c760a26edcf62f920e4f80f7", "parents": [ "521cb40b0c44418a4fd36dc633f575813d59a43d" ], "author": { "name": "David Dillow", "email": "dillowda@ornl.gov", "time": "Fri Jan 14 17:02:23 2011 -0500" }, "committer": { "name": "David Dillow", "email": "dillowda@ornl.gov", "time": "Tue Mar 15 19:34:28 2011 -0400" }, "message": "IB/srp: always avoid non-zero offsets into an FMR\n\nIt is unclear exactly how this code works around Mellanox SRP targets,\nor if the problem is on the target side or in the HCA itself. In an\nabundance of caution, we should always enable the workaround.\n\nSigned-off-by: David Dillow \u003cdillowda@ornl.gov\u003e\n" }, { "commit": "7c53c6f89d7a6487986c51cd73ae9a9be338a8f4", "tree": "b1762d88f6906093be6cb80b9c8a4607d973e764", "parents": [ "d8585bcd7da071f4278710f1c39e18dfe7cb0280" ], "author": { "name": "Mike Christie", "email": "michaelc@cs.wisc.edu", "time": "Wed Feb 16 15:04:40 2011 -0600" }, "committer": { "name": "James Bottomley", "email": "James.Bottomley@suse.de", "time": "Thu Feb 24 12:41:23 2011 -0500" }, "message": "[SCSI] iser: export addr and port\n\nThis pactch has iser export the address and port\nof the endpoint.\n\nSigned-off-by: Mike Christie \u003cmichaelc@cs.wisc.edu\u003e\nSigned-off-by: James Bottomley \u003cJames.Bottomley@suse.de\u003e\n" }, { "commit": "6a108a14fa356ef607be308b68337939e56ea94e", "tree": "1bf260572bd8f95ed867307a2bcf5d881c8ae4a6", "parents": [ "12fcdba1b7ae8b25696433f420b775aeb556d89b" ], "author": { "name": "David Rientjes", "email": "rientjes@google.com", "time": "Thu Jan 20 14:44:16 2011 -0800" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Thu Jan 20 17:02:05 2011 -0800" }, "message": "kconfig: rename CONFIG_EMBEDDED to CONFIG_EXPERT\n\nThe meaning of CONFIG_EMBEDDED has long since been obsoleted; the option\nis used to configure any non-standard kernel with a much larger scope than\nonly small devices.\n\nThis patch renames the option to CONFIG_EXPERT in init/Kconfig and fixes\nreferences to the option throughout the kernel. A new CONFIG_EMBEDDED\noption is added that automatically selects CONFIG_EXPERT when enabled and\ncan be used in the future to isolate options that should only be\nconsidered for embedded systems (RISC architectures, SLOB, etc).\n\nCalling the option \"EXPERT\" more accurately represents its intention: only\nexpert users who understand the impact of the configuration changes they\nare making should enable it.\n\nReviewed-by: Ingo Molnar \u003cmingo@elte.hu\u003e\nAcked-by: David Woodhouse \u003cdavid.woodhouse@intel.com\u003e\nSigned-off-by: David Rientjes \u003crientjes@google.com\u003e\nCc: Greg KH \u003cgregkh@suse.de\u003e\nCc: \"David S. Miller\" \u003cdavem@davemloft.net\u003e\nCc: Jens Axboe \u003caxboe@kernel.dk\u003e\nCc: Arnd Bergmann \u003carnd@arndb.de\u003e\nCc: Robin Holt \u003cholt@sgi.com\u003e\nCc: \u003clinux-arch@vger.kernel.org\u003e\nSigned-off-by: Andrew Morton \u003cakpm@linux-foundation.org\u003e\nSigned-off-by: Linus Torvalds \u003ctorvalds@linux-foundation.org\u003e\n" }, { "commit": "4790f4dc5f4326dab5d81ed8fb8c9473e620bdbb", "tree": "72d5bbcdc8aa72c4e48a81ce33be5ed797093224", "parents": [ "f06267104dd9112f11586830d22501d0e26245ea", "da995a8aee044bc5d0847e19e351cd48a2cb8bcc", "eb4a7cbf27082bea34764bab3bc85595683f967b", "843276ad985cb59212ceb70d989474521ff516f6", "695b83495e2fba9d3a883193cfc9d5eefa96a911" ], "author": { "name": "Roland Dreier", "email": "rolandd@cisco.com", "time": "Sun Jan 16 21:22:41 2011 -0800" }, "committer": { "name": "Roland Dreier", "email": "rolandd@cisco.com", "time": "Sun Jan 16 21:22:41 2011 -0800" }, "message": "Merge branches \u0027misc\u0027, \u0027mlx4\u0027, \u0027mthca\u0027, \u0027nes\u0027 and \u0027srp\u0027 into for-next\n" }, { "commit": "f06267104dd9112f11586830d22501d0e26245ea", "tree": "8f7c364abc84a5f69269974eaa2b955b24d8f421", "parents": [ "948579cd8c6ea7c8c98c52b79f4470952e182ebd" ], "author": { "name": "Tejun Heo", "email": "tj@kernel.org", "time": "Tue Oct 19 15:24:36 2010 +0000" }, "committer": { "name": "Roland Dreier", "email": "rolandd@cisco.com", "time": "Sun Jan 16 21:16:31 2011 -0800" }, "message": "RDMA: Update workqueue usage\n\n* ib_wq is added, which is used as the common workqueue for infiniband\n instead of the system workqueue. All system workqueue usages\n including flush_scheduled_work() callers are converted to use and\n flush ib_wq.\n\n* cancel_delayed_work() + flush_scheduled_work() converted to\n cancel_delayed_work_sync().\n\n* qib_wq is removed and ib_wq is used instead.\n\nThis is to prepare for deprecation of flush_scheduled_work().\n\nSigned-off-by: Tejun Heo \u003ctj@kernel.org\u003e\nSigned-off-by: Roland Dreier \u003crolandd@cisco.com\u003e\n" }, { "commit": "695b83495e2fba9d3a883193cfc9d5eefa96a911", "tree": "23c03ec4fc840d6df5c038fe7eb49e224123f081", "parents": [ "4162cf64973df51fc885825bc9ca4d055891c49f" ], "author": { "name": "Bart Van Assche", "email": "bvanassche@acm.org", "time": "Thu Jan 13 19:02:25 2011 +0000" }, "committer": { "name": "Roland Dreier", "email": "rolandd@cisco.com", "time": "Thu Jan 13 14:00:43 2011 -0800" }, "message": "IB/srp: Test only once whether iu allocation succeeded\n\nMerge the two tests in srp_queuecommand() of whether information unit\nallocation succeeded into one. An intended side effect of this change\nis that we fix the warning:\n\n drivers/infiniband/ulp/srp/ib_srp.c: In function \u0027srp_queuecommand\u0027:\n drivers/infiniband/ulp/srp/ib_srp.c:1116: warning: \u0027req\u0027 may be used uninitialized in this function\n\n(seen with CONFIG_CC_OPTIMIZE_FOR_SIZE\u003dy at least with gcc 4.4.4)\n\nSigned-off-by: Bart Van Assche \u003cbvanassche@acm.org\u003e\nAcked-by: David Dillow \u003cdillowda@ornl.gov\u003e\nSigned-off-by: Roland Dreier \u003crolandd@cisco.com\u003e\n" }, { "commit": "948579cd8c6ea7c8c98c52b79f4470952e182ebd", "tree": "77e85adbdd07be8394fa60d08d3f1dbda3c67393", "parents": [ "4162cf64973df51fc885825bc9ca4d055891c49f" ], "author": { "name": "Joe Perches", "email": "joe@perches.com", "time": "Fri Nov 05 03:07:36 2010 +0000" }, "committer": { "name": "Roland Dreier", "email": "rolandd@cisco.com", "time": "Wed Jan 12 11:11:58 2011 -0800" }, "message": "RDMA: Use vzalloc() to replace vmalloc()+memset(0)\n\nSigned-off-by: Joe Perches \u003cjoe@perches.com\u003e\nSigned-off-by: Roland Dreier \u003crolandd@cisco.com\u003e\n" }, { "commit": "2b76c05794e66655e10633d2d78287854c991f63", "tree": "f6782ce9fc2f8e975189c7f6e47e1ac6ab75ea61", "parents": [ "db8b10167126d72829653690f57b9c7ca53c4d54", "1eba27e87a85f6ed68905055bc9a7dbfb024c255", "8ae31e5b1fc73751d800d551fb30340caa53c7dd", "1397490938aa0aca39001c3fd5a9fc9387110d86", "d0444f1527f22d193c209d4fdad0dbabbf2be2ee", "601d87b0795c5affe5b73318c1088edbf10ce72f", "4db62d4786e946e6fc8c2bb1f9201508f7f46c41", "9af762719e8f8fa282de02997dced593030eb238" ], "author": { "name": "Roland Dreier", "email": "rolandd@cisco.com", "time": "Mon Jan 10 17:43:30 2011 -0800" }, "committer": { "name": "Roland Dreier", "email": "rolandd@cisco.com", "time": "Mon Jan 10 17:43:30 2011 -0800" }, "message": "Merge branches \u0027cxgb4\u0027, \u0027ipath\u0027, \u0027ipoib\u0027, \u0027mlx4\u0027, \u0027mthca\u0027, \u0027nes\u0027, \u0027qib\u0027 and \u0027srp\u0027 into for-next\n" }, { "commit": "8ae31e5b1fc73751d800d551fb30340caa53c7dd", "tree": "d615fd6f91f150427bf143936fb686f38609cf06", "parents": [ "19e364f6801e38972673278adedaab1abf6f854c" ], "author": { "name": "Or Gerlitz", "email": "ogerlitz@voltaire.com", "time": "Mon Jan 10 17:41:55 2011 -0800" }, "committer": { "name": "Roland Dreier", "email": "rolandd@cisco.com", "time": "Mon Jan 10 17:41:55 2011 -0800" }, "message": "IPoIB: Add GRO support\n\nSigned-off-by: Or Gerlitz \u003cogerlitz@voltaire.com\u003e\nSigned-off-by: Roland Dreier \u003crolandd@cisco.com\u003e\n" }, { "commit": "19e364f6801e38972673278adedaab1abf6f854c", "tree": "ba2d39f4f449e9b1e911e6d5cbc39e08e54410c3", "parents": [ "3c0eee3fe6a3a1c745379547c7e7c904aa64f6d5" ], "author": { "name": "Or Gerlitz", "email": "ogerlitz@voltaire.com", "time": "Mon Jan 10 17:41:54 2011 -0800" }, "committer": { "name": "Roland Dreier", "email": "rolandd@cisco.com", "time": "Mon Jan 10 17:41:54 2011 -0800" }, "message": "IPoIB: Remove LRO support\n\nAs a first step in moving from LRO to GRO, revert commit af40da894e9\n(\"IPoIB: add LRO support\"). Also eliminate the ethtool set_flags\ncallback which isn\u0027t needed anymore. Finally, we need to include\n\u003clinux/sched.h\u003e directly to get the declaration of restart_syscall()\n(which used to be included implicitly through \u003clinux/inet_lro.h\u003e).\n\nCc: Ben Hutchings \u003cbhutchings@solarflare.com\u003e\nCc: Eric W. Biederman \u003cebiederm@xmission.com\u003e\nCc: Vladimir Sokolovsky \u003cvlad@mellanox.co.il\u003e\nSigned-off-by: Or Gerlitz \u003cogerlitz@voltaire.com\u003e\nSigned-off-by: Roland Dreier \u003crolandd@cisco.com\u003e\n" }, { "commit": "9af762719e8f8fa282de02997dced593030eb238", "tree": "707ebec104ed79499935fe6367357121fbb6906e", "parents": [ "e9684678221441f886b4d7c74f8770bb0981737a" ], "author": { "name": "David Dillow", "email": "dillowda@ornl.gov", "time": "Fri Nov 26 15:34:46 2010 -0500" }, "committer": { "name": "David Dillow", "email": "dillowda@ornl.gov", "time": "Mon Jan 10 15:44:51 2011 -0500" }, "message": "IB/srp: consolidate hot-path variables into cache lines\n\nPut the variables accessed together in the hot-path into common\ncachelines, and separate them by RW vs RO to avoid false dirtying.\nWe keep a local copy of the lkey and rkey in the target to avoid\ntraversing pointers (and associated cache lines) to find them.\n\nReviewed-by: Bart Van Assche \u003cbvanassche@acm.org\u003e\nSigned-off-by: David Dillow \u003cdillowda@ornl.gov\u003e\n" }, { "commit": "e9684678221441f886b4d7c74f8770bb0981737a", "tree": "76ed83fb7dd41c84c2b8e08b785a802e99c6e790", "parents": [ "94a9174c630c8465ed9e97ecd242993429930c05" ], "author": { "name": "Bart Van Assche", "email": "bvanassche@acm.org", "time": "Fri Nov 26 15:08:38 2010 -0500" }, "committer": { "name": "David Dillow", "email": "dillowda@ornl.gov", "time": "Mon Jan 10 15:44:50 2011 -0500" }, "message": "IB/srp: stop sharing the host lock with SCSI\n\nWe don\u0027t need protection against the SCSI stack, so use our own lock to\nallow parallel progress on separate CPUs.\n\nSigned-off-by: Bart Van Assche \u003cbvanassche@acm.org\u003e\n[ broken out and small cleanups by David Dillow ]\nSigned-off-by: David Dillow \u003cdillowda@ornl.gov\u003e\n" }, { "commit": "94a9174c630c8465ed9e97ecd242993429930c05", "tree": "73ddbe0024d54bad543c90144576148b70922eea", "parents": [ "76c75b258f1fe6abac6af2356989ad4d6518886e" ], "author": { "name": "Bart Van Assche", "email": "bvanassche@acm.org", "time": "Fri Nov 26 14:50:09 2010 -0500" }, "committer": { "name": "David Dillow", "email": "dillowda@ornl.gov", "time": "Mon Jan 10 15:44:50 2011 -0500" }, "message": "IB/srp: reduce lock coverage of command completion\n\nWe only need the lock to cover list and credit manipulations, so push\nthose into srp_remove_req() and update the call chains.\n\nWe reorder the request removal and command completion in\nsrp_process_rsp() to avoid the SCSI mid-layer sending another command\nbefore we\u0027ve released our request and added any credits returned by the\ntarget. This prevents us from returning HOST_BUSY unneccesarily.\n\nSigned-off-by: Bart Van Assche \u003cbvanassche@acm.org\u003e\n[ broken out, small cleanups, and modified to avoid potential extraneous\n HOST_BUSY returns by David Dillow ]\nSigned-off-by: David Dillow \u003cdillowda@ornl.gov\u003e\n" }, { "commit": "76c75b258f1fe6abac6af2356989ad4d6518886e", "tree": "754db154ad76e44b5ecc6da71097a6f1c096ec6f", "parents": [ "536ae14e7588e85203d4b4147c041309be5b3efb" ], "author": { "name": "Bart Van Assche", "email": "bvanassche@acm.org", "time": "Fri Nov 26 14:37:47 2010 -0500" }, "committer": { "name": "David Dillow", "email": "dillowda@ornl.gov", "time": "Mon Jan 10 15:44:49 2011 -0500" }, "message": "IB/srp: reduce local coverage for command submission and EH\n\nWe only need locks to protect our lists and number of credits available.\nBy pre-consuming the credit for the request, we can reduce our lock\ncoverage to just those areas. If we don\u0027t actually send the request,\nwe\u0027ll need to put the credit back into the pool.\n\nSigned-off-by: Bart Van Assche \u003cbvanassche@acm.org\u003e\n[ broken out and small cleanups by David Dillow ]\nSigned-off-by: David Dillow \u003cdillowda@ornl.gov\u003e\n" }, { "commit": "536ae14e7588e85203d4b4147c041309be5b3efb", "tree": "9a7e459a914e138d0b02487c7ab40ae9ffe6c05c", "parents": [ "dcb4cb85f4b7caac9769bce464fef16306a4758c" ], "author": { "name": "Bart Van Assche", "email": "bvanassche@acm.org", "time": "Fri Nov 26 13:58:27 2010 -0500" }, "committer": { "name": "David Dillow", "email": "dillowda@ornl.gov", "time": "Mon Jan 10 15:44:42 2011 -0500" }, "message": "IB/srp: don\u0027t move active requests to their own list\n\nWe use req-\u003escmnd !\u003d NULL to indicate an active request, so there\u0027s no\nneed to keep a separate list for them. We can afford the array iteration\nduring error handling, and dropping it gives us one less item that needs\nlock protection.\n\nSigned-off-by: Bart Van Assche \u003cbvanassche@acm.org\u003e\n[ broken out and small cleanups by David Dillow ]\nSigned-off-by: David Dillow \u003cdillowda@ornl.gov\u003e\n" }, { "commit": "dcb4cb85f4b7caac9769bce464fef16306a4758c", "tree": "1c21889c8b778415f9a8d46fcf28853eb42ede18", "parents": [ "9709f0e05b827049733f439de82a4a1688b37b86" ], "author": { "name": "Bart Van Assche", "email": "bvanassche@acm.org", "time": "Fri Nov 26 13:22:48 2010 -0500" }, "committer": { "name": "David Dillow", "email": "dillowda@ornl.gov", "time": "Wed Jan 05 15:24:25 2011 -0500" }, "message": "IB/srp: allow lockless work posting\n\nOnly one CPU at a time will own an RX IU, so using the address of the IU\nas the work request cookie allows us to avoid taking a lock. We can\nsimilarly prepare the TX path for lockless posting by moving the free TX\nIUs to a list. This also removes the requirement that the queue sizes be\na power of 2.\n\nSigned-off-by: Bart Van Assche \u003cbvanassche@acm.org\u003e\n[ broken out, small cleanups, and modified to avoid needing an extra field\n in the IU by David Dillow]\nSigned-off-by: David Dillow \u003cdillowda@ornl.gov\u003e\n" }, { "commit": "9709f0e05b827049733f439de82a4a1688b37b86", "tree": "62bf3010092a46c6971eaef148719eee59d85074", "parents": [ "f8b6e31e4e46bf514c27fce38783ed5615cca01d" ], "author": { "name": "Bart Van Assche", "email": "bvanassche@acm.org", "time": "Fri Nov 26 13:13:06 2010 -0500" }, "committer": { "name": "David Dillow", "email": "dillowda@ornl.gov", "time": "Wed Jan 05 15:24:25 2011 -0500" }, "message": "IB/srp: consolidate state change code\n\nSigned-off-by: Bart Van Assche \u003cbvanassche@acm.org\u003e\n[ broken out and small cleanups by David Dillow ]\nSigned-off-by: David Dillow \u003cdillowda@ornl.gov\u003e\n" }, { "commit": "f8b6e31e4e46bf514c27fce38783ed5615cca01d", "tree": "0ae9afcb65749e36034b6de03abe5fd51c5dc7b0", "parents": [ "3c0eee3fe6a3a1c745379547c7e7c904aa64f6d5" ], "author": { "name": "David Dillow", "email": "dillowda@ornl.gov", "time": "Fri Nov 26 13:02:21 2010 -0500" }, "committer": { "name": "David Dillow", "email": "dillowda@ornl.gov", "time": "Wed Jan 05 15:24:25 2011 -0500" }, "message": "IB/srp: allow task management without a previous request\n\nWe can only have one task management comment outstanding, so move the\ncompletion and status to the target port. This allows us to handle\nresets of a LUN without a corresponding request having been sent.\nMeanwhile, we don\u0027t need to play games with host_scribble, just use it\nas the pointer it is.\n\nThis fixes a crash when we issue a bus reset using sg_reset.\n\nFixes: https://bugzilla.kernel.org/show_bug.cgi?id\u003d13893\nReported-by: Bart Van Assche \u003cbvanassche@acm.org\u003e\nReviewed-by: Bart Van Assche \u003cbvanassche@acm.org\u003e\nSigned-off-by: David Dillow \u003cdillowda@ornl.gov\u003e\n" }, { "commit": "f281233d3eba15fb225d21ae2e228fd4553d824a", "tree": "51134454ba8acb558735f90be5540f7d756483e3", "parents": [ "bdbd01ac444bffb3c9aefed3059d12554059b320" ], "author": { "name": "Jeff Garzik", "email": "jeff@garzik.org", "time": "Tue Nov 16 02:10:29 2010 -0500" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Tue Nov 16 13:33:23 2010 -0800" }, "message": "SCSI host lock push-down\n\nMove the mid-layer\u0027s -\u003equeuecommand() invocation from being locked\nwith the host lock to being unlocked to facilitate speeding up the\ncritical path for drivers who don\u0027t need this lock taken anyway.\n\nThe patch below presents a simple SCSI host lock push-down as an\nequivalent transformation. No locking or other behavior should change\nwith this patch. All existing bugs and locking orders are preserved.\n\nAdditionally, add one parameter to queuecommand,\n\tstruct Scsi_Host *\nand remove one parameter from queuecommand,\n\tvoid (*done)(struct scsi_cmnd *)\n\nScsi_Host* is a convenient pointer that most host drivers need anyway,\nand \u0027done\u0027 is redundant to struct scsi_cmnd-\u003escsi_done.\n\nMinimal code disturbance was attempted with this change. Most drivers\nneeded only two one-line modifications for their host lock push-down.\n\nSigned-off-by: Jeff Garzik \u003cjgarzik@redhat.com\u003e\nAcked-by: James Bottomley \u003cJames.Bottomley@suse.de\u003e\nSigned-off-by: Linus Torvalds \u003ctorvalds@linux-foundation.org\u003e\n" }, { "commit": "9e5fca251f44832cb996961048ea977f80faf6ea", "tree": "05d1df04502478ed71b78f63a861aa5cc67ef773", "parents": [ "56083ab17e0075e538270823c374b59cc97e73b9", "116e9535fe5e00bafab7a637f306b110cf95cff5" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Tue Oct 26 17:54:22 2010 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Tue Oct 26 17:54:22 2010 -0700" }, "message": "Merge branch \u0027for-linus\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/roland/infiniband\n\n* \u0027for-linus\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/roland/infiniband: (63 commits)\n IB/qib: clean up properly if pci_set_consistent_dma_mask() fails\n IB/qib: Allow driver to load if PCIe AER fails\n IB/qib: Fix uninitialized pointer if CONFIG_PCI_MSI not set\n IB/qib: Fix extra log level in qib_early_err()\n RDMA/cxgb4: Remove unnecessary KERN_\u003clevel\u003e use\n RDMA/cxgb3: Remove unnecessary KERN_\u003clevel\u003e use\n IB/core: Add link layer type information to sysfs\n IB/mlx4: Add VLAN support for IBoE\n IB/core: Add VLAN support for IBoE\n IB/mlx4: Add support for IBoE\n mlx4_en: Change multicast promiscuous mode to support IBoE\n mlx4_core: Update data structures and constants for IBoE\n mlx4_core: Allow protocol drivers to find corresponding interfaces\n IB/uverbs: Return link layer type to userspace for query port operation\n IB/srp: Sync buffer before posting send\n IB/srp: Use list_first_entry()\n IB/srp: Reduce number of BUSY conditions\n IB/srp: Eliminate two forward declarations\n IB/mlx4: Signal node desc changes to SM by using FW to generate trap 144\n IB: Replace EXTRA_CFLAGS with ccflags-y\n ...\n" }, { "commit": "732eacc0542d0aa48797f675888b85d6065af837", "tree": "53205cea4b99cc8dfed8f59438cf4214ef6546ad", "parents": [ "f27c85c56b32c42bcc54a43189c1e00fdceb23ec" ], "author": { "name": "Hagen Paul Pfeifer", "email": "hagen@jauu.net", "time": "Tue Oct 26 14:22:23 2010 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Tue Oct 26 16:52:12 2010 -0700" }, "message": "replace nested max/min macros with {max,min}3 macro\n\nUse the new {max,min}3 macros to save some cycles and bytes on the stack.\nThis patch substitutes trivial nested macros with their counterpart.\n\nSigned-off-by: Hagen Paul Pfeifer \u003chagen@jauu.net\u003e\nCc: Joe Perches \u003cjoe@perches.com\u003e\nCc: Ingo Molnar \u003cmingo@elte.hu\u003e\nCc: Hartley Sweeten \u003chsweeten@visionengravers.com\u003e\nCc: Russell King \u003clinux@arm.linux.org.uk\u003e\nCc: Benjamin Herrenschmidt \u003cbenh@kernel.crashing.org\u003e\nCc: Thomas Gleixner \u003ctglx@linutronix.de\u003e\nCc: Herbert Xu \u003cherbert@gondor.apana.org.au\u003e\nCc: Roland Dreier \u003crolandd@cisco.com\u003e\nCc: Sean Hefty \u003csean.hefty@intel.com\u003e\nCc: Pekka Enberg \u003cpenberg@cs.helsinki.fi\u003e\nSigned-off-by: Andrew Morton \u003cakpm@linux-foundation.org\u003e\nSigned-off-by: Linus Torvalds \u003ctorvalds@linux-foundation.org\u003e\n" }, { "commit": "116e9535fe5e00bafab7a637f306b110cf95cff5", "tree": "59ab246aae5c0fc871434a50ad1eb42fce0af0b4", "parents": [ "fc4ec9bd82dbe08499d801f45a1d49e4c7b66b20", "97cb7e40c69618ba03030b467faf60dc3ee982ee", "ca7cf94f8bf77bf0dfb35b615d82ac76a0ed77ff", "aa1ad26089a90d5b7e2c908835ba6dc930eed019", "625fbd3a36d836efaaee4b6d9c2fcd25e3654624", "8ad330a002ffbc422f32a77398666832f0df8a3d", "c3aa9b186b95025d4ba4e90d6140c9887dfaae0a", "7454159d3c01371c1abed9d941044d95d2efde97", "d0d68b8693bd16bfbbc93b89f1d9f3351723307c", "52106bd24c8d5e8a26b98ad93a755b0827029860", "2ca78d23a758d3299abd128556debff4c1fefb16", "19081f31ce941a22bfc681d18ae2d31e31084df5" ], "author": { "name": "Roland Dreier", "email": "rolandd@cisco.com", "time": "Tue Oct 26 16:09:11 2010 -0700" }, "committer": { "name": "Roland Dreier", "email": "rolandd@cisco.com", "time": "Tue Oct 26 16:09:11 2010 -0700" }, "message": "Merge branches \u0027amso1100\u0027, \u0027cma\u0027, \u0027cxgb3\u0027, \u0027cxgb4\u0027, \u0027ehca\u0027, \u0027iboe\u0027, \u0027ipoib\u0027, \u0027misc\u0027, \u0027mlx4\u0027, \u0027nes\u0027, \u0027qib\u0027 and \u0027srp\u0027 into for-next\n" }, { "commit": "19081f31ce941a22bfc681d18ae2d31e31084df5", "tree": "c544fc751f6e4fa056f8ad64e3700fc6c8caa787", "parents": [ "21c1a90769e680e7c1f49bae4c5804cf0c7bc814" ], "author": { "name": "David Dillow", "email": "dillowda@ornl.gov", "time": "Mon Oct 18 08:54:49 2010 -0400" }, "committer": { "name": "Roland Dreier", "email": "rolandd@cisco.com", "time": "Sun Oct 24 22:14:23 2010 -0700" }, "message": "IB/srp: Sync buffer before posting send\n\nsrp_send_tsk_mgmt() was missing the proper DMA sync calls before posting\nthe buffer to the device.\n\nSigned-off-by: David Dillow \u003cdillowda@ornl.gov\u003e\nSigned-off-by: Roland Dreier \u003crolandd@cisco.com\u003e\n" }, { "commit": "21c1a90769e680e7c1f49bae4c5804cf0c7bc814", "tree": "917996eb13d0ab93163f26e4824c0d7b2e1bec34", "parents": [ "7ade400aba9a675b610074d6609658661db07eeb" ], "author": { "name": "Bart Van Assche", "email": "bvanassche@acm.org", "time": "Mon Aug 30 19:27:40 2010 +0000" }, "committer": { "name": "Roland Dreier", "email": "rolandd@cisco.com", "time": "Sun Oct 24 22:14:19 2010 -0700" }, "message": "IB/srp: Use list_first_entry()\n\nUse the list_first_entry() macro in ib_srp instead of open-coding the equivalent,\nwhich makes the source code slightly more descriptive. The list_first_entry()\nmacro itself was introduced in kernel 2.6.22.\n\nSigned-off-by: Bart Van Assche \u003cbvanassche@acm.org\u003e\nSigned-off-by: David Dillow \u003cdillowda@ornl.gov\u003e\nSigned-off-by: Roland Dreier \u003crolandd@cisco.com\u003e\n" }, { "commit": "7ade400aba9a675b610074d6609658661db07eeb", "tree": "609a1370a1a8d416c789905c17607bd8d31c6242", "parents": [ "05a1d7504f836ee67e27f2488cb5b8126b51dbd4" ], "author": { "name": "Bart Van Assche", "email": "bvanassche@acm.org", "time": "Mon Aug 30 19:27:36 2010 +0000" }, "committer": { "name": "Roland Dreier", "email": "rolandd@cisco.com", "time": "Sun Oct 24 22:14:14 2010 -0700" }, "message": "IB/srp: Reduce number of BUSY conditions\n\nAs proposed by the SRP (draft) standard, ib_srp reserves one ring\nelement for SRP_TSK_MGMT requests. This patch makes sure that the SCSI\nmid-layer never tries to queue more than (SRP request limit) - 1 SCSI\ncommands to ib_srp. This improves performance for targets whose request\nlimit is less than or equal to SRP_NORMAL_REQ_SQ_SIZE by reducing the\nnumber of BUSY responses reported by ib_srp to the SCSI mid-layer.\n\nSigned-off-by: Bart Van Assche \u003cbvanassche@acm.org\u003e\nSigned-off-by: David Dillow \u003cdillowda@ornl.gov\u003e\nSigned-off-by: Roland Dreier \u003crolandd@cisco.com\u003e\n" }, { "commit": "05a1d7504f836ee67e27f2488cb5b8126b51dbd4", "tree": "029c9e682a7070e1323bf71e0ca6977e54f5b64b", "parents": [ "bb12588a38e6db85e01dceadff7bc161fc92e7d2" ], "author": { "name": "David Dillow", "email": "dillowda@ornl.gov", "time": "Fri Oct 08 14:48:14 2010 -0400" }, "committer": { "name": "Roland Dreier", "email": "rolandd@cisco.com", "time": "Sun Oct 24 22:14:08 2010 -0700" }, "message": "IB/srp: Eliminate two forward declarations\n\nSigned-off-by: David Dillow \u003cdillowda@ornl.gov\u003e\nSigned-off-by: Roland Dreier \u003crolandd@cisco.com\u003e\n" }, { "commit": "c3aa9b186b95025d4ba4e90d6140c9887dfaae0a", "tree": "1ab36ff2660cb642362c4da3cc1f01b0545c6616", "parents": [ "fed1db33fe85573487a4732d628ac5afdb5dc776" ], "author": { "name": "Eli Cohen", "email": "eli@dev.mellanox.co.il", "time": "Mon Sep 20 07:05:06 2010 +0000" }, "committer": { "name": "Roland Dreier", "email": "rolandd@cisco.com", "time": "Sat Oct 23 13:35:48 2010 -0700" }, "message": "IPoIB: Set dev_id field of net_device\n\nUse the net device\u0027s dev_id field to encode the port number of the pci\ndevice. This can be used to to associate a net device with the pci\ndevice\u0027s port. The encoding is: dev_id \u003d port - 1.\n\nSigned-off-by: Eli Cohen \u003celi@mellanox.co.il\u003e\nSigned-off-by: Roland Dreier \u003crolandd@cisco.com\u003e\n" }, { "commit": "bb12588a38e6db85e01dceadff7bc161fc92e7d2", "tree": "6cf9f3b90cc1118aa2fcd716537916524384d428", "parents": [ "dd5e6e38b2b8bd8bf71cae800e2b613e85ef1522" ], "author": { "name": "David Dillow", "email": "dillowda@ornl.gov", "time": "Fri Oct 08 14:40:47 2010 -0400" }, "committer": { "name": "Roland Dreier", "email": "rolandd@cisco.com", "time": "Fri Oct 22 22:19:10 2010 -0700" }, "message": "IB/srp: Implement SRP_CRED_REQ and SRP_AER_REQ\n\nThis patch adds support for SRP_CRED_REQ to avoid a lockup by targets\nthat use that mechanism to return credits to the initiator. This\nprevents a lockup observed in the field where we would never add the\ncredits from the SRP_CRED_REQ to our current count, and would therefore\nnever send another command to the target.\n\nMinimal support for SRP_AER_REQ is also added, as these messages can\nalso be used to convey additional credits to the initiator.\n\nBased upon extensive debugging and code by Bart Van Assche and a bug\nreport by Chris Worley.\n\nSigned-off-by: David Dillow \u003cdillowda@ornl.gov\u003e\nSigned-off-by: Roland Dreier \u003crolandd@cisco.com\u003e\n" }, { "commit": "dd5e6e38b2b8bd8bf71cae800e2b613e85ef1522", "tree": "da3ec14113d5f7b235df82de87ec9831e4991a1c", "parents": [ "fb50a83d8c7cf8c6548166fe6775ad4f41e5ab72" ], "author": { "name": "Bart Van Assche", "email": "bvanassche@acm.org", "time": "Mon Aug 30 19:27:20 2010 +0000" }, "committer": { "name": "Roland Dreier", "email": "rolandd@cisco.com", "time": "Fri Oct 22 22:19:10 2010 -0700" }, "message": "IB/srp: Preparation for transmit ring response allocation\n\nThe transmit ring in ib_srp (srp_target.tx_ring) is currently only used\nfor allocating requests sent by the initiator to the target. This patch\nprepares using that ring for allocation of both requests and responses.\nAlso, this patch differentiates the uses of SRP_SQ_SIZE, increases the\nsize of the IB send completion queue by one element and reserves one\ntransmit ring slot for SRP_TSK_MGMT requests.\n\nSigned-off-by: Bart Van Assche \u003cbvanassche@acm.org\u003e\nSigned-off-by: David Dillow \u003cdillowda@ornl.gov\u003e\nSigned-off-by: Roland Dreier \u003crolandd@cisco.com\u003e\n" }, { "commit": "631dd1a885b6d7e9f6f51b4e5b311c2bb04c323c", "tree": "c431fa3479c1d35842fb5635ed7ccd487d063a62", "parents": [ "d7eccbbae84b2ee7dbb756e60287c4b47071444e" ], "author": { "name": "Justin P. Mattock", "email": "justinmattock@gmail.com", "time": "Mon Oct 18 11:03:14 2010 +0200" }, "committer": { "name": "Jiri Kosina", "email": "jkosina@suse.cz", "time": "Mon Oct 18 11:03:14 2010 +0200" }, "message": "Update broken web addresses in the kernel.\n\nThe patch below updates broken web addresses in the kernel\n\nSigned-off-by: Justin P. Mattock \u003cjustinmattock@gmail.com\u003e\nCc: Maciej W. Rozycki \u003cmacro@linux-mips.org\u003e\nCc: Geert Uytterhoeven \u003cgeert@linux-m68k.org\u003e\nCc: Finn Thain \u003cfthain@telegraphics.com.au\u003e\nCc: Randy Dunlap \u003crdunlap@xenotime.net\u003e\nCc: Matt Turner \u003cmattst88@gmail.com\u003e\nCc: Dimitry Torokhov \u003cdmitry.torokhov@gmail.com\u003e\nCc: Mike Frysinger \u003cvapier.adi@gmail.com\u003e\nAcked-by: Ben Pfaff \u003cblp@cs.stanford.edu\u003e\nAcked-by: Hans J. Koch \u003chjk@linutronix.de\u003e\nReviewed-by: Finn Thain \u003cfthain@telegraphics.com.au\u003e\nSigned-off-by: Jiri Kosina \u003cjkosina@suse.cz\u003e\n" }, { "commit": "7b4c876961ad6ddcfacd69b25fe7e13ff41fe322", "tree": "2e3ec1e0f2a5d6bbabb90d1db60d06bcb8413489", "parents": [ "a3f5adaf491490089215f863a61b9422fae902f8" ], "author": { "name": "Eli Cohen", "email": "eli@mellanox.co.il", "time": "Mon Sep 27 17:51:11 2010 -0700" }, "committer": { "name": "Roland Dreier", "email": "rolandd@cisco.com", "time": "Wed Oct 13 09:38:11 2010 -0700" }, "message": "IPoIB: Skip IBoE ports\n\nIPoIB is IP-over-Infiniband link layer. In the case of IBoE, the link\nlayer is Ethernet and IP can work directly over Ethernet, so disable\nIPoIB for non-IB_LINK_LAYER_INFINIBAND ports.\n\nSigned-off-by: Eli Cohen \u003celi@mellanox.co.il\u003e\nSigned-off-by: Roland Dreier \u003crolandd@cisco.com\u003e\n" }, { "commit": "fed1db33fe85573487a4732d628ac5afdb5dc776", "tree": "8eac764bb5ef07d472e9434ab1ba09f9605f5ade", "parents": [ "252a52aa4fa22a668f019e55b3aac3ff71ec1c29" ], "author": { "name": "Christoph Lameter", "email": "cl@linux.com", "time": "Fri Aug 27 08:29:38 2010 -0500" }, "committer": { "name": "Roland Dreier", "email": "rolandd@cisco.com", "time": "Tue Sep 28 11:09:23 2010 -0700" }, "message": "IPoIB: Set pkt_type correctly for multicast packets (fix IGMP breakage)\n\nIGMP processing is broken because the IPOIB does not set the\nskb-\u003epkt_type the right way for multicast traffic. All incoming\npackets are set to PACKET_HOST which means that igmp_recv() will\nignore the IGMP broadcasts/multicasts.\n\nThis in turn means that the IGMP timers are firing and are sending\ninformation about multicast subscriptions unnecessarily. In a large\nprivate network this can cause traffic spikes.\n\nSigned-off-by: Christoph Lameter \u003ccl@linux.com\u003e\nSigned-off-by: Roland Dreier \u003crolandd@cisco.com\u003e\n" }, { "commit": "3cc08fc35db75b059118626c30b60b0f56583802", "tree": "704d71199c8be8d5b822ca424675291e8cec7bde", "parents": [ "faa38b5e0e092914764cdba9f83d31a3f794d182", "03b37ecdb3975f09832747600853d3818a50eda3" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Sat Aug 07 17:08:02 2010 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Sat Aug 07 17:08:02 2010 -0700" }, "message": "Merge branch \u0027for-linus\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/roland/infiniband\n\n* \u0027for-linus\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/roland/infiniband: (42 commits)\n IB/qib: Add missing \u003clinux/slab.h\u003e include\n IB/ehca: Drop unnecessary NULL test\n RDMA/nes: Fix confusing if statement indentation\n IB/ehca: Init irq tasklet before irq can happen\n RDMA/nes: Fix misindented code\n RDMA/nes: Fix showing wqm_quanta\n RDMA/nes: Get rid of \"set but not used\" variables\n RDMA/nes: Read firmware version from correct place\n IB/srp: Export req_lim via sysfs\n IB/srp: Make receive buffer handling more robust\n IB/srp: Use print_hex_dump()\n IB: Rename RAW_ETY to RAW_ETHERTYPE\n RDMA/nes: Fix two sparse warnings\n RDMA/cxgb3: Make needlessly global iwch_l2t_send() static\n IB/iser: Make needlessly global iser_alloc_rx_descriptors() static\n RDMA/cxgb4: Add timeouts when waiting for FW responses\n IB/qib: Fix race between qib_error_qp() and receive packet processing\n IB/qib: Limit the number of packets processed per interrupt\n IB/qib: Allow writes to the diag_counters to be able to clear them\n IB/qib: Set cfgctxts to number of CPUs by default\n ...\n" }, { "commit": "03b37ecdb3975f09832747600853d3818a50eda3", "tree": "ab4f18cea42444620909a1fac6eda521dcde6bb1", "parents": [ "18199f573ee03e9265b3f5c45389742dae17607a", "a5f4a07820ebc60b21c984d893f48402c4b4a4a2", "2db00321815e20f4a7ff9df43f7cf2073085683d", "dccb816de38efe72becc5d7f90a5dfedcd6fd053", "a2ebf07ae53e65bd073f96877e4818f2e89271ae", "817979ac45679f0cb3f9fea6dc444e4097aa6892", "ba818afdc62590e95e45d63be96954ea568925bf", "89de74866b846cc48780fda3de7fd223296aaca9" ], "author": { "name": "Roland Dreier", "email": "rolandd@cisco.com", "time": "Thu Aug 05 14:27:14 2010 -0700" }, "committer": { "name": "Roland Dreier", "email": "rolandd@cisco.com", "time": "Thu Aug 05 14:27:14 2010 -0700" }, "message": "Merge branches \u0027cxgb3\u0027, \u0027cxgb4\u0027, \u0027ehca\u0027, \u0027ipath\u0027, \u0027misc\u0027, \u0027nes\u0027, \u0027qib\u0027 and \u0027srp\u0027 into for-next\n" }, { "commit": "89de74866b846cc48780fda3de7fd223296aaca9", "tree": "bdcaebc89fb60843fb8b881ed4a1dee7e064bc41", "parents": [ "c996bb47bb419b7c2f75499e11750142775e5da9" ], "author": { "name": "Bart Van Assche", "email": "bvanassche@acm.org", "time": "Tue Aug 03 14:08:45 2010 +0000" }, "committer": { "name": "Roland Dreier", "email": "rolandd@cisco.com", "time": "Wed Aug 04 13:02:26 2010 -0700" }, "message": "IB/srp: Export req_lim via sysfs\n\nExport req_lim via sysfs for debugging.\n\nSigned-off-by: Bart Van Assche \u003cbart.vanassche@gmail.com\u003e\nAcked-by: David Dillow \u003cdave@thedillows.org\u003e\nSigned-off-by: Roland Dreier \u003crolandd@cisco.com\u003e\n" }, { "commit": "6ba74014c1ab0e37af7de6f64b4eccbbae3cb9e7", "tree": "8f3892fc44f1e403675a6d7e88fda5c70e56ee4c", "parents": [ "5abd9ccced7a726c817dd6b5b96bc933859138d1", "3ff1c25927e3af61c6bf0e4ed959504058ae4565" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Wed Aug 04 11:47:58 2010 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Wed Aug 04 11:47:58 2010 -0700" }, "message": "Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-next-2.6\n\n* git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-next-2.6: (1443 commits)\n phy/marvell: add 88ec048 support\n igb: Program MDICNFG register prior to PHY init\n e1000e: correct MAC-PHY interconnect register offset for 82579\n hso: Add new product ID\n can: Add driver for esd CAN-USB/2 device\n l2tp: fix export of header file for userspace\n can-raw: Fix skb_orphan_try handling\n Revert \"net: remove zap_completion_queue\"\n net: cleanup inclusion\n phy/marvell: add 88e1121 interface mode support\n u32: negative offset fix\n net: Fix a typo from \"dev\" to \"ndev\"\n igb: Use irq_synchronize per vector when using MSI-X\n ixgbevf: fix null pointer dereference due to filter being set for VLAN 0\n e1000e: Fix irq_synchronize in MSI-X case\n e1000e: register pm_qos request on hardware activation\n ip_fragment: fix subtracting PPPOE_SES_HLEN from mtu twice\n net: Add getsockopt support for TCP thin-streams\n cxgb4: update driver version\n cxgb4: add new PCI IDs\n ...\n\nManually fix up conflicts in:\n - drivers/net/e1000e/netdev.c: due to pm_qos registration\n infrastructure changes\n - drivers/net/phy/marvell.c: conflict between adding 88ec048 support\n and cleaning up the IDs\n - drivers/net/wireless/ipw2x00/ipw2100.c: trivial ipw2100_pm_qos_req\n conflict (registration change vs marking it static)\n" }, { "commit": "c996bb47bb419b7c2f75499e11750142775e5da9", "tree": "8eadd7bb19484cc69fff17a218171f36085978ab", "parents": [ "7a7008110b94dfaa90db4b0cc5b0c3f964c80506" ], "author": { "name": "Bart Van Assche", "email": "bvanassche@acm.org", "time": "Fri Jul 30 10:59:05 2010 +0000" }, "committer": { "name": "Roland Dreier", "email": "rolandd@cisco.com", "time": "Wed Aug 04 11:47:39 2010 -0700" }, "message": "IB/srp: Make receive buffer handling more robust\n\nThe current strategy in ib_srp for posting receive buffers is:\n\n * Post one buffer after channel establishment.\n * Post one buffer before sending an SRP_CMD or SRP_TSK_MGMT to the target.\n\nAs a result, only the first non-SRP_RSP information unit from the\ntarget will be processed. If that first information unit is an\nSRP_T_LOGOUT, it will be processed. On the other hand, if the\ninitiator receives an SRP_CRED_REQ or SRP_AER_REQ before it receives a\nSRP_T_LOGOUT, the SRP_T_LOGOUT won\u0027t be processed.\n\nWe can fix this inconsistency by changing the strategy for posting\nreceive buffers to:\n\n * Post all receive buffers after channel establishment.\n * After a receive buffer has been consumed and processed, post it again.\n\nA side effect is that the ib_post_recv() call is moved out of the SCSI\ncommand processing path. Since __srp_post_recv() is not called\ndirectly any more, get rid of it and move the code directly into\nsrp_post_recv(). Also, move srp_post_recv() up in the file to avoid a\nforward declaration.\n\nSigned-off-by: Bart Van Assche \u003cbart.vanassche@gmail.com\u003e\nAcked-by: David Dillow \u003cdave@thedillows.org\u003e\nSigned-off-by: Roland Dreier \u003crolandd@cisco.com\u003e\n" }, { "commit": "7a7008110b94dfaa90db4b0cc5b0c3f964c80506", "tree": "3a5a63565e44ddaf117d3fe9f4aa378bcf5c64fb", "parents": [ "589643be6693c46fbc54bae77745f336c8ed4bcc" ], "author": { "name": "Bart Van Assche", "email": "bvanassche@acm.org", "time": "Thu Jul 29 15:56:37 2010 +0000" }, "committer": { "name": "Roland Dreier", "email": "rolandd@cisco.com", "time": "Wed Aug 04 11:24:12 2010 -0700" }, "message": "IB/srp: Use print_hex_dump()\n\nReplace an open-coded dump of the receive buffer with a call to\nprint_hex_dump().\n\nSigned-off-by: Bart Van Assche \u003cbart.vanassche@gmail.com\u003e\nSigned-off-by: Roland Dreier \u003crolandd@cisco.com\u003e\n" }, { "commit": "48d8fcebb7abf64843314672c1208b730be911bb", "tree": "3611f15d20685749e66c900340401e1148c02297", "parents": [ "50a025c69ee749d822c301f9bf63dee13c113680" ], "author": { "name": "Or Gerlitz", "email": "ogerlitz@voltaire.com", "time": "Tue Jul 20 12:00:20 2010 +0000" }, "committer": { "name": "Roland Dreier", "email": "rolandd@cisco.com", "time": "Wed Aug 04 09:54:55 2010 -0700" }, "message": "IB/iser: Make needlessly global iser_alloc_rx_descriptors() static\n\nSigned-off-by: Or Gerlitz \u003cogerlitz@voltaire.com\u003e\nSigned-off-by: Roland Dreier \u003crolandd@cisco.com\u003e\n" }, { "commit": "7a52b34b07122ff5f45258d47f260f8a525518f0", "tree": "4617ecc36b53119ffec8563005e7aa1195d9fad7", "parents": [ "67a3e12b05e055c0415c556a315a3d3eb637e29e" ], "author": { "name": "Or Gerlitz", "email": "ogerlitz@voltaire.com", "time": "Sun Jun 06 04:59:16 2010 +0000" }, "committer": { "name": "Roland Dreier", "email": "rolandd@cisco.com", "time": "Tue Jul 06 14:23:22 2010 -0700" }, "message": "IPoIB: Fix world-writable child interface control sysfs attributes\n\nSumeet Lahorani \u003csumeet.lahorani@oracle.com\u003e reported that the IPoIB\nchild entries are world-writable; however we don\u0027t want ordinary users\nto be able to create and destroy child interfaces, so fix them to be\nwritable only by root.\n\nSigned-off-by: Or Gerlitz \u003cogerlitz@voltaire.com\u003e\nCc: \u003cstable@kernel.org\u003e\nSigned-off-by: Roland Dreier \u003crolandd@cisco.com\u003e\n" }, { "commit": "39827be26b36ef9cdbc661c92a269e0484cd9ef5", "tree": "5550c007b82f91a6db47681dfcd08dc29b3ff13c", "parents": [ "e5a0c1fd155ca0e98ff8995c2e79b654759cb544" ], "author": { "name": "Ben Hutchings", "email": "bhutchings@solarflare.com", "time": "Sat Jul 03 09:41:29 2010 +0000" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Sun Jul 04 11:48:14 2010 -0700" }, "message": "IB/{nes, ipoib}: Pass supported flags to ethtool_op_set_flags()\n\nFollowing commit 1437ce3983bcbc0447a0dedcd644c14fe833d266 \"ethtool:\nChange ethtool_op_set_flags to validate flags\", ethtool_op_set_flags\ntakes a third parameter and cannot be used directly as an\nimplementation of ethtool_ops::set_flags.\n\nChanges nes and ipoib driver to pass in the appropriate value.\n\nSigned-off-by: Ben Hutchings \u003cbhutchings@solarflare.com\u003e\nAcked-by: Roland Dreier \u003crolandd@cisco.com\u003e\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "f8965467f366fd18f01feafb5db10512d7b4422c", "tree": "3706a9cd779859271ca61b85c63a1bc3f82d626e", "parents": [ "a26272e5200765691e67d6780e52b32498fdb659", "2ec8c6bb5d8f3a62a79f463525054bae1e3d4487" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Thu May 20 21:04:44 2010 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Thu May 20 21:04:44 2010 -0700" }, "message": "Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-next-2.6\n\n* git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-next-2.6: (1674 commits)\n qlcnic: adding co maintainer\n ixgbe: add support for active DA cables\n ixgbe: dcb, do not tag tc_prio_control frames\n ixgbe: fix ixgbe_tx_is_paused logic\n ixgbe: always enable vlan strip/insert when DCB is enabled\n ixgbe: remove some redundant code in setting FCoE FIP filter\n ixgbe: fix wrong offset to fc_frame_header in ixgbe_fcoe_ddp\n ixgbe: fix header len when unsplit packet overflows to data buffer\n ipv6: Never schedule DAD timer on dead address\n ipv6: Use POSTDAD state\n ipv6: Use state_lock to protect ifa state\n ipv6: Replace inet6_ifaddr-\u003edead with state\n cxgb4: notify upper drivers if the device is already up when they load\n cxgb4: keep interrupts available when the ports are brought down\n cxgb4: fix initial addition of MAC address\n cnic: Return SPQ credit to bnx2x after ring setup and shutdown.\n cnic: Convert cnic_local_flags to atomic ops.\n can: Fix SJA1000 command register writes on SMP systems\n bridge: fix build for CONFIG_SYSFS disabled\n ARCNET: Limit com20020 PCI ID matches for SOHARD cards\n ...\n\nFix up various conflicts with pcmcia tree drivers/net/\n{pcmcia/3c589_cs.c, wireless/orinoco/orinoco_cs.c and\nwireless/orinoco/spectrum_cs.c} and feature removal\n(Documentation/feature-removal-schedule.txt).\n\nAlso fix a non-content conflict due to pm_qos_requirement getting\nrenamed in the PM tree (now pm_qos_request) in net/mac80211/scan.c\n" }, { "commit": "ffebedb7ab3f7964a70a1771547b26af38a189d2", "tree": "6f627a6c3b4ccefc231e6f81119da8d5f0903215", "parents": [ "e7494440573d9d7b5cb0e7ed9ae7d742226583de", "bc1db9af731a74c7eca04df5936214c800774113", "5d7220e8dc24feed4bbd66667b7696906a147ac4", "617c9a7e398878d036a3aa9a063ccba145854b45", "be4c9bad9d0edb6bc3bd8fffc2f98e0e2112da39", "d414371795d54fa916938f948105d08928abfbb9", "9fda1ac5fa09c49e9148f85be14f55e2bb856c0f", "6fa8f719844b8455033e295f720e739c1dc3804a", "9893e742a0d942dda2277e9f3e19b726900adf27", "3a2baff783497321e8322ce29f3a33a21c0d88f5", "53978b46cd946ef1dba96ed6d0276ff656dd5d42" ], "author": { "name": "Roland Dreier", "email": "rolandd@cisco.com", "time": "Sat May 15 20:06:01 2010 -0700" }, "committer": { "name": "Roland Dreier", "email": "rolandd@cisco.com", "time": "Sat May 15 20:06:01 2010 -0700" }, "message": "Merge branches \u0027amso1100\u0027, \u0027bkl\u0027, \u0027cma\u0027, \u0027cxgb3\u0027, \u0027cxgb4\u0027, \u0027ipoib\u0027, \u0027iser\u0027, \u0027masked-atomics\u0027, \u0027misc\u0027, \u0027mthca\u0027 and \u0027nes\u0027 into for-next\n" }, { "commit": "9fda1ac5fa09c49e9148f85be14f55e2bb856c0f", "tree": "def6cf681e460d54b6fc7fe148e5756fb9d5c4c0", "parents": [ "39ff05dbbbdb082bbabf06206c56b3cd4ef73904" ], "author": { "name": "Dan Carpenter", "email": "error27@gmail.com", "time": "Thu May 06 16:22:21 2010 +0300" }, "committer": { "name": "Roland Dreier", "email": "rolandd@cisco.com", "time": "Wed May 12 09:30:45 2010 -0700" }, "message": "IB/iser: Fix error flow in iser_create_ib_conn_res()\n\nWe shouldn\u0027t free things here because we free them later.\nThe call tree looks like this:\n\tiser_connect() \u003d\u003d\u003e initiating the connection establishment\nand later\n\tiser_cma_handler() \u003d\u003e iser_route_handler() \u003d\u003e iser_create_ib_conn_res()\nif we fail here, eventually iser_conn_release() is called, resulting\nin a double free.\n\nSigned-off-by: Dan Carpenter \u003cerror27@gmail.com\u003e\nSigned-off-by: Or Gerlitz \u003cogerlitz@voltaire.com\u003e\nSigned-off-by: Roland Dreier \u003crolandd@cisco.com\u003e\n" }, { "commit": "39ff05dbbbdb082bbabf06206c56b3cd4ef73904", "tree": "85466e1e75d632b33a294dea436fad2f3233fe52", "parents": [ "d265b9808272c9f25e1c36d3fb5ddb466efd90e9" ], "author": { "name": "Or Gerlitz", "email": "ogerlitz@voltaire.com", "time": "Wed May 05 17:31:44 2010 +0300" }, "committer": { "name": "Roland Dreier", "email": "rolandd@cisco.com", "time": "Wed May 12 09:30:44 2010 -0700" }, "message": "IB/iser: Enhance disconnection logic for multi-pathing\n\nThe iser connection teardown flow isn\u0027t over until the underlying\nConnection Manager (e.g the IB CM) delivers a disconnected or timeout\nevent through the RDMA-CM. When the remote (target) side isn\u0027t\nreachable, e.g when some HW e.g port/hca/switch isn\u0027t functioning or\ntaken down administratively, the CM timeout flow is used and the event\nmay be generated only after relatively long time -- on the order of\ntens of seconds.\n\nThe current iser code exposes this possibly long delay to higher\nlayers, specifically to the iscsid daemon and iscsi kernel stack. As a\nresult, the iscsi stack doesn\u0027t respond well: this low-level CM delay\nis added to the fail-over time under HA schemes such as the one\nprovided by DM multipath through the multipathd(8) service.\n\nThis patch enhances the reference counting scheme on iser\u0027s IB\nconnections so that the disconnect flow initiated by iscsid from user\nspace (ep_disconnect) doesn\u0027t wait for the CM to deliver the\ndisconnect/timeout event. (The connection teardown isn\u0027t done from\niser\u0027s view point until the event is delivered)\n\nThe iser ib (rdma) connection object is destroyed when its reference\ncount reaches zero. When this happens on the RDMA-CM callback\ncontext, extra care is taken so that the RDMA-CM does the actual\ndestroying of the associated ID, since doing it in the callback is\nprohibited.\n\nThe reference count of iser ib connection normally reaches three,\nwhere the \u003cref, deref\u003e relations are\n\n 1. conn \u003cinit, terminate\u003e\n 2. conn \u003cbind, stop/destroy\u003e\n 3. cma id \u003ccreate, disconnect/error/timeout callbacks\u003e\n\nWith this patch, multipath fail-over time is about 30 seconds, while\nwithout this patch, multipath fail-over time is about 130 seconds.\n\nSigned-off-by: Or Gerlitz \u003cogerlitz@voltaire.com\u003e\nSigned-off-by: Roland Dreier \u003crolandd@cisco.com\u003e\n" }, { "commit": "d265b9808272c9f25e1c36d3fb5ddb466efd90e9", "tree": "65791c6f7b3f25e275a4b145795b3c5041b764f8", "parents": [ "2110f9bf37511df06220bb7e977f417baecf2950" ], "author": { "name": "Or Gerlitz", "email": "ogerlitz@voltaire.com", "time": "Wed May 05 17:30:34 2010 +0300" }, "committer": { "name": "Roland Dreier", "email": "rolandd@cisco.com", "time": "Wed May 12 09:30:44 2010 -0700" }, "message": "IB/iser: Remove buggy back-pointer setting\n\nThe iscsi connection object life cycle includes binding and unbinding\n(conn_stop) to/from the iscsi transport connection object. Since\niscsi connection objects are recycled, at the time the transport\nconnection (e.g iser\u0027s IB connection) is released, it is not valid to\ntouch the iscsi connection tied to the transport back-pointer since it\nmay already point to a different transport connection.\n\nSigned-off-by: Or Gerlitz \u003cogerlitz@voltaire.com\u003e\nSigned-off-by: Roland Dreier \u003crolandd@cisco.com\u003e\n" }, { "commit": "2110f9bf37511df06220bb7e977f417baecf2950", "tree": "070e67a58d176a9be9ac22462fb2b7919890e797", "parents": [ "0eddb519b9127c73d53db4bf3ec1d45b13f844d1" ], "author": { "name": "Or Gerlitz", "email": "ogerlitz@voltaire.com", "time": "Wed May 05 17:30:10 2010 +0300" }, "committer": { "name": "Roland Dreier", "email": "rolandd@cisco.com", "time": "Wed May 12 09:30:43 2010 -0700" }, "message": "IB/iser: Add asynchronous event handler\n\nAdd handler to handle events such as port up and down. This is useful\nwhen testing high-availability schemes such as multi-pathing.\n\nSigned-off-by: Or Gerlitz \u003cogerlitz@voltaire.com\u003e\nSigned-off-by: Roland Dreier \u003crolandd@cisco.com\u003e\n" }, { "commit": "d414371795d54fa916938f948105d08928abfbb9", "tree": "a7f34094105b580336a40ecdf3b99599ed4593ea", "parents": [ "0eddb519b9127c73d53db4bf3ec1d45b13f844d1" ], "author": { "name": "Or Gerlitz", "email": "ogerlitz@voltaire.com", "time": "Thu Mar 04 13:16:52 2010 +0000" }, "committer": { "name": "Roland Dreier", "email": "rolandd@cisco.com", "time": "Wed Apr 21 17:17:30 2010 -0700" }, "message": "IPoIB: Allow disabling/enabling TSO on the fly through ethtool\n\nSigned-off-by: Or Gerlitz \u003cogerlitz@voltaire.com\u003e\nSigned-off-by: Roland Dreier \u003crolandd@cisco.com\u003e\n" }, { "commit": "871039f02f8ec4ab2e5e9010718caa8e085786f1", "tree": "f0d2b3127fc48c862967d68c46c2d46668137515", "parents": [ "e4077e018b5ead3de9951fc01d8bf12eeeeeefed", "4a1032faac94ebbf647460ae3e06fc21146eb280" ], "author": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Sun Apr 11 14:53:53 2010 -0700" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Sun Apr 11 14:53:53 2010 -0700" }, "message": "Merge branch \u0027master\u0027 of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6\n\nConflicts:\n\tdrivers/net/stmmac/stmmac_main.c\n\tdrivers/net/wireless/wl12xx/wl1271_cmd.c\n\tdrivers/net/wireless/wl12xx/wl1271_main.c\n\tdrivers/net/wireless/wl12xx/wl1271_spi.c\n\tnet/core/ethtool.c\n\tnet/mac80211/scan.c\n" }, { "commit": "4a35ecf8bf1c4b039503fa554100fe85c761de76", "tree": "9b75f5d5636004d9a9aa496924377379be09aa1f", "parents": [ "b4d562e3c3553ac58c7120555c4e4aefbb090a2a", "fb9e2d887243499b8d28efcf80821c4f6a092395" ], "author": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Tue Apr 06 23:53:30 2010 -0700" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Tue Apr 06 23:53:30 2010 -0700" }, "message": "Merge branch \u0027master\u0027 of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6\n\nConflicts:\n\tdrivers/net/bonding/bond_main.c\n\tdrivers/net/via-velocity.c\n\tdrivers/net/wireless/iwlwifi/iwl-agn.c\n" }, { "commit": "22bedad3ce112d5ca1eaf043d4990fa2ed698c87", "tree": "b6fba5688d48b1396f01d13ee53610dea7749c15", "parents": [ "a748ee2426817a95b1f03012d8f339c45c722ae1" ], "author": { "name": "Jiri Pirko", "email": "jpirko@redhat.com", "time": "Thu Apr 01 21:22:57 2010 +0000" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Sat Apr 03 14:22:15 2010 -0700" }, "message": "net: convert multicast list to list_head\n\nConverts the list and the core manipulating with it to be the same as uc_list.\n\n+uses two functions for adding/removing mc address (normal and \"global\"\n variant) instead of a function parameter.\n+removes dev_mcast.c completely.\n+exposes netdev_hw_addr_list_* macros along with __hw_addr_* functions for\n manipulation with lists on a sandbox (used in bonding and 80211 drivers)\n\nSigned-off-by: Jiri Pirko \u003cjpirko@redhat.com\u003e\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "5a0e3ad6af8660be21ca98a971cd00f331318c05", "tree": "5bfb7be11a03176a87296a43ac6647975c00a1d1", "parents": [ "ed391f4ebf8f701d3566423ce8f17e614cde9806" ], "author": { "name": "Tejun Heo", "email": "tj@kernel.org", "time": "Wed Mar 24 17:04:11 2010 +0900" }, "committer": { "name": "Tejun Heo", "email": "tj@kernel.org", "time": "Tue Mar 30 22:02:32 2010 +0900" }, "message": "include cleanup: Update gfp.h and slab.h includes to prepare for breaking implicit slab.h inclusion from percpu.h\n\npercpu.h is included by sched.h and module.h and thus ends up being\nincluded when building most .c files. percpu.h includes slab.h which\nin turn includes gfp.h making everything defined by the two files\nuniversally available and complicating inclusion dependencies.\n\npercpu.h -\u003e slab.h dependency is about to be removed. Prepare for\nthis change by updating users of gfp and slab facilities include those\nheaders directly instead of assuming availability. As this conversion\nneeds to touch large number of source files, the following script is\nused as the basis of conversion.\n\n http://userweb.kernel.org/~tj/misc/slabh-sweep.py\n\nThe script does the followings.\n\n* Scan files for gfp and slab usages and update includes such that\n only the necessary includes are there. ie. if only gfp is used,\n gfp.h, if slab is used, slab.h.\n\n* When the script inserts a new include, it looks at the include\n blocks and try to put the new include such that its order conforms\n to its surrounding. It\u0027s put in the include block which contains\n core kernel includes, in the same order that the rest are ordered -\n alphabetical, Christmas tree, rev-Xmas-tree or at the end if there\n doesn\u0027t seem to be any matching order.\n\n* If the script can\u0027t find a place to put a new include (mostly\n because the file doesn\u0027t have fitting include block), it prints out\n an error message indicating which .h file needs to be added to the\n file.\n\nThe conversion was done in the following steps.\n\n1. The initial automatic conversion of all .c files updated slightly\n over 4000 files, deleting around 700 includes and adding ~480 gfp.h\n and ~3000 slab.h inclusions. The script emitted errors for ~400\n files.\n\n2. Each error was manually checked. Some didn\u0027t need the inclusion,\n some needed manual addition while adding it to implementation .h or\n embedding .c file was more appropriate for others. This step added\n inclusions to around 150 files.\n\n3. The script was run again and the output was compared to the edits\n from #2 to make sure no file was left behind.\n\n4. Several build tests were done and a couple of problems were fixed.\n e.g. lib/decompress_*.c used malloc/free() wrappers around slab\n APIs requiring slab.h to be added manually.\n\n5. The script was run on all .h files but without automatically\n editing them as sprinkling gfp.h and slab.h inclusions around .h\n files could easily lead to inclusion dependency hell. Most gfp.h\n inclusion directives were ignored as stuff from gfp.h was usually\n wildly available and often used in preprocessor macros. Each\n slab.h inclusion directive was examined and added manually as\n necessary.\n\n6. percpu.h was updated not to include slab.h.\n\n7. Build test were done on the following configurations and failures\n were fixed. CONFIG_GCOV_KERNEL was turned off for all tests (as my\n distributed build env didn\u0027t work with gcov compiles) and a few\n more options had to be turned off depending on archs to make things\n build (like ipr on powerpc/64 which failed due to missing writeq).\n\n * x86 and x86_64 UP and SMP allmodconfig and a custom test config.\n * powerpc and powerpc64 SMP allmodconfig\n * sparc and sparc64 SMP allmodconfig\n * ia64 SMP allmodconfig\n * s390 SMP allmodconfig\n * alpha SMP allmodconfig\n * um on x86_64 SMP allmodconfig\n\n8. percpu.h modifications were reverted so that it could be applied as\n a separate patch and serve as bisection point.\n\nGiven the fact that I had only a couple of failures from tests on step\n6, I\u0027m fairly confident about the coverage of this conversion patch.\nIf there is a breakage, it\u0027s likely to be something in one of the arch\nheaders which should be easily discoverable easily on most builds of\nthe specific arch.\n\nSigned-off-by: Tejun Heo \u003ctj@kernel.org\u003e\nGuess-its-ok-by: Christoph Lameter \u003ccl@linux-foundation.org\u003e\nCc: Ingo Molnar \u003cmingo@redhat.com\u003e\nCc: Lee Schermerhorn \u003cLee.Schermerhorn@hp.com\u003e\n" }, { "commit": "3e4aa12f8a81506c44f04b4f0eb7663981c5a282", "tree": "154a7c3600d318da2ca1623f835aa1823c571ee3", "parents": [ "664ffe80c0df5ad2576420ed2e6bd75cc704ba3a" ], "author": { "name": "Jiri Pirko", "email": "jpirko@redhat.com", "time": "Mon Mar 22 03:21:39 2010 +0000" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Mon Mar 22 18:33:11 2010 -0700" }, "message": "ipoib: remove addrlen check for mc addresses\n\nFinally this bit can be removed. Currently, after the bonding driver is\nchanged/fixed (32a806c194ea112cfab00f558482dd97bee5e44e net-next-2.6),\nthat\u0027s not possible for an addr with different length than dev-\u003eaddr_len\nto be present in list. Removing this check as in new mc_list there will be\nno addrlen in the record.\n\nSigned-off-by: Jiri Pirko \u003cjpirko@redhat.com\u003e\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "961cde93dee2658000ead32abffb8ddf0727abe0", "tree": "2419e204132abe2ec2bb7f08bd20042573cc9bd6", "parents": [ "f82c37e7bb4c4d9b6a476c642d5c2d2efbd6f240", "0d9dc7c8b9b7fa0f53647423b41056ee1beed735" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Thu Mar 18 16:54:31 2010 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Thu Mar 18 16:54:31 2010 -0700" }, "message": "Merge git://git.kernel.org/pub/scm/linux/kernel/git/jejb/scsi-misc-2.6\n\n* git://git.kernel.org/pub/scm/linux/kernel/git/jejb/scsi-misc-2.6: (69 commits)\n [SCSI] scsi_transport_fc: Fix synchronization issue while deleting vport\n [SCSI] bfa: Update the driver version to 2.1.2.1.\n [SCSI] bfa: Remove unused header files and did some cleanup.\n [SCSI] bfa: Handle SCSI IO underrun case.\n [SCSI] bfa: FCS and include file changes.\n [SCSI] bfa: Modified the portstats get/clear logic\n [SCSI] bfa: Replace bfa_get_attr() with specific APIs\n [SCSI] bfa: New portlog entries for events (FIP/FLOGI/FDISC/LOGO).\n [SCSI] bfa: Rename pport to fcport in BFA FCS.\n [SCSI] bfa: IOC fixes, check for IOC down condition.\n [SCSI] bfa: In MSIX mode, ignore spurious RME interrupts when FCoE ports are in FW mismatch state.\n [SCSI] bfa: Fix Command Queue (CPE) full condition check and ack CPE interrupt.\n [SCSI] bfa: IOC recovery fix in fcmode.\n [SCSI] bfa: AEN and byte alignment fixes.\n [SCSI] bfa: Introduce a link notification state machine.\n [SCSI] bfa: Added firmware save clear feature for BFA driver.\n [SCSI] bfa: FCS authentication related changes.\n [SCSI] bfa: PCI VPD, FIP and include file changes.\n [SCSI] bfa: Fix to copy fpma MAC when requested by user space application.\n [SCSI] bfa: RPORT state machine: direct attach mode fix.\n ...\n" }, { "commit": "a48f509b26cec53338f4b0abd52ecea35e3974b8", "tree": "e08d069cb636346f64a3fb193f7565ad739b7d58", "parents": [ "f0dc117abdfa9a0e96c3d013d836460ef3cd08c7" ], "author": { "name": "Or Gerlitz", "email": "ogerlitz@voltaire.com", "time": "Thu Mar 04 13:17:37 2010 +0000" }, "committer": { "name": "Roland Dreier", "email": "rolandd@cisco.com", "time": "Thu Mar 11 13:43:11 2010 -0800" }, "message": "IPoIB: Include return code in trace message for ib_post_send() failures\n\nPrint the return code of ib_post_send() if it fails to make these\ndebugging messages more useful.\n\nSigned-off-by: Or Gerlitz \u003cogerlitz@voltaire.com\u003e\nSigned-off-by: Roland Dreier \u003crolandd@cisco.com\u003e\n" } ], "next": "f0dc117abdfa9a0e96c3d013d836460ef3cd08c7" }