)]}' { "log": [ { "commit": "58d4ea65b98f154f3326b038eecda32f90b46ea8", "tree": "636aed413349dece12c08a4bd3d1fea0254976d8", "parents": [ "26f0cf91813bdc8e61595f8ad6660251e2ee9cf6", "fbe0f8348fd6c3d016a3f48756eb729b41a67c22" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Thu Aug 12 09:11:31 2010 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Thu Aug 12 09:11:31 2010 -0700" }, "message": "Merge branch \u0027next-devicetree\u0027 of git://git.secretlab.ca/git/linux-2.6\n\n* \u0027next-devicetree\u0027 of git://git.secretlab.ca/git/linux-2.6:\n mmc_spi: Fix unterminated of_match_table\n of/sparc: fix build regression from of_device changes\n of/device: Replace struct of_device with struct platform_device\n" }, { "commit": "0b019a41553a919965bb02d07d54e3e6c57a796d", "tree": "6e329b4159b440d2aac5200a5c07103fe261c096", "parents": [ "5f6878b0d22f9b93f9698f88c335007e2a3c3bbc", "054d5c9238f3c577ad51195c3ee7803613f322cc" ], "author": { "name": "Russell King", "email": "rmk+kernel@arm.linux.org.uk", "time": "Tue Aug 10 23:17:52 2010 +0100" }, "committer": { "name": "Russell King", "email": "rmk+kernel@arm.linux.org.uk", "time": "Tue Aug 10 23:17:52 2010 +0100" }, "message": "Merge branches \u0027master\u0027 and \u0027devel\u0027 into for-linus\n\nConflicts:\n\tarch/arm/Kconfig\n\tarch/arm/mm/Kconfig\n" }, { "commit": "dcded10f6dce10411b16134ce9cc87bfdf75c13f", "tree": "da6d0face147072c9eadc8a01af4e49958769138", "parents": [ "9e0ba741aabdf129d561e62d207c75146adef5e8", "b0ebeb9c09cb5b84bb2f33927c84c7648845fcec" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Mon Aug 09 21:00:07 2010 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Mon Aug 09 21:00:07 2010 -0700" }, "message": "Merge branch \u0027next\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/djbw/async_tx\n\n* \u0027next\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/djbw/async_tx: (30 commits)\n DMAENGINE: at_hdmac: locking fixlet\n DMAENGINE: pch_dma: kill another usage of __raw_{read|write}l\n dma: dmatest: fix potential sign bug\n ioat2: catch and recover from broken vtd configurations v6\n DMAENGINE: add runtime slave control to COH 901 318 v3\n DMAENGINE: add runtime slave config to DMA40 v3\n DMAENGINE: generic slave channel control v3\n dmaengine: Driver for Topcliff PCH DMA controller\n intel_mid: Add Mrst \u0026 Mfld DMA Drivers\n drivers/dma: Eliminate a NULL pointer dereference\n dma/timb_dma: compile warning on 32 bit\n DMAENGINE: ste_dma40: support older silicon\n DMAENGINE: ste_dma40: support disabling physical channels\n DMAENGINE: ste_dma40: no disabled phy channels on ux500\n DMAENGINE: ste_dma40: fix suspend bug\n DMAENGINE: ste_dma40: add DB8500 memcpy channels\n DMAENGINE: ste_dma40: no flow control on memcpy\n DMAENGINE: ste_dma40: arch updates for LCLA and LCPA\n DMAENGINE: ste_dma40: allocate LCLA dynamically\n DMAENGINE: ste_dma40: no premature stop\n ...\n\nFix up trivial conflicts in arch/arm/mach-ux500/devices-db8500.c\n" }, { "commit": "500b9fc922cbec572f4fd1436533bfaed5011262", "tree": "aac4b7de0871e66740aeaf3510f7a59280026592", "parents": [ "f165eb77f49cb6f6e86e2f2f09183904b2965d19", "beccb12f6fbcc73339f127ff1f00638f076c933f" ], "author": { "name": "Russell King", "email": "rmk+kernel@arm.linux.org.uk", "time": "Fri Aug 06 18:13:19 2010 +0100" }, "committer": { "name": "Russell King", "email": "rmk+kernel@arm.linux.org.uk", "time": "Fri Aug 06 18:13:19 2010 +0100" }, "message": "Merge master.kernel.org:/pub/scm/linux/kernel/git/lethal/genesis-2.6 into devel-stable\n\nConflicts:\n\tdrivers/net/irda/sh_irda.c\n" }, { "commit": "2dc11581376829303b98eadb2de253bee065a56a", "tree": "dbce62559c822cd720d1819a50c488bfecdfa945", "parents": [ "fc1caf6eafb30ea185720e29f7f5eccca61ecd60" ], "author": { "name": "Grant Likely", "email": "grant.likely@secretlab.ca", "time": "Fri Aug 06 09:25:50 2010 -0600" }, "committer": { "name": "Grant Likely", "email": "grant.likely@secretlab.ca", "time": "Fri Aug 06 09:25:50 2010 -0600" }, "message": "of/device: Replace struct of_device with struct platform_device\n\nof_device is just an alias for platform_device, so remove it entirely. Also\nreplace to_of_device() with to_platform_device() and update comment blocks.\n\nThis patch was initially generated from the following semantic patch, and then\nedited by hand to pick up the bits that coccinelle didn\u0027t catch.\n\n@@\n@@\n-struct of_device\n+struct platform_device\n\nSigned-off-by: Grant Likely \u003cgrant.likely@secretlab.ca\u003e\nReviewed-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "b0ebeb9c09cb5b84bb2f33927c84c7648845fcec", "tree": "3ebb434421ef49abe2bda85840db2834391fcbba", "parents": [ "61cd2203769a2bf35d41f8682f6ef865fe2d23ff" ], "author": { "name": "Yong Wang", "email": "yong.y.wang@linux.intel.com", "time": "Thu Aug 05 10:40:08 2010 +0800" }, "committer": { "name": "Dan Williams", "email": "dan.j.williams@intel.com", "time": "Wed Aug 04 22:09:17 2010 -0700" }, "message": "DMAENGINE: at_hdmac: locking fixlet\n\natc_chain_complete shall be called with atchan-\u003elock held\nand bh disabled.\n\nSigned-off-by: Yong Wang \u003cyong.y.wang@intel.com\u003e\nSigned-off-by: Dan Williams \u003cdan.j.williams@intel.com\u003e\n" }, { "commit": "61cd2203769a2bf35d41f8682f6ef865fe2d23ff", "tree": "5d2e886f7f9b20098c8ffee4fbd749ddfb09a530", "parents": [ "b9033e682e86f3c6a66763f9b6a3935c5c64e145" ], "author": { "name": "Yong Wang", "email": "yong.y.wang@linux.intel.com", "time": "Thu Aug 05 10:38:43 2010 +0800" }, "committer": { "name": "Dan Williams", "email": "dan.j.williams@intel.com", "time": "Wed Aug 04 22:08:45 2010 -0700" }, "message": "DMAENGINE: pch_dma: kill another usage of __raw_{read|write}l\n\nUse {read|write}l instead of __raw_{read|write}l since PCH DMA\ncontroller is PCI device.\n\nSigned-off-by: Yong Wang \u003cyong.y.wang@intel.com\u003e\nSigned-off-by: Dan Williams \u003cdan.j.williams@intel.com\u003e\n" }, { "commit": "b9033e682e86f3c6a66763f9b6a3935c5c64e145", "tree": "8aeeb08aeae97b12f0c6cb7338d8cbcf15e6f8ac", "parents": [ "556ab45f9a775bfa4762bacc0a4afb5b44b067bc" ], "author": { "name": "Kulikov Vasiliy", "email": "segooon@gmail.com", "time": "Sat Jul 17 19:19:48 2010 +0400" }, "committer": { "name": "Dan Williams", "email": "dan.j.williams@intel.com", "time": "Wed Aug 04 14:27:47 2010 -0700" }, "message": "dma: dmatest: fix potential sign bug\n\n\u0027cnt\u0027 is unsigned, so this code may become wrong in future as\ndmatest_add_threads() can return error code:\n\n\tcnt \u003d dmatest_add_threads(dtc, DMA_MEMCPY);\n\tthread_count +\u003d cnt \u003e 0 ? cnt : 0;\n\t\t ^^^^^^^\n\nNow it can return only -EINVAL if and only if second argument of\ndmatest_add_threads() is not one of DMA_MEMCPY, DMA_XOR, DMA_PQ.\nSo, now it is not wrong but may become wrong in future.\n\nThe semantic patch that finds this problem (many false-positive results):\n(http://coccinelle.lip6.fr/)\n\n// \u003csmpl\u003e\n@ r1 @\nidentifier f;\n@@\nint f(...) { ... }\n\n@@\nidentifier r1.f;\ntype T;\nunsigned T x;\n@@\n\n*x \u003d f(...)\n ...\n*x \u003e 0\n\nSigned-off-by: Kulikov Vasiliy \u003csegooon@gmail.com\u003e\nSigned-off-by: Dan Williams \u003cdan.j.williams@intel.com\u003e\n" }, { "commit": "556ab45f9a775bfa4762bacc0a4afb5b44b067bc", "tree": "6caf3f7c72617d50d78c4197b872fd0a22b18c99", "parents": [ "128f904ac87cb6e63921e80f378fdf9ba532c0f6" ], "author": { "name": "Dan Williams", "email": "dan.j.williams@intel.com", "time": "Fri Jul 23 15:47:56 2010 -0700" }, "committer": { "name": "Dan Williams", "email": "dan.j.williams@intel.com", "time": "Wed Aug 04 14:18:17 2010 -0700" }, "message": "ioat2: catch and recover from broken vtd configurations v6\n\nOn some platforms (MacPro3,1) the BIOS assigns the ioatdma device to the\nincorrect iommu causing faults when the driver initializes. Add a quirk\nto catch this misconfiguration and try falling back to untranslated\noperation (which works in the MacPro3,1 case).\n\nAssuming there are other platforms with misconfigured iommus teach the\nioatdma driver to treat initialization failures as non-fatal (just fail\nthe driver load and emit a warning instead of triggering a BUG_ON).\n\nThis can be classified as a boot regression since 2.6.32 on affected\nplatforms since the ioatdma module did not autoload prior to that\nkernel.\n\nCc: \u003cstable@kernel.org\u003e\nAcked-by: David Woodhouse \u003cDavid.Woodhouse@intel.com\u003e\nReported-by: Chris Li \u003clkml@chrisli.org\u003e\nTested-by: Chris Li \u003clkml@chrisli.org\u003e\nSigned-off-by: Dan Williams \u003cdan.j.williams@intel.com\u003e\n" }, { "commit": "128f904ac87cb6e63921e80f378fdf9ba532c0f6", "tree": "381d7ad3151865b774a9b24a4063910dacfc9f2b", "parents": [ "95e1400fa1317e566b316ff4af947bd5341332c8" ], "author": { "name": "Linus Walleij", "email": "linus.walleij@stericsson.com", "time": "Wed Aug 04 13:37:53 2010 +0200" }, "committer": { "name": "Dan Williams", "email": "dan.j.williams@intel.com", "time": "Wed Aug 04 14:15:44 2010 -0700" }, "message": "DMAENGINE: add runtime slave control to COH 901 318 v3\n\nThis extends the DMA engine driver for the COH 901 318 used in the\nU300 platform with the generic runtime slave control command.\n\nSigned-off-by: Linus Walleij \u003clinus.walleij@stericsson.com\u003e\nSigned-off-by: Dan Williams \u003cdan.j.williams@intel.com\u003e\n" }, { "commit": "95e1400fa1317e566b316ff4af947bd5341332c8", "tree": "a2bdcd9729209f75eca11bc5b49b1b681a66c150", "parents": [ "c156d0a5b0c667999e06d0bb52e3d1376faec8bf" ], "author": { "name": "Linus Walleij", "email": "linus.walleij@stericsson.com", "time": "Wed Aug 04 13:37:45 2010 +0200" }, "committer": { "name": "Dan Williams", "email": "dan.j.williams@intel.com", "time": "Wed Aug 04 14:14:05 2010 -0700" }, "message": "DMAENGINE: add runtime slave config to DMA40 v3\n\nThis extends the DMA engine driver for the DMA40 used in the\nU8500 platform with the generic runtime slave configuration\ninterface.\n\nSigned-off-by: Linus Walleij \u003clinus.walleij@stericsson.com\u003e\nSigned-off-by: Dan Williams \u003cdan.j.williams@intel.com\u003e\n" }, { "commit": "0c42bd0e425e9c8ddb7019fc446f7d915e36c5f6", "tree": "8d89f7b5907bed52847451ab37619e9516ed7c3c", "parents": [ "b3c567e474b5ba4447b6e16063a3b0cffc22d205" ], "author": { "name": "Yong Wang", "email": "yong.y.wang@linux.intel.com", "time": "Fri Jul 30 16:23:03 2010 +0800" }, "committer": { "name": "Dan Williams", "email": "dan.j.williams@intel.com", "time": "Wed Aug 04 14:12:05 2010 -0700" }, "message": "dmaengine: Driver for Topcliff PCH DMA controller\n\nTopcliff PCH is the platform controller hub that is going to\nbe used in Intel\u0027s upcoming general embedded platforms. This\nadds the driver for Topcliff PCH DMA controller. The DMA\nchannels are strictly for device to host or host to device\ntransfers and cannot be used for generic memcpy.\n\nSigned-off-by: Yong Wang \u003cyong.y.wang@intel.com\u003e\n[kill GFP_ATOMIC, kill __raw_{read|write}l, locking fixlet]\nSigned-off-by: Dan Williams \u003cdan.j.williams@intel.com\u003e\n" }, { "commit": "d790d4d583aeaed9fc6f8a9f4d9f8ce6b1c15c7f", "tree": "854ab394486288d40fa8179cbfaf66e8bdc44b0f", "parents": [ "73b2c7165b76b20eb1290e7efebc33cfd21db1ca", "3a09b1be53d23df780a0cd0e4087a05e2ca4a00c" ], "author": { "name": "Jiri Kosina", "email": "jkosina@suse.cz", "time": "Wed Aug 04 15:14:38 2010 +0200" }, "committer": { "name": "Jiri Kosina", "email": "jkosina@suse.cz", "time": "Wed Aug 04 15:14:38 2010 +0200" }, "message": "Merge branch \u0027master\u0027 into for-next\n" }, { "commit": "c2e07b3a9ced33dd92597201be3931be8ea57ed6", "tree": "636de2e08a4ebbe7136d9ae16625f0297562ece9", "parents": [ "f4d01439515acd5d9a09de1d1e02ca40403dda49" ], "author": { "name": "Stefan Weil", "email": "weil@mail.berlios.de", "time": "Tue Aug 03 19:44:52 2010 +0200" }, "committer": { "name": "Jiri Kosina", "email": "jkosina@suse.cz", "time": "Wed Aug 04 15:05:43 2010 +0200" }, "message": "Fix spelling contorller -\u003e controller in comments\n\nCc: Jiri Kosina \u003ctrivial@kernel.org\u003e\nCc: linux-kernel@vger.kernel.org\nSigned-off-by: Stefan Weil \u003cweil@mail.berlios.de\u003e\nSigned-off-by: Jiri Kosina \u003cjkosina@suse.cz\u003e\n" }, { "commit": "b3c567e474b5ba4447b6e16063a3b0cffc22d205", "tree": "fa5f4f72fcf12dc53a5e58b5359038864595fe3e", "parents": [ "084a2ab9c258fb1efbb009f1bb1c6976da1f73f4" ], "author": { "name": "Vinod Koul", "email": "vinod.koul@intel.com", "time": "Wed Jul 21 13:28:10 2010 +0530" }, "committer": { "name": "Dan Williams", "email": "dan.j.williams@intel.com", "time": "Tue Jul 27 23:32:57 2010 -0700" }, "message": "intel_mid: Add Mrst \u0026 Mfld DMA Drivers\n\nThis patch add DMA drivers for DMA controllers in Langwell chipset\nof Intel(R) Moorestown platform and DMA controllers in Penwell of\nIntel(R) Medfield platfrom\n\nThis patch adds support for Moorestown DMAC1 and DMAC2 controllers.\nIt also add support for Medfiled GP DMA and DMAC1 controllers.\nThese controllers supports memory to peripheral and peripheral to\nmemory transfers. It support only single block transfers.\n\nThis driver is based on Kernel DMA engine\nAnyone who wishes to use this controller should use DMA engine APIs\n\nThis controller exposes DMA_SLAVE capabilities and notifies the client drivers\nof DMA transaction completion\n\nConfig option required to be enabled CONFIG_INTEL_MID_DMAC\u003dy\n\nSigned-off-by: Vinod Koul \u003cvinod.koul@intel.com\u003e\nSigned-off-by: Alan Cox \u003calan@linux.intel.com\u003e\nSigned-off-by: Dan Williams \u003cdan.j.williams@intel.com\u003e\n" }, { "commit": "285eba57db7bd7d7c3c5929fb8621fdcaaea1b00", "tree": "a9e7f0563cef296b24c53b20dbb388ec5c210172", "parents": [ "1c14e6cecb1811543b1016f27e5d308fbea8c08a", "815c4163b6c8ebf8152f42b0a5fd015cfdcedc78" ], "author": { "name": "Paul Mundt", "email": "lethal@linux-sh.org", "time": "Mon Jul 05 15:46:08 2010 +0900" }, "committer": { "name": "Paul Mundt", "email": "lethal@linux-sh.org", "time": "Mon Jul 05 15:46:08 2010 +0900" }, "message": "Merge branch \u0027master\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6\n\nConflicts:\n\tinclude/linux/serial_sci.h\n\nSigned-off-by: Paul Mundt \u003clethal@linux-sh.org\u003e\n" }, { "commit": "3e6b02d9f5a9715f7d4ff9e0978e5f9cef53d31f", "tree": "0e08d7cdff6856b7df8ec6a93f05787debb0f04c", "parents": [ "123f94f22e3d283dfe68742b269c245b0501ad82" ], "author": { "name": "Dan Williams", "email": "dan.j.williams@intel.com", "time": "Fri Jul 02 15:46:17 2010 -0600" }, "committer": { "name": "Grant Likely", "email": "grant.likely@secretlab.ca", "time": "Fri Jul 02 15:46:17 2010 -0600" }, "message": "of/dma: fix build breakage in ppc4xx adma driver\n\nConvert ppc4xx adma driver to use new node pointer location\n\nSigned-off-by: Dan Williams \u003cdan.j.williams@intel.com\u003e\nAcked-by: Anatolij Gustschin \u003cagust@denx.de\u003e\nSigned-off-by: Grant Likely \u003cgrant.likely@secretlab.ca\u003e\n" }, { "commit": "084a2ab9c258fb1efbb009f1bb1c6976da1f73f4", "tree": "4690ac23b3d9043dd26e84197d954c1813a71a0d", "parents": [ "f41855929c9fdc3b4f2863ada9df3e0cf4231b5b", "485680050166dc8c6ac976346430ab1f453c228b" ], "author": { "name": "Dan Williams", "email": "dan.j.williams@intel.com", "time": "Thu Jul 01 02:29:19 2010 -0700" }, "committer": { "name": "Dan Williams", "email": "dan.j.williams@intel.com", "time": "Thu Jul 01 02:29:19 2010 -0700" }, "message": "Merge branch \u0027timb\u0027 into dmaengine\n" }, { "commit": "485680050166dc8c6ac976346430ab1f453c228b", "tree": "ee1400398cb1f88dcb975715e16dfa525db9cecf", "parents": [ "efcc28981745bc6aca88acb2d4d37d87f090a80a" ], "author": { "name": "Julia Lawall", "email": "julia@diku.dk", "time": "Thu May 27 14:33:17 2010 +0200" }, "committer": { "name": "Dan Williams", "email": "dan.j.williams@intel.com", "time": "Thu Jul 01 02:27:35 2010 -0700" }, "message": "drivers/dma: Eliminate a NULL pointer dereference\n\nIf td_desc is NULL, just skip both kfrees.\n\nA simplified version of the semantic match that finds this problem is as\nfollows: (http://coccinelle.lip6.fr/)\n\n// \u003csmpl\u003e\n@r exists@\nexpression E,E1;\nidentifier f;\nstatement S1,S2,S3;\n@@\n\nif ((E \u003d\u003d NULL \u0026\u0026 ...) || ...)\n{\n ... when !\u003d if (...) S1 else S2\n when !\u003d E \u003d E1\n* E-\u003ef\n ... when any\n return ...;\n}\nelse S3\n// \u003c/smpl\u003e\n\nSigned-off-by: Julia Lawall \u003cjulia@diku.dk\u003e\nSigned-off-by: Dan Williams \u003cdan.j.williams@intel.com\u003e\n" }, { "commit": "efcc28981745bc6aca88acb2d4d37d87f090a80a", "tree": "16885dd51e2e10841dd8b011ff782dec7a8e54b8", "parents": [ "7e27d6e778cd87b6f2415515d7127eba53fe5d02" ], "author": { "name": "Dan Carpenter", "email": "error27@gmail.com", "time": "Tue May 25 11:55:06 2010 +0200" }, "committer": { "name": "Dan Williams", "email": "dan.j.williams@intel.com", "time": "Thu Jul 01 02:27:31 2010 -0700" }, "message": "dma/timb_dma: compile warning on 32 bit\n\nThis silences a compile warning on 32 bit systems:\ndrivers/dma/timb_dma.c:203: warning: cast to pointer from integer of different size\n\nSigned-off-by: Dan Carpenter \u003cerror27@gmail.com\u003e\nSigned-off-by: Dan Williams \u003cdan.j.williams@intel.com\u003e\n" }, { "commit": "f41855929c9fdc3b4f2863ada9df3e0cf4231b5b", "tree": "4a31c0bd50af7c13664352e929edcdd2bd5bbf26", "parents": [ "6b7acd84426235c63a3c0f0b230a95064f97b0d4" ], "author": { "name": "Linus Walleij", "email": "linus.walleij@stericsson.com", "time": "Tue Jun 22 18:06:42 2010 -0700" }, "committer": { "name": "Dan Williams", "email": "dan.j.williams@intel.com", "time": "Tue Jun 22 18:06:42 2010 -0700" }, "message": "DMAENGINE: ste_dma40: support older silicon\n\nThis makes sure the DMA40 driver will also work on the oldest\nsilicon revisions that have the on-chip memory on another location\nin the DB8500 and also requires explicit suspend before starting\nor resuming a logical channel.\n\nSigned-off-by: Linus Walleij \u003clinus.walleij@stericsson.com\u003e\n[added parenthesis to the definition of U8500_DMA_LCPA_BASE_ED]\nSigned-off-by: Dan Williams \u003cdan.j.williams@intel.com\u003e\n" }, { "commit": "6b7acd84426235c63a3c0f0b230a95064f97b0d4", "tree": "e3b6e605493c387b3d522f05eb7cac0e6f5fda9d", "parents": [ "595167253a20167efae704ff2a8f6e2ee66cf25f" ], "author": { "name": "Jonas Aaberg", "email": "jonas.aberg@stericsson.com", "time": "Sun Jun 20 21:26:59 2010 +0000" }, "committer": { "name": "Dan Williams", "email": "dan.j.williams@intel.com", "time": "Tue Jun 22 18:01:57 2010 -0700" }, "message": "DMAENGINE: ste_dma40: support disabling physical channels\n\nThis makes it possible to disable physical channels.\n\nSigned-off-by: Jonas Aaberg \u003cjonas.aberg@stericsson.com\u003e\nSigned-off-by: Linus Walleij \u003clinus.walleij@stericsson.com\u003e\nSigned-off-by: Dan Williams \u003cdan.j.williams@intel.com\u003e\n" }, { "commit": "d181b3a8cb2fc1732ad1826a5e6fdccab03e6a51", "tree": "421df4b6411a9b3acea2467237ad3b0e2fc20b4c", "parents": [ "8bc68fa51d7ed520cd4c69f74fb37add60b6ea47" ], "author": { "name": "Jonas Aaberg", "email": "jonas.aberg@stericsson.com", "time": "Sun Jun 20 21:26:38 2010 +0000" }, "committer": { "name": "Dan Williams", "email": "dan.j.williams@intel.com", "time": "Tue Jun 22 18:01:56 2010 -0700" }, "message": "DMAENGINE: ste_dma40: fix suspend bug\n\nThis fixes a bug when suspending channels: first make the checks,\nthen suspend the channel, not the other way around.\n\nSigned-off-by: Jonas Aaberg \u003cjonas.aberg@stericsson.com\u003e\nSigned-off-by: Linus Walleij \u003clinus.walleij@stericsson.com\u003e\nSigned-off-by: Dan Williams \u003cdan.j.williams@intel.com\u003e\n" }, { "commit": "508849ade23c1167bfbdf557259398adfe7044b9", "tree": "e494544350342ea83a8c1a7b3fd8d4c4056e3057", "parents": [ "1d392a7ba43300b0bde877de15121b261d7a6ce2" ], "author": { "name": "Linus Walleij", "email": "linus.walleij@stericsson.com", "time": "Sun Jun 20 21:26:07 2010 +0000" }, "committer": { "name": "Dan Williams", "email": "dan.j.williams@intel.com", "time": "Tue Jun 22 18:01:55 2010 -0700" }, "message": "DMAENGINE: ste_dma40: allocate LCLA dynamically\n\nSwitch to allocating LCLA in memory instead of having a fixed\naddress.\n\nSigned-off-by: Jonas Aaberg \u003cjonas.aberg@stericsson.com\u003e\nSigned-off-by: Linus Walleij \u003clinus.walleij@stericsson.com\u003e\nSigned-off-by: Dan Williams \u003cdan.j.williams@intel.com\u003e\n" }, { "commit": "1d392a7ba43300b0bde877de15121b261d7a6ce2", "tree": "2e45005cfbe64623117c764d791b9e98c75ebd52", "parents": [ "2123a61e174074b849fce2277412836b1b897942" ], "author": { "name": "Jonas Aaberg", "email": "jonas.aberg@stericsson.com", "time": "Sun Jun 20 21:26:01 2010 +0000" }, "committer": { "name": "Dan Williams", "email": "dan.j.williams@intel.com", "time": "Tue Jun 22 18:01:55 2010 -0700" }, "message": "DMAENGINE: ste_dma40: no premature stop\n\nCorrect bug that could cause paused channels to stop.\n\nSigned-off-by: Jonas Aaberg \u003cjonas.aberg@stericsson.com\u003e\nSigned-off-by: Linus Walleij \u003clinus.walleij@stericsson.com\u003e\nSigned-off-by: Dan Williams \u003cdan.j.williams@intel.com\u003e\n" }, { "commit": "2123a61e174074b849fce2277412836b1b897942", "tree": "4f96e988dba2dcb3689cbb5c31a32ef2100e33b8", "parents": [ "0c32269d813c148194524fc8272f7ec1f7c90e6a" ], "author": { "name": "Jonas Aaberg", "email": "jonas.aberg@stericsson.com", "time": "Sun Jun 20 21:25:54 2010 +0000" }, "committer": { "name": "Dan Williams", "email": "dan.j.williams@intel.com", "time": "Tue Jun 22 18:01:55 2010 -0700" }, "message": "DMAENGINE: ste_dma40: interrupts only on dst\n\nWe don\u0027t want interrupts when the source is done, only when\nthe destination is done and everything is complete at the\nrecieveing end of a transfer.\n\nSigned-off-by: Jonas Aaberg \u003cjonas.aberg@stericsson.com\u003e\nSigned-off-by: Linus Walleij \u003clinus.walleij@stericsson.com\u003e\nSigned-off-by: Dan Williams \u003cdan.j.williams@intel.com\u003e\n" }, { "commit": "0c32269d813c148194524fc8272f7ec1f7c90e6a", "tree": "74603b87ce1b4b1fbe8b538a32683c73ea66c6a8", "parents": [ "2292b880e411276d127a020a1c35ca149fcca992" ], "author": { "name": "Jonas Aaberg", "email": "jonas.aberg@stericsson.com", "time": "Sun Jun 20 21:25:46 2010 +0000" }, "committer": { "name": "Dan Williams", "email": "dan.j.williams@intel.com", "time": "Tue Jun 22 18:01:54 2010 -0700" }, "message": "DMAENGINE: ste_dma40: avoid doing unnessecary suspend\n\nAvoid doing unnessecary suspend when modifying logical channels.\n\nSigned-off-by: Jonas Aaberg \u003cjonas.aberg@stericsson.com\u003e\nSigned-off-by: Linus Walleij \u003clinus.walleij@stericsson.com\u003e\nSigned-off-by: Dan Williams \u003cdan.j.williams@intel.com\u003e\n" }, { "commit": "2292b880e411276d127a020a1c35ca149fcca992", "tree": "2f11c87c46cfbc6140649687854b0127dba1fcaa", "parents": [ "0d0f6b8bbb13e1287f4f2a271e4f4306789511a2" ], "author": { "name": "Jonas Aaberg", "email": "jonas.aberg@stericsson.com", "time": "Sun Jun 20 21:25:39 2010 +0000" }, "committer": { "name": "Dan Williams", "email": "dan.j.williams@intel.com", "time": "Tue Jun 22 18:01:54 2010 -0700" }, "message": "DMAENGINE: ste_dma40: lock fix\n\nFix up some locking issues found by enabling lock debugging.\n\nSigned-off-by: Jonas Aaberg \u003cjonas.aberg@stericsson.com\u003e\nSigned-off-by: Linus Walleij \u003clinus.walleij@stericsson.com\u003e\nSigned-off-by: Dan Williams \u003cdan.j.williams@intel.com\u003e\n" }, { "commit": "0d0f6b8bbb13e1287f4f2a271e4f4306789511a2", "tree": "b1ed6b7293cdb16a658b18ce3640bb2354cdaca3", "parents": [ "2a6143407d9114a0c5d16a7eed1a0892a4ce9f19" ], "author": { "name": "Jonas Aaberg", "email": "jonas.aberg@stericsson.com", "time": "Sun Jun 20 21:25:31 2010 +0000" }, "committer": { "name": "Dan Williams", "email": "dan.j.williams@intel.com", "time": "Tue Jun 22 18:01:54 2010 -0700" }, "message": "DMAENGINE: ste_dma40: deny ops on non-alloc channels\n\nAdded checks to deny operating on none-allocated channels.\n\nSigned-off-by: Jonas Aaberg \u003cjonas.aberg@stericsson.com\u003e\nSigned-off-by: Linus Walleij \u003clinus.walleij@stericsson.com\u003e\nSigned-off-by: Dan Williams \u003cdan.j.williams@intel.com\u003e\n" }, { "commit": "2a6143407d9114a0c5d16a7eed1a0892a4ce9f19", "tree": "1f3bdfaf0a679890ec449569868c74eec92e94a6", "parents": [ "ff0b12baa50390ba6a963cb6f6162a94ed4fc333" ], "author": { "name": "Jonas Aaberg", "email": "jonas.aberg@stericsson.com", "time": "Sun Jun 20 21:25:24 2010 +0000" }, "committer": { "name": "Dan Williams", "email": "dan.j.williams@intel.com", "time": "Tue Jun 22 18:01:54 2010 -0700" }, "message": "DMAENGINE: ste_dma40: various cosmetic clean-ups\n\nThis cleans up some extra newlines, removes some code duplication\nand moves the code to comply better with checkpatch.\n\nSigned-off-by: Jonas Aaberg \u003cjonas.aberg@stericsson.com\u003e\nSigned-off-by: Linus Walleij \u003clinus.walleij@stericsson.com\u003e\nSigned-off-by: Dan Williams \u003cdan.j.williams@intel.com\u003e\n" }, { "commit": "ff0b12baa50390ba6a963cb6f6162a94ed4fc333", "tree": "fd2604e67ffa4595ffc0fb33a95a2634b44805d8", "parents": [ "c675b1b424446b52de00cad84ca3d823d29a3d0e" ], "author": { "name": "Jonas Aaberg", "email": "jonas.aberg@stericsson.com", "time": "Sun Jun 20 21:25:15 2010 +0000" }, "committer": { "name": "Dan Williams", "email": "dan.j.williams@intel.com", "time": "Tue Jun 22 18:01:54 2010 -0700" }, "message": "DMAENGINE: ste_dma40: improve allocation error handling\n\nBetter error handling when channel allocation fails.\n\nSigned-off-by: Jonas Aaberg \u003cjonas.aberg@stericsson.com\u003e\nSigned-off-by: Linus Walleij \u003clinus.walleij@stericsson.com\u003e\nSigned-off-by: Dan Williams \u003cdan.j.williams@intel.com\u003e\n" }, { "commit": "c675b1b424446b52de00cad84ca3d823d29a3d0e", "tree": "f829269f5967575481405b0cafdd6ef1c4efeb28", "parents": [ "a8be8627a3a00859367d219848f2cd771d6aa925" ], "author": { "name": "Jonas Aaberg", "email": "jonas.aberg@stericsson.com", "time": "Sun Jun 20 21:25:08 2010 +0000" }, "committer": { "name": "Dan Williams", "email": "dan.j.williams@intel.com", "time": "Tue Jun 22 18:01:53 2010 -0700" }, "message": "DMAENGINE: ste_dma40: use kmem cache\n\nUse kmem cache instead of own cache, reducing code duplication\nand bug sources.\n\nSigned-off-by: Jonas Aaberg \u003cjonas.aberg@stericsson.com\u003e\nSigned-off-by: Linus Walleij \u003clinus.walleij@stericsson.com\u003e\nSigned-off-by: Dan Williams \u003cdan.j.williams@intel.com\u003e\n" }, { "commit": "a8be8627a3a00859367d219848f2cd771d6aa925", "tree": "e7ef04effe6dd5102fea73f2f77da14bd6e2dee9", "parents": [ "ef1872ec652b3bc472d6c0995d0b64d5058878ea" ], "author": { "name": "Per Friden", "email": "per.friden@stericsson.com", "time": "Sun Jun 20 21:24:59 2010 +0000" }, "committer": { "name": "Dan Williams", "email": "dan.j.williams@intel.com", "time": "Tue Jun 22 18:01:53 2010 -0700" }, "message": "DMAENGINE: ste_dma40: moved freeing of client owned desc\n\nfixed typo and moved freeing of client owned desc to free_dma.\n\nSigned-off-by: Jonas Aaberg \u003cjonas.aberg@stericsson.com\u003e\nSigned-off-by: Linus Walleij \u003clinus.walleij@stericsson.com\u003e\nSigned-off-by: Dan Williams \u003cdan.j.williams@intel.com\u003e\n" }, { "commit": "ef1872ec652b3bc472d6c0995d0b64d5058878ea", "tree": "2de7cbca0012ab6931b8321c922311f70bbb4bb0", "parents": [ "941b77a3b6946dd6223a029007f695aa841b6d34" ], "author": { "name": "Linus Walleij", "email": "linus.walleij@stericsson.com", "time": "Sun Jun 20 21:24:52 2010 +0000" }, "committer": { "name": "Dan Williams", "email": "dan.j.williams@intel.com", "time": "Tue Jun 22 18:01:53 2010 -0700" }, "message": "DMAENGINE: ste_dma40: only write phy channel config first time\n\nWe only need to write the configuration to a physical channel if\nit is free, else it is already written.\n\nSigned-off-by: Jonas Aaberg \u003cjonas.aberg@stericsson.com\u003e\nSigned-off-by: Linus Walleij \u003clinus.walleij@stericsson.com\u003e\nSigned-off-by: Dan Williams \u003cdan.j.williams@intel.com\u003e\n" }, { "commit": "941b77a3b6946dd6223a029007f695aa841b6d34", "tree": "25b25c68e24c42271f13aeba82f5424829a84d35", "parents": [ "7e27d6e778cd87b6f2415515d7127eba53fe5d02" ], "author": { "name": "Per Friden", "email": "per.friden@stericsson.com", "time": "Sun Jun 20 21:24:45 2010 +0000" }, "committer": { "name": "Dan Williams", "email": "dan.j.williams@intel.com", "time": "Tue Jun 22 18:01:53 2010 -0700" }, "message": "DMAENGINE: ste_dma40: fixed lli_max\u003d1 issue\n\nFixed lli_max\u003d1 issue in case of full lcla, currently this case\nis not properly handled.\n\nSigned-off-by: Jonas Aaberg \u003cjonas.aberg@stericsson.com\u003e\nSigned-off-by: Linus Walleij \u003clinus.walleij@stericsson.com\u003e\nSigned-off-by: Dan Williams \u003cdan.j.williams@intel.com\u003e\n" }, { "commit": "f1bbbb6912662b9f6070c5bfc4ca9eb1f06a9d5b", "tree": "c2c130a74be25b0b2dff992e1a195e2728bdaadd", "parents": [ "fd0961ff67727482bb20ca7e8ea97b83e9de2ddb", "7e27d6e778cd87b6f2415515d7127eba53fe5d02" ], "author": { "name": "Jiri Kosina", "email": "jkosina@suse.cz", "time": "Wed Jun 16 18:08:13 2010 +0200" }, "committer": { "name": "Jiri Kosina", "email": "jkosina@suse.cz", "time": "Wed Jun 16 18:08:13 2010 +0200" }, "message": "Merge branch \u0027master\u0027 into for-next\n" }, { "commit": "421f91d21ad6f799dc7b489bb33cc560ccc56f98", "tree": "aaf9f6385233fdf9277e634603156c89ede7f770", "parents": [ "65155b3708137fabee865dc4da822763c0c41208" ], "author": { "name": "Uwe Kleine-König", "email": "u.kleine-koenig@pengutronix.de", "time": "Fri Jun 11 12:17:00 2010 +0200" }, "committer": { "name": "Jiri Kosina", "email": "jkosina@suse.cz", "time": "Wed Jun 16 18:05:05 2010 +0200" }, "message": "fix typos concerning \"initiali[zs]e\"\n\nSigned-off-by: Uwe Kleine-König \u003cu.kleine-koenig@pengutronix.de\u003e\nSigned-off-by: Jiri Kosina \u003cjkosina@suse.cz\u003e\n" }, { "commit": "05c02542c20aa00dc9a66f4bfb1a89d1131457f2", "tree": "416689b42957b8217f50966ea325a0251f262f98", "parents": [ "c8a4d0fd2ac2ce6b3409f51fcf918dcb3617ec97" ], "author": { "name": "Anatolij Gustschin", "email": "agust@denx.de", "time": "Thu Jun 03 02:46:37 2010 +0200" }, "committer": { "name": "Grant Likely", "email": "grant.likely@secretlab.ca", "time": "Wed Jun 02 21:02:39 2010 -0600" }, "message": "of/dma: fix build breakage in ppc4xx adma driver\n\nFixes build error caused by the OF device_node\npointer being moved into struct device\n\nSigned-off-by: Anatolij Gustschin \u003cagust@denx.de\u003e\nSigned-off-by: Grant Likely \u003cgrant.likely@secretlab.ca\u003e\n" }, { "commit": "b4a75c91b8a6cb80ba7772f69613025ddf75ebc2", "tree": "f2e20c6470b6c0e0c06ba923ceccfb5ef7032b88", "parents": [ "14acbbf8bada18f19930d38ce33c3947b2c718e0" ], "author": { "name": "Anatolij Gustschin", "email": "agust@denx.de", "time": "Mon May 31 18:39:13 2010 +0200" }, "committer": { "name": "Grant Likely", "email": "grant.likely@secretlab.ca", "time": "Wed Jun 02 13:45:08 2010 -0600" }, "message": "of/dma: mpc512x_dma.c: Fix build failures\n\nFixes build errors caused by the:\n - OF device_node pointer being moved into struct device\n - removal of the match_table field from struct of_platform_driver\n\nSigned-off-by: Anatolij Gustschin \u003cagust@denx.de\u003e\nSigned-off-by: Grant Likely \u003cgrant.likely@secretlab.ca\u003e\n" }, { "commit": "d5b732b17ca2fc74f370bdba5aae6c804fac8c35", "tree": "4facc6d96116b032a3c1cb2ced9b2a3008e9216e", "parents": [ "eb6e8605ee5f5b4e116451bf01b3f35eac446dde", "67a3e12b05e055c0415c556a315a3d3eb637e29e" ], "author": { "name": "Paul Mundt", "email": "lethal@linux-sh.org", "time": "Mon May 31 13:14:26 2010 +0900" }, "committer": { "name": "Paul Mundt", "email": "lethal@linux-sh.org", "time": "Mon May 31 13:14:26 2010 +0900" }, "message": "Merge branch \u0027master\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6\n" }, { "commit": "e38c1e54ce51059a1aa8744c895762906cf43b32", "tree": "6af00994b3d07da2db3419346f740ae06f3cfe7e", "parents": [ "3e9345edd8562dc4f9bbca88a598c91c8779a9c4", "7b8ddb06e54ad98edeb7951f317aee4d1feda9d6" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Sun May 30 09:12:43 2010 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Sun May 30 09:12:43 2010 -0700" }, "message": "Merge branch \u0027next\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/djbw/async_tx\n\n* \u0027next\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/djbw/async_tx:\n DMAENGINE: DMA40 U8500 platform configuration\n DMA: PL330: Add dma api driver\n" }, { "commit": "4be929be34f9bdeffa40d815d32d7d60d2c7f03b", "tree": "4d2c6e2b8ef766e565e2e050ee151de2e02081d3", "parents": [ "940370fc86b920b51a34217a1facc3e9e97c2456" ], "author": { "name": "Alexey Dobriyan", "email": "adobriyan@gmail.com", "time": "Mon May 24 14:33:03 2010 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Tue May 25 08:07:02 2010 -0700" }, "message": "kernel-wide: replace USHORT_MAX, SHORT_MAX and SHORT_MIN with USHRT_MAX, SHRT_MAX and SHRT_MIN\n\n- C99 knows about USHRT_MAX/SHRT_MAX/SHRT_MIN, not\n USHORT_MAX/SHORT_MAX/SHORT_MIN.\n\n- Make SHRT_MIN of type s16, not int, for consistency.\n\n[akpm@linux-foundation.org: fix drivers/dma/timb_dma.c]\n[akpm@linux-foundation.org: fix security/keys/keyring.c]\nSigned-off-by: Alexey Dobriyan \u003cadobriyan@gmail.com\u003e\nAcked-by: WANG Cong \u003cxiyou.wangcong@gmail.com\u003e\nSigned-off-by: Andrew Morton \u003cakpm@linux-foundation.org\u003e\nSigned-off-by: Linus Torvalds \u003ctorvalds@linux-foundation.org\u003e\n" }, { "commit": "0fed2b5cb4c04336b26b0cbf6f9a8c07081f79a6", "tree": "a9be0f082d3c2f53eb2d5f9de9ad900c31236b34", "parents": [ "0163916f1db7f345963dad1af78b7628c759c6ee", "41ec7ebee14189a0424176279c227168960c28ad" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Mon May 24 07:58:28 2010 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Mon May 24 07:58:28 2010 -0700" }, "message": "Merge git://git.kernel.org/pub/scm/linux/kernel/git/lethal/sh-2.6\n\n* git://git.kernel.org/pub/scm/linux/kernel/git/lethal/sh-2.6: (25 commits)\n sh: fix up sh7785lcr_32bit_defconfig.\n arch/sh/lib/strlen.S: Checkpatch cleanup\n sh: fix up sh7786 dmaengine build.\n sh: guard cookie consistency across termination in the DMA driver\n sh: prevent the DMA driver from unloading, while in use\n sh: fix Oops in the serial SCI driver\n sh: allow platforms to specify SD-card supported voltages\n mmc: let MFD\u0027s provide supported Vdd card voltages to tmio_mmc\n sh: disable SD-card write-protection detection on kfr2r09\n mfd: pass platform flags down to the tmio_mmc driver\n tmio: add a platform flag to disable card write-protection detection\n sh: Add SDHI DMA support to migor\n sh: Add SDHI DMA support to kfr2r09\n sh: Add SDHI DMA support to ms7724se\n sh: Add SDHI DMA support to ecovec\n mmc: add DMA support to tmio_mmc driver, when used on SuperH\n sh: prepare the SDHI MFD driver to pass DMA configuration to tmio_mmc.c\n mmc: prepare tmio_mmc for passing of DMA configuration from the MFD cell\n sh: add DMA slave definitions to sh7724\n sh: add DMA slaves for two SDHI controllers to sh7722\n ...\n" }, { "commit": "b3040e40675ec2c43542331cd30d4ee3dae797e8", "tree": "a327c4a92118dd0e1c61b8455e744910cd121f57", "parents": [ "6f68fbaafbaa033205cd131d3e1f3c4b914e9b78" ], "author": { "name": "Jassi Brar", "email": "jassi.brar@samsung.com", "time": "Sun May 23 20:28:19 2010 -0700" }, "committer": { "name": "Dan Williams", "email": "dan.j.williams@intel.com", "time": "Sun May 23 20:28:19 2010 -0700" }, "message": "DMA: PL330: Add dma api driver\n\nAdd DMA Engine API driver for the PL330 DMAC.\nThis driver is supposed to be reusable by various\nplatforms that have one or more PL330 DMACs.\nAtm, DMA_SLAVE and DMA_MEMCPY capabilities have been\nimplemented.\n\nSigned-off-by: Jassi Brar \u003cjassi.brar@samsung.com\u003e\nReviewed-by: Linus Walleij \u003clinus.walleij@stericsson.com\u003e\n[dan.j.williams@intel.com: missing slab.h and -\u003edevice_control() fixups]\nSigned-off-by: Dan Williams \u003cdan.j.williams@intel.com\u003e\n" }, { "commit": "1f782fee18b39b9ad438ebbd82c2915a16c879ee", "tree": "f292930065e6c860714c134790ab8882680ac739", "parents": [ "8eda2f21ed9c936a54fd7bc16cbfa5ee656635c2", "f4b87dee923342505e1ddba8d34ce9de33e75050" ], "author": { "name": "Paul Mundt", "email": "lethal@linux-sh.org", "time": "Mon May 24 08:52:55 2010 +0900" }, "committer": { "name": "Paul Mundt", "email": "lethal@linux-sh.org", "time": "Mon May 24 08:52:55 2010 +0900" }, "message": "Merge branch \u0027master\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6\n" }, { "commit": "9255f1deec151ac0e84871d06bc27406cb81f26f", "tree": "b4e454e2339207a1ce3bbe826f624c1f80323487", "parents": [ "7a5c106a0e8fd03a806d0da77eef10b4045c43a6" ], "author": { "name": "Guennadi Liakhovetski", "email": "g.liakhovetski@gmx.de", "time": "Fri May 21 15:30:12 2010 +0000" }, "committer": { "name": "Paul Mundt", "email": "lethal@linux-sh.org", "time": "Sat May 22 17:06:35 2010 +0900" }, "message": "sh: guard cookie consistency across termination in the DMA driver\n\nIf all descriptors on a channel are terminated or the channel is released,\nupdate the completed cookie counter to match the last cookie. This prevents\ninconsistency warning on resumed DMA operation.\n\nSigned-off-by: Guennadi Liakhovetski \u003cg.liakhovetski@gmx.de\u003e\nSigned-off-by: Paul Mundt \u003clethal@linux-sh.org\u003e\n" }, { "commit": "7a5c106a0e8fd03a806d0da77eef10b4045c43a6", "tree": "610e6c8474d0d6d9947c3c90509b85319076841a", "parents": [ "85b8e3ffc47b2a1913be3079e9f1c1f66a6240b2" ], "author": { "name": "Guennadi Liakhovetski", "email": "g.liakhovetski@gmx.de", "time": "Fri May 21 15:28:51 2010 +0000" }, "committer": { "name": "Paul Mundt", "email": "lethal@linux-sh.org", "time": "Sat May 22 17:06:34 2010 +0900" }, "message": "sh: prevent the DMA driver from unloading, while in use\n\nThis prevents the driver from unloading, while it is in use. Unloading of the\ndriver, while its DMA channels are held, leads to a kernel Oops.\n\nSigned-off-by: Guennadi Liakhovetski \u003cg.liakhovetski@gmx.de\u003e\nSigned-off-by: Paul Mundt \u003clethal@linux-sh.org\u003e\n" }, { "commit": "cf9b59e9d3e008591d1f54830f570982bb307a0d", "tree": "113478ce8fd8c832ba726ffdf59b82cb46356476", "parents": [ "44504b2bebf8b5823c59484e73096a7d6574471d", "f4b87dee923342505e1ddba8d34ce9de33e75050" ], "author": { "name": "Grant Likely", "email": "grant.likely@secretlab.ca", "time": "Sat May 22 00:36:56 2010 -0600" }, "committer": { "name": "Grant Likely", "email": "grant.likely@secretlab.ca", "time": "Sat May 22 00:36:56 2010 -0600" }, "message": "Merge remote branch \u0027origin\u0027 into secretlab/next-devicetree\n\nMerging in current state of Linus\u0027 tree to deal with merge conflicts and\nbuild failures in vio.c after merge.\n\nConflicts:\n\tdrivers/i2c/busses/i2c-cpm.c\n\tdrivers/i2c/busses/i2c-mpc.c\n\tdrivers/net/gianfar.c\n\nAlso fixed up one line in arch/powerpc/kernel/vio.c to use the\ncorrect node pointer.\n\nSigned-off-by: Grant Likely \u003cgrant.likely@secretlab.ca\u003e\n" }, { "commit": "4018294b53d1dae026880e45f174c1cc63b5d435", "tree": "6db3538eaf91b653381720a6d92f4f15634a93d0", "parents": [ "597b9d1e44e9ba69f2454a5318bbe7a6d5e6930a" ], "author": { "name": "Grant Likely", "email": "grant.likely@secretlab.ca", "time": "Tue Apr 13 16:13:02 2010 -0700" }, "committer": { "name": "Grant Likely", "email": "grant.likely@secretlab.ca", "time": "Sat May 22 00:10:40 2010 -0600" }, "message": "of: Remove duplicate fields from of_platform_driver\n\n.name, .match_table and .owner are duplicated in both of_platform_driver\nand device_driver. This patch is a removes the extra copies from struct\nof_platform_driver and converts all users to the device_driver members.\n\nThis patch is a pretty mechanical change. The usage model doesn\u0027t change\nand if any drivers have been missed, or if anything has been fixed up\nincorrectly, then it will fail with a compile time error, and the fixup\nwill be trivial. This patch looks big and scary because it touches so\nmany files, but it should be pretty safe.\n\nSigned-off-by: Grant Likely \u003cgrant.likely@secretlab.ca\u003e\nAcked-by: Sean MacLennan \u003csmaclennan@pikatech.com\u003e\n\n" }, { "commit": "6f68fbaafbaa033205cd131d3e1f3c4b914e9b78", "tree": "56b434496064ed170f94381e3ec4c6c340b71376", "parents": [ "6e4513972a5ad28517477d21f301a02ac7a0df76", "0b28330e39bbe0ffee4c56b09fc415fcec595ea3" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Fri May 21 17:05:46 2010 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Fri May 21 17:05:46 2010 -0700" }, "message": "Merge branch \u0027next\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/djbw/async_tx\n\n* \u0027next\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/djbw/async_tx:\n DMAENGINE: extend the control command to include an arg\n async_tx: trim dma_async_tx_descriptor in \u0027no channel switch\u0027 case\n DMAENGINE: DMA40 fix for allocation of logical channel 0\n DMAENGINE: DMA40 support paused channel status\n dmaengine: mpc512x: Use resource_size\n DMA ENGINE: Do not reset \u0027private\u0027 of channel\n ioat: Remove duplicated devm_kzalloc() calls for ioatdma_device\n ioat3: disable cacheline-unaligned transfers for raid operations\n ioat2,3: convert to producer/consumer locking\n ioat: convert to circ_buf\n DMAENGINE: Support for ST-Ericssons DMA40 block v3\n async_tx: use of kzalloc/kfree requires the include of slab.h\n dmaengine: provide helper for setting txstate\n DMAENGINE: generic channel status v2\n DMAENGINE: generic slave control v2\n dma: timb-dma: Update comment and fix compiler warning\n dma: Add timb-dma\n DMAENGINE: COH 901 318 fix bytesleft\n DMAENGINE: COH 901 318 rename confusing vars\n" }, { "commit": "ffee72d4681c8777918268a96aef42bdeb6c367b", "tree": "4baf91483886d561c198ed0524ab54b783273e86", "parents": [ "fb54d268329846aa13b2bc44a64d90e9b7131192", "f72caf7e496465182eeda842ac66a5e75404ddf1" ], "author": { "name": "Paul Mundt", "email": "lethal@linux-sh.org", "time": "Thu May 20 11:57:38 2010 +0900" }, "committer": { "name": "Paul Mundt", "email": "lethal@linux-sh.org", "time": "Thu May 20 11:57:38 2010 +0900" }, "message": "Merge branch \u0027master\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6\n" }, { "commit": "7c7cbaf5b82c418cd3b1dcf718f71d0e6057e639", "tree": "da9aaa5a246af464b1e10d88618c1cad07b76314", "parents": [ "ba0234ec35127fe21d373db53cbaf9fe20620cb6", "4d0956b8f597aac10208ca763f8fe641fde16aab" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Wed May 19 11:36:03 2010 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Wed May 19 11:36:03 2010 -0700" }, "message": "Merge git://git.kernel.org/pub/scm/linux/kernel/git/lethal/sh-2.6\n\n* git://git.kernel.org/pub/scm/linux/kernel/git/lethal/sh-2.6: (127 commits)\n sh: update defconfigs.\n sh: Fix up the NUMA build for recent LMB changes.\n sh64: provide a stub per_cpu_trap_init() definition.\n sh: fix up CONFIG_KEXEC\u003dn build.\n sh: fixup the docbook paths for clock framework shuffling.\n driver core: Early dev_name() depends on slab_is_available().\n sh: simplify WARN usage in SH clock driver\n sh: Check return value of clk_get on ms7724\n sh: Check return value of clk_get on ecovec24\n sh: move sh clock-cpg.c contents to drivers/sh/clk-cpg.c\n sh: move sh clock.c contents to drivers/sh/clk.\n sh: move sh asm/clock.h contents to linux/sh_clk.h V2\n sh: remove unused clock lookup\n sh: switch boards to clkdev\n sh: switch sh4-202 to clkdev\n sh: switch shx3 to clkdev\n sh: switch sh7757 to clkdev\n sh: switch sh7763 to clkdev\n sh: switch sh7780 to clkdev\n sh: switch sh7786 to clkdev\n ...\n" }, { "commit": "61c7a080a5a061c976988fd4b844dfb468dda255", "tree": "8cb492b73f2755c38a6164d770da34d5af6486a0", "parents": [ "d12d42f744f805a9ccc33cd76f04b237cd83ce56" ], "author": { "name": "Grant Likely", "email": "grant.likely@secretlab.ca", "time": "Tue Apr 13 16:12:29 2010 -0700" }, "committer": { "name": "Grant Likely", "email": "grant.likely@secretlab.ca", "time": "Tue May 18 16:10:44 2010 -0600" }, "message": "of: Always use \u0027struct device.of_node\u0027 to get device node pointer.\n\nThe following structure elements duplicate the information in\n\u0027struct device.of_node\u0027 and so are being eliminated. This patch\nmakes all readers of these elements use device.of_node instead.\n\n(struct of_device *)-\u003enode\n(struct dev_archdata *)-\u003eprom_node (sparc)\n(struct dev_archdata *)-\u003eof_node (powerpc \u0026 microblaze)\n\nSigned-off-by: Grant Likely \u003cgrant.likely@secretlab.ca\u003e\n" }, { "commit": "0b28330e39bbe0ffee4c56b09fc415fcec595ea3", "tree": "fcf504879883763557e696eff81427b1ab78f76b", "parents": [ "058276303dbc4ed089c1f7dad0871810b1f5ddf1", "caa20d974c86af496b419eef70010e63b7fab7ac" ], "author": { "name": "Dan Williams", "email": "dan.j.williams@intel.com", "time": "Mon May 17 16:30:58 2010 -0700" }, "committer": { "name": "Dan Williams", "email": "dan.j.williams@intel.com", "time": "Mon May 17 16:30:58 2010 -0700" }, "message": "Merge branch \u0027ioat\u0027 into dmaengine\n" }, { "commit": "058276303dbc4ed089c1f7dad0871810b1f5ddf1", "tree": "df26ff701721b2a91d61bd29e48bad7cbcedd746", "parents": [ "4aed79b2818e7330b5d00143e4c20bc6555df91f" ], "author": { "name": "Linus Walleij", "email": "linus.walleij@stericsson.com", "time": "Mon May 17 16:30:42 2010 -0700" }, "committer": { "name": "Dan Williams", "email": "dan.j.williams@intel.com", "time": "Mon May 17 16:30:42 2010 -0700" }, "message": "DMAENGINE: extend the control command to include an arg\n\nThis adds an argument to the DMAengine control function, so that\nwe can later provide control commands that need some external data\npassed in through an argument akin to the ioctl() operation\nprototype.\n\n[dan.j.williams@intel.com: fix up some missed conversions]\nSigned-off-by: Linus Walleij \u003clinus.walleij@stericsson.com\u003e\nSigned-off-by: Dan Williams \u003cdan.j.williams@intel.com\u003e\n" }, { "commit": "caa20d974c86af496b419eef70010e63b7fab7ac", "tree": "a38165bd839a398528a4ef4c7fa8481fb0fefed3", "parents": [ "c86e1401c9f2ba8d989fa1c4b33d0f0ec3ba8aaf" ], "author": { "name": "Dan Williams", "email": "dan.j.williams@intel.com", "time": "Mon May 17 16:24:16 2010 -0700" }, "committer": { "name": "Dan Williams", "email": "dan.j.williams@intel.com", "time": "Mon May 17 16:24:16 2010 -0700" }, "message": "async_tx: trim dma_async_tx_descriptor in \u0027no channel switch\u0027 case\n\nSaves 24 bytes per descriptor (64-bit) when the channel-switching\ncapabilities of async_tx are not required.\n\nSigned-off-by: Dan Williams \u003cdan.j.williams@intel.com\u003e\n" }, { "commit": "4aed79b2818e7330b5d00143e4c20bc6555df91f", "tree": "af69dd8e9a09ea2eb1df8a58e67d36cf3a77cb1f", "parents": [ "a5ebca4769f28ceade28ff59fcbffb8e184e599c" ], "author": { "name": "Marcin Mielczarczyk", "email": "marcin.mielczarczyk@tieto.com", "time": "Tue May 18 00:41:21 2010 +0200" }, "committer": { "name": "Dan Williams", "email": "dan.j.williams@intel.com", "time": "Mon May 17 15:45:06 2010 -0700" }, "message": "DMAENGINE: DMA40 fix for allocation of logical channel 0\n\nFix for allocation failure of logical channel when event line\nhappens to be number 0.\n\nSigned-off-by: Marcin Mielczarczyk \u003cmarcin.mielczarczyk@tieto.com\u003e\nSigned-off-by: Linus Walleij \u003clinus.walleij@stericsson.com\u003e\nSigned-off-by: Dan Williams \u003cdan.j.williams@intel.com\u003e\n" }, { "commit": "a5ebca4769f28ceade28ff59fcbffb8e184e599c", "tree": "cc951614a700e0139d8d786a854eb74c2a05075d", "parents": [ "8381fc35244dbdf58cfc49e04e0d7c3498c8aa03" ], "author": { "name": "Jonas Aaberg", "email": "jonas.aberg@stericsson.com", "time": "Tue May 18 00:41:09 2010 +0200" }, "committer": { "name": "Dan Williams", "email": "dan.j.williams@intel.com", "time": "Mon May 17 15:45:03 2010 -0700" }, "message": "DMAENGINE: DMA40 support paused channel status\n\nSupport determining whether a channel is paused or\nnot using the status function.\n\nSigned-off-by: Jonas Aaberg \u003cjonas.aberg@stericsson.com\u003e\nSigned-off-by: Linus Walleij \u003clinus.walleij@stericsson.com\u003e\nSigned-off-by: Dan Williams \u003cdan.j.williams@intel.com\u003e\n" }, { "commit": "8381fc35244dbdf58cfc49e04e0d7c3498c8aa03", "tree": "dc6e2deb84db53242c4904b295ded5ef1294ad3d", "parents": [ "cc05ea0cd63437da2033b3ce6e033b1f1aaaf640" ], "author": { "name": "Tobias Klauser", "email": "tklauser@distanz.ch", "time": "Thu May 06 11:58:55 2010 +0200" }, "committer": { "name": "Dan Williams", "email": "dan.j.williams@intel.com", "time": "Mon May 17 11:13:51 2010 -0700" }, "message": "dmaengine: mpc512x: Use resource_size\n\nUse the resource_size function instead of manually calculating the\nresource size. This reduces the chance of introducing off-by-one\nerrors.\n\nSigned-off-by: Tobias Klauser \u003ctklauser@distanz.ch\u003e\nSigned-off-by: Dan Williams \u003cdan.j.williams@intel.com\u003e\n" }, { "commit": "cc05ea0cd63437da2033b3ce6e033b1f1aaaf640", "tree": "78b2786870053f56d3ba077c628d2cc975a4c737", "parents": [ "8d318a50b3d72e3daf94131f91e1ab799a8d5ad4" ], "author": { "name": "Jassi Brar", "email": "jassi.brar@samsung.com", "time": "Tue May 04 18:22:15 2010 +0900" }, "committer": { "name": "Dan Williams", "email": "dan.j.williams@intel.com", "time": "Mon May 17 01:33:56 2010 -0700" }, "message": "DMA ENGINE: Do not reset \u0027private\u0027 of channel\n\nThe member \u0027private\u0027 of \u0027struct dma_chan\u0027 is meant for passing\ndata between client and the controller driver.\n\nThe DMA client driver may point it to platform specific stuff after\nacquiring the channel. So, it is the responsiblity of the same code\nto reset it, if it must.\n\nThe DMA engine doesn\u0027t set it and hence, shouldn\u0027t reset it either.\n\nThis reseting of private by DMA Engine comes in the way of implementing\ndefault channel settings during DMAC probe. That capability is useful\nfor not having the clients to always provide platform specific data,\nlike Rx/Tx FIFO addresses, which usually doesn\u0027t change across channel\nrequests.\n\nSigned-off-by: Jassi Brar \u003cjassi.brar@samsung.com\u003e\nSigned-off-by: Dan Williams \u003cdan.j.williams@intel.com\u003e\n" }, { "commit": "bbfdbe9dc00dc3fd6cba9b0f96adc46d025c9079", "tree": "578a2c07181a1832eea2dd4195b6ff2fcebf4c83", "parents": [ "722154e4cacf015161efe60009ae9be23d492296", "8bed90557d2600d25e58de30df48b244980164ec" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Thu May 06 08:37:39 2010 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Thu May 06 08:37:39 2010 -0700" }, "message": "Merge branch \u0027sh/for-2.6.34\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/lethal/sh-2.6\n\n* \u0027sh/for-2.6.34\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/lethal/sh-2.6:\n sh: fix a number of Oopses and leaks in SH framebuffer driver\n SH: fix error paths in DMA driver\n sh: sh7751 pci controller io port fix\n sh: Fix maximum number of SCIF ports in R2D defconfigs\n SH: fix TS field shift calculation for DMA drivers\n" }, { "commit": "c86e1401c9f2ba8d989fa1c4b33d0f0ec3ba8aaf", "tree": "f835f2fa83130eecc9e0a2d2e218e6f942bf134e", "parents": [ "2adfc550b6d9646301c810643bc309fa49375987" ], "author": { "name": "Minskey Guo", "email": "chaohong_guo@linux.intel.com", "time": "Sun May 02 12:52:35 2010 -0700" }, "committer": { "name": "Dan Williams", "email": "dan.j.williams@intel.com", "time": "Sun May 02 12:52:35 2010 -0700" }, "message": "ioat: Remove duplicated devm_kzalloc() calls for ioatdma_device\n\nThe memory for ioatdma_device structure is being allocated in\nalloc_ioatdma()\n\nSigned-off-by: Minskey Guo \u003cchaohong_guo@linux.intel.com\u003e\nSigned-off-by: Dan Williams \u003cdan.j.williams@intel.com\u003e\n" }, { "commit": "2adfc550b6d9646301c810643bc309fa49375987", "tree": "1e1fe80772dc588be2dc294d8b9f371caec3f0b0", "parents": [ "074cc47679f8b0931d7d5384e95822d82768f149" ], "author": { "name": "Dan Williams", "email": "dan.j.williams@intel.com", "time": "Sat May 01 15:22:56 2010 -0700" }, "committer": { "name": "Dan Williams", "email": "dan.j.williams@intel.com", "time": "Sat May 01 15:22:56 2010 -0700" }, "message": "ioat3: disable cacheline-unaligned transfers for raid operations\n\nThere are cases where cacheline-unaligned raid operations can hang the\ndma channel. Simply disable these operations by increasing the\nalignment constraints published to async_tx. The raid456 driver always\nissues page aligned requests, so the only in-kernel user of the ioatdma\ndriver that is affected by this change is dmatest.\n\nSigned-off-by: Dan Williams \u003cdan.j.williams@intel.com\u003e\n" }, { "commit": "074cc47679f8b0931d7d5384e95822d82768f149", "tree": "bd4699a1c769553f2bbfa931913352d26c81dc4d", "parents": [ "abb12dfd50c7580d7dcbd581cf6265ba4d01ea7e" ], "author": { "name": "Dan Williams", "email": "dan.j.williams@intel.com", "time": "Sat May 01 15:22:55 2010 -0700" }, "committer": { "name": "Dan Williams", "email": "dan.j.williams@intel.com", "time": "Sat May 01 15:22:55 2010 -0700" }, "message": "ioat2,3: convert to producer/consumer locking\n\nUse separate locks for the descriptor prep (producer) and descriptor\ncleanup (consumer) paths. Allows the producer path to run concurrently\nwith the cleanup path. Inspired by Documentation/circular-buffer.txt.\n\nCc: David Howells \u003cdhowells@redhat.com\u003e\nCc: Paul E. McKenney \u003cpaulmck@linux.vnet.ibm.com\u003e\nCc: Maciej Sosnowski \u003cmaciej.sosnowski@intel.com\u003e\nSigned-off-by: Dan Williams \u003cdan.j.williams@intel.com\u003e\n" }, { "commit": "abb12dfd50c7580d7dcbd581cf6265ba4d01ea7e", "tree": "d774315dd2620028f1801c8ec0ec31b0e78a536d", "parents": [ "0d0fb0f9c5fddef4a10242fe3337f00f528a3099" ], "author": { "name": "Dan Williams", "email": "dan.j.williams@intel.com", "time": "Sat May 01 15:22:54 2010 -0700" }, "committer": { "name": "Dan Williams", "email": "dan.j.williams@intel.com", "time": "Sat May 01 15:22:54 2010 -0700" }, "message": "ioat: convert to circ_buf\n\nUse the common power-of-2 circular buffer macros.\n\nSigned-off-by: Dan Williams \u003cdan.j.williams@intel.com\u003e\n" }, { "commit": "b0b4ce38a535ed3de5ec6fdd4f3c34435a1c1d1e", "tree": "4b8a41ca3c8e147703471db2dcedeffa7bcab088", "parents": [ "7270be03bc300f67c0b9eccde730937e802892b6" ], "author": { "name": "Geert Uytterhoeven", "email": "geert@linux-m68k.org", "time": "Thu Apr 08 20:52:00 2010 +0200" }, "committer": { "name": "Ralf Baechle", "email": "ralf@linux-mips.org", "time": "Fri Apr 30 20:52:40 2010 +0100" }, "message": "MIPS: TXx9: Add missing MODULE_ALIAS definitions for TXx9 platform devices\n\nThis enables autoloading of the TXx9 sound driver on RBTX4927.\n\nSigned-off-by: Geert Uytterhoeven \u003cgeert@linux-m68k.org\u003e\nTo: Atsushi Nemoto \u003canemo@mba.ocn.ne.jp\u003e\nCc: Linux MIPS Mailing List \u003clinux-mips@linux-mips.org\u003e\nPatchwork: http://patchwork.linux-mips.org/patch/1101/\nSigned-off-by: Ralf Baechle \u003cralf@linux-mips.org\u003e\n" }, { "commit": "e19553427c2e8fdb04fdd98e407164bb59a840ba", "tree": "5332234b2dad07c03c27e4608afb16f297f41e61", "parents": [ "35f6cd4a06432034665a1499ca4b022437423aac", "83515bc7df812555e20cda48614674e2f346f9f5" ], "author": { "name": "Paul Mundt", "email": "lethal@linux-sh.org", "time": "Mon Apr 26 16:08:27 2010 +0900" }, "committer": { "name": "Paul Mundt", "email": "lethal@linux-sh.org", "time": "Mon Apr 26 16:08:27 2010 +0900" }, "message": "Merge branch \u0027sh/stable-updates\u0027\n\nConflicts:\n\tarch/sh/kernel/dwarf.c\n\tdrivers/dma/shdma.c\n\nSigned-off-by: Paul Mundt \u003clethal@linux-sh.org\u003e\n" }, { "commit": "83515bc7df812555e20cda48614674e2f346f9f5", "tree": "c0ca604767a430ae328c5e44a6e3e0dada89345f", "parents": [ "e3a4317e1d9970c56ba19d29393e4289809a1aa5" ], "author": { "name": "Guennadi Liakhovetski", "email": "g.liakhovetski@gmx.de", "time": "Mon Apr 19 08:39:39 2010 +0000" }, "committer": { "name": "Paul Mundt", "email": "lethal@linux-sh.org", "time": "Mon Apr 26 16:04:48 2010 +0900" }, "message": "SH: fix error paths in DMA driver\n\nIf channel allocation is failing, mark the channel unused and give PM a chance\nto power down the hardware.\n\nSigned-off-by: Guennadi Liakhovetski \u003cg.liakhovetski@gmx.de\u003e\nSigned-off-by: Paul Mundt \u003clethal@linux-sh.org\u003e\n" }, { "commit": "5bac942db3d2c4738df04104240d65a5d1eaec6a", "tree": "253c75407764fc5cb3483283941b14a99fad389a", "parents": [ "6b6b18e62cfba44ce7b6489c7100f12b199232d7" ], "author": { "name": "Guennadi Liakhovetski", "email": "g.liakhovetski@gmx.de", "time": "Wed Apr 21 15:36:49 2010 +0000" }, "committer": { "name": "Paul Mundt", "email": "lethal@linux-sh.org", "time": "Mon Apr 26 15:50:50 2010 +0900" }, "message": "SH: constify multiple DMA related objects and references to them\n\nLists of DMA channels and slaves are not changed, make them constant. Besides,\nSH7724 channel and slave configuration of both DMA controllers is identical,\nremove the extra copy of the configuration data.\n\nSigned-off-by: Guennadi Liakhovetski \u003cg.liakhovetski@gmx.de\u003e\nSigned-off-by: Paul Mundt \u003clethal@linux-sh.org\u003e\n" }, { "commit": "8d318a50b3d72e3daf94131f91e1ab799a8d5ad4", "tree": "ae36452931d2e836f725b3f91eebd7f4d9e27589", "parents": [ "6a3cd3ea48584d14f60dce0b3c4e9e4428beb0fe" ], "author": { "name": "Linus Walleij", "email": "linus.walleij@stericsson.com", "time": "Tue Mar 30 15:33:42 2010 +0200" }, "committer": { "name": "Dan Williams", "email": "dan.j.williams@intel.com", "time": "Wed Apr 14 14:49:20 2010 -0700" }, "message": "DMAENGINE: Support for ST-Ericssons DMA40 block v3\n\nThis is a straightforward driver for the ST-Ericsson DMA40 DMA\ncontroller found in U8500, implemented akin to the existing\nCOH 901 318 driver.\n\nSigned-off-by: Linus Walleij \u003clinus.walleij@stericsson.com\u003e\nAcked-by: Srinidh Kasagar \u003csrinidhi.kasagar@stericsson.com\u003e\nCc: STEricsson_nomadik_linux@list.st.com\nCc: Alessandro Rubini \u003crubini@unipv.it\u003e\nSigned-off-by: Andrew Morton \u003cakpm@linux-foundation.org\u003e\nSigned-off-by: Dan Williams \u003cdan.j.williams@intel.com\u003e\n" }, { "commit": "9bc4341eb79d885e5a9dda6384a60bb0f4655fe7", "tree": "61a1a997b9ea17d5b147fee015f0214f94e9bb3a", "parents": [ "927a7c9c1793def3a55d60c926d3945528e6bf1b", "dec710b77c2cf04bf512acada3c14a16f11708d9", "0924fada1e64f92dd89818cf3a15571cc515afd8" ], "author": { "name": "Paul Mundt", "email": "lethal@linux-sh.org", "time": "Wed Apr 07 16:21:03 2010 +0900" }, "committer": { "name": "Paul Mundt", "email": "lethal@linux-sh.org", "time": "Wed Apr 07 16:21:03 2010 +0900" }, "message": "Merge branches \u0027genesis/dmaengine\u0027, \u0027genesis/intc-extension\u0027 and \u0027genesis/i2c-updates\u0027\n" }, { "commit": "927a7c9c1793def3a55d60c926d3945528e6bf1b", "tree": "d7ea66aa528c619644522041a553ce64e0e3638e", "parents": [ "b2623a61cfd3c6badb8396dc85ab5a70f4a05f61" ], "author": { "name": "Magnus Damm", "email": "damm@opensource.se", "time": "Fri Mar 19 04:47:19 2010 +0000" }, "committer": { "name": "Paul Mundt", "email": "lethal@linux-sh.org", "time": "Wed Apr 07 16:17:01 2010 +0900" }, "message": "dmaengine: shdma: Enable on SH-Mobile ARM\n\nEnable the shdma dmaengine driver on SH-Mobile ARM.\n\nSigned-off-by: Magnus Damm \u003cdamm@opensource.se\u003e\nSigned-off-by: Paul Mundt \u003clethal@linux-sh.org\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": "6a3cd3ea48584d14f60dce0b3c4e9e4428beb0fe", "tree": "f7ecd232b9ac463142c493ede51dcf409fd64973", "parents": [ "bca3469205402d9fb14060d255d8786ae2256640" ], "author": { "name": "Stephen Rothwell", "email": "sfr@canb.auug.org.au", "time": "Mon Mar 29 15:54:40 2010 +1100" }, "committer": { "name": "Dan Williams", "email": "dan.j.williams@intel.com", "time": "Mon Mar 29 15:26:06 2010 -0700" }, "message": "async_tx: use of kzalloc/kfree requires the include of slab.h\n\nSigned-off-by: Stephen Rothwell \u003csfr@canb.auug.org.au\u003e\nSigned-off-by: Dan Williams \u003cdan.j.williams@intel.com\u003e\n" }, { "commit": "bca3469205402d9fb14060d255d8786ae2256640", "tree": "3b0c7f246fb9a6eafd3a82dd621dd9753589b3f4", "parents": [ "0793448187643b50af89d36b08470baf45a3cab4" ], "author": { "name": "Dan Williams", "email": "dan.j.williams@intel.com", "time": "Fri Mar 26 16:52:10 2010 -0700" }, "committer": { "name": "Dan Williams", "email": "dan.j.williams@intel.com", "time": "Fri Mar 26 16:52:10 2010 -0700" }, "message": "dmaengine: provide helper for setting txstate\n\nSimple conditional struct filler to cut out some duplicated code.\n\nSigned-off-by: Dan Williams \u003cdan.j.williams@intel.com\u003e\n" }, { "commit": "0793448187643b50af89d36b08470baf45a3cab4", "tree": "b3313ff58d47e26a8cf707d196177effa1aadfbe", "parents": [ "c3635c78e500a52c9fcd55de381a72928d9e054d" ], "author": { "name": "Linus Walleij", "email": "linus.walleij@stericsson.com", "time": "Fri Mar 26 16:50:49 2010 -0700" }, "committer": { "name": "Dan Williams", "email": "dan.j.williams@intel.com", "time": "Fri Mar 26 16:50:49 2010 -0700" }, "message": "DMAENGINE: generic channel status v2\n\nConvert the device_is_tx_complete() operation on the\nDMA engine to a generic device_tx_status()operation which\ncan return three states, DMA_TX_RUNNING, DMA_TX_COMPLETE,\nDMA_TX_PAUSED.\n\n[dan.j.williams@intel.com: update for timberdale]\nSigned-off-by: Linus Walleij \u003clinus.walleij@stericsson.com\u003e\nAcked-by: Mark Brown \u003cbroonie@opensource.wolfsonmicro.com\u003e\nCc: Maciej Sosnowski \u003cmaciej.sosnowski@intel.com\u003e\nCc: Nicolas Ferre \u003cnicolas.ferre@atmel.com\u003e\nCc: Pavel Machek \u003cpavel@ucw.cz\u003e\nCc: Li Yang \u003cleoli@freescale.com\u003e\nCc: Guennadi Liakhovetski \u003cg.liakhovetski@gmx.de\u003e\nCc: Paul Mundt \u003clethal@linux-sh.org\u003e\nCc: Ralf Baechle \u003cralf@linux-mips.org\u003e\nCc: Haavard Skinnemoen \u003chaavard.skinnemoen@atmel.com\u003e\nCc: Magnus Damm \u003cdamm@opensource.se\u003e\nCc: Liam Girdwood \u003clrg@slimlogic.co.uk\u003e\nCc: Joe Perches \u003cjoe@perches.com\u003e\nCc: Roland Dreier \u003crdreier@cisco.com\u003e\nSigned-off-by: Dan Williams \u003cdan.j.williams@intel.com\u003e\n" }, { "commit": "c3635c78e500a52c9fcd55de381a72928d9e054d", "tree": "87403f402227cd8b5572550e70facf81c9eaa0d9", "parents": [ "0f65169b1bf44220308e1ce1f6666ad03ddc27af" ], "author": { "name": "Linus Walleij", "email": "linus.walleij@stericsson.com", "time": "Fri Mar 26 16:44:01 2010 -0700" }, "committer": { "name": "Dan Williams", "email": "dan.j.williams@intel.com", "time": "Fri Mar 26 16:44:01 2010 -0700" }, "message": "DMAENGINE: generic slave control v2\n\nConvert the device_terminate_all() operation on the\nDMA engine to a generic device_control() operation\nwhich can now optionally support also pausing and\nresuming DMA on a certain channel. Implemented for the\nCOH 901 318 DMAC as an example.\n\n[dan.j.williams@intel.com: update for timberdale]\nSigned-off-by: Linus Walleij \u003clinus.walleij@stericsson.com\u003e\nAcked-by: Mark Brown \u003cbroonie@opensource.wolfsonmicro.com\u003e\nCc: Maciej Sosnowski \u003cmaciej.sosnowski@intel.com\u003e\nCc: Nicolas Ferre \u003cnicolas.ferre@atmel.com\u003e\nCc: Pavel Machek \u003cpavel@ucw.cz\u003e\nCc: Li Yang \u003cleoli@freescale.com\u003e\nCc: Guennadi Liakhovetski \u003cg.liakhovetski@gmx.de\u003e\nCc: Paul Mundt \u003clethal@linux-sh.org\u003e\nCc: Ralf Baechle \u003cralf@linux-mips.org\u003e\nCc: Haavard Skinnemoen \u003chaavard.skinnemoen@atmel.com\u003e\nCc: Magnus Damm \u003cdamm@opensource.se\u003e\nCc: Liam Girdwood \u003clrg@slimlogic.co.uk\u003e\nCc: Joe Perches \u003cjoe@perches.com\u003e\nCc: Roland Dreier \u003crdreier@cisco.com\u003e\nSigned-off-by: Dan Williams \u003cdan.j.williams@intel.com\u003e\n" }, { "commit": "0f65169b1bf44220308e1ce1f6666ad03ddc27af", "tree": "90f1e1955d63e876409ce54d8b9cbaf832619671", "parents": [ "de5d4453c5b224eefd02b6a141ed411a76d458af" ], "author": { "name": "Richard Röjfors", "email": "richard.rojfors@pelagicore.com", "time": "Fri Mar 26 08:23:58 2010 +0100" }, "committer": { "name": "Dan Williams", "email": "dan.j.williams@intel.com", "time": "Fri Mar 26 16:08:20 2010 -0700" }, "message": "dma: timb-dma: Update comment and fix compiler warning\n\nAn incremental patch which clarifies what the spinlock is used for\nand fixes a compiler warning.\n\nSigned-off-by: Richard Röjfors \u003crichard.rojfors@pelagicore.com\u003e\nSigned-off-by: Dan Williams \u003cdan.j.williams@intel.com\u003e\n" }, { "commit": "de5d4453c5b224eefd02b6a141ed411a76d458af", "tree": "2c208ec52e52363b1f403b82b570b843e98d1384", "parents": [ "84c8447c544bc7579097649273bc3f4e1b5de6af" ], "author": { "name": "Richard Röjfors", "email": "richard.rojfors@pelagicore.com", "time": "Thu Mar 25 19:44:21 2010 +0100" }, "committer": { "name": "Dan Williams", "email": "dan.j.williams@intel.com", "time": "Thu Mar 25 17:18:43 2010 -0700" }, "message": "dma: Add timb-dma\n\nAdds the support for the DMA engine withing the timberdale FPGA.\n\nThe DMA channels are strict device to host, or host to device\nand can not be used for generic memcpy.\n\nSigned-off-by: Richard Röjfors \u003crichard.rojfors@pelagicore.com\u003e\nSigned-off-by: Dan Williams \u003cdan.j.williams@intel.com\u003e\n" }, { "commit": "84c8447c544bc7579097649273bc3f4e1b5de6af", "tree": "7b91a03a61044612d511283e03f545893ba8c464", "parents": [ "cecd87da83869ad4157295b87a2e51e38c3e03bf" ], "author": { "name": "Linus Walleij", "email": "linus.walleij@stericsson.com", "time": "Thu Mar 04 14:40:30 2010 +0100" }, "committer": { "name": "Dan Williams", "email": "dan.j.williams@intel.com", "time": "Wed Mar 24 14:24:44 2010 -0700" }, "message": "DMAENGINE: COH 901 318 fix bytesleft\n\nThis makes the function to get the number of bytes left in the\nongoing DMA transaction actually work: the old code did not take\nneither lli:s nor queued jobs into account. Also fix a missing\nspinlock while we\u0027re at it.\n\nSigned-off-by: Linus Walleij \u003clinus.walleij@stericsson.com\u003e\nSigned-off-by: Dan Williams \u003cdan.j.williams@intel.com\u003e\n" }, { "commit": "cecd87da83869ad4157295b87a2e51e38c3e03bf", "tree": "83f46a1dec97d0c4d4a8d483b4c2eee216395826", "parents": [ "220bf991b0366cc50a94feede3d7341fa5710ee4" ], "author": { "name": "Linus Walleij", "email": "linus.walleij@stericsson.com", "time": "Thu Mar 04 14:31:47 2010 +0100" }, "committer": { "name": "Dan Williams", "email": "dan.j.williams@intel.com", "time": "Wed Mar 24 13:51:43 2010 -0700" }, "message": "DMAENGINE: COH 901 318 rename confusing vars\n\nThis fixes up the code with a lot of comments that make it readable,\nrename things with opaque names like \"data\" into something more\nappropriate, and remove some very confusing BUG() statements.\n\nSigned-off-by: Linus Walleij \u003clinus.walleij@stericsson.com\u003e\nSigned-off-by: Dan Williams \u003cdan.j.williams@intel.com\u003e\n" }, { "commit": "b2623a61cfd3c6badb8396dc85ab5a70f4a05f61", "tree": "186d032c4005f37be7af1d657f193405cd7d3af3", "parents": [ "f354a38175f5219146f4675dca770e114cf3c502" ], "author": { "name": "Magnus Damm", "email": "damm@opensource.se", "time": "Fri Mar 19 04:47:10 2010 +0000" }, "committer": { "name": "Paul Mundt", "email": "lethal@linux-sh.org", "time": "Tue Mar 23 17:20:06 2010 +0900" }, "message": "dmaengine: shdma: Introduce include/linux/sh_dma.h\n\nCreate a common platform data header file for the\nshdma dmaengine driver. This is done by moving\ncommon structures from sh asm/dmaengine.h to\nlinux/sh_dma.h. DMA registers are also copied from\nsh asm/dma-register.h to make the code architecture\nindependent.\n\nThe sh header file asm/dmaengine.h is still kept\nwith the slave id enum. This allows us to keep the\nold processor specific code as is and slowly move\nover to slave id enums in per-processor headers.\n\nSigned-off-by: Magnus Damm \u003cdamm@opensource.se\u003e\nSigned-off-by: Paul Mundt \u003clethal@linux-sh.org\u003e\n" }, { "commit": "02ca5083f60521d09f13224596564a405108bc4c", "tree": "610eae56f7731208b00dd3b95b534a1877296c83", "parents": [ "4bab9d426e6dbd9ea09330919a33d35d5faab400" ], "author": { "name": "Magnus Damm", "email": "damm@opensource.se", "time": "Fri Mar 19 04:46:47 2010 +0000" }, "committer": { "name": "Paul Mundt", "email": "lethal@linux-sh.org", "time": "Tue Mar 23 17:19:39 2010 +0900" }, "message": "dmaengine: shdma: Common SH_DMA_SLAVE_NUMBER\n\nMove SHDMA_SLAVE_NUMBER from asm/dmaengine.h to\nshdma.h. Set it to 256 to support a wide range\nof processors. The amount of memory consumed by\nthis change is limited to 256 bits.\n\nWhile at it, rename to SH_DMA_SLAVE_NUMBER to\nmatch with the rest of the file.\n\nSigned-off-by: Magnus Damm \u003cdamm@opensource.se\u003e\nAcked-by: Guennadi Liakhovetski \u003cg.liakhovetski@gmx.de\u003e\nSigned-off-by: Paul Mundt \u003clethal@linux-sh.org\u003e\n" }, { "commit": "4bab9d426e6dbd9ea09330919a33d35d5faab400", "tree": "cb78032733f4a45e8b36719b70854cc567b56b55", "parents": [ "ae6be51ed01d6c4aaf249a207b4434bc7785853b" ], "author": { "name": "Magnus Damm", "email": "damm@opensource.se", "time": "Fri Mar 19 04:46:38 2010 +0000" }, "committer": { "name": "Paul Mundt", "email": "lethal@linux-sh.org", "time": "Tue Mar 23 17:19:30 2010 +0900" }, "message": "dmaengine: shdma: Remove sh_dmae_slave_chan_id enum\n\nThis patch replaces the sh_dmae_slave_chan_id enum\nwith an unsigned int. The purpose of this chainge is\nto make it possible to separate the slave id enums\nfrom the dmaengine header.\n\nThe slave id enums varies with processor model, so in\nthe future it makes sense to put these in the processor\nspecific headers together with the pinmux enums.\n\nSigned-off-by: Magnus Damm \u003cdamm@opensource.se\u003e\nSigned-off-by: Paul Mundt \u003clethal@linux-sh.org\u003e\n" }, { "commit": "c32da02342b7521df25fefc2ef20aee0e61cf887", "tree": "7e38f664fa3e13602c357d37f77d8adcf82fccc2", "parents": [ "dca1d9f6d7ae428c193f32bd3e9a4ca13176648b", "318ae2edc3b29216abd8a2510f3f80b764f06858" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Fri Mar 12 16:04:50 2010 -0800" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Fri Mar 12 16:04:50 2010 -0800" }, "message": "Merge branch \u0027for-linus\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/trivial\n\n* \u0027for-linus\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/trivial: (56 commits)\n doc: fix typo in comment explaining rb_tree usage\n Remove fs/ntfs/ChangeLog\n doc: fix console doc typo\n doc: cpuset: Update the cpuset flag file\n Fix of spelling in arch/sparc/kernel/leon_kernel.c no longer needed\n Remove drivers/parport/ChangeLog\n Remove drivers/char/ChangeLog\n doc: typo - Table 1-2 should refer to \"status\", not \"statm\"\n tree-wide: fix typos \"ass?o[sc]iac?te\" -\u003e \"associate\" in comments\n No need to patch AMD-provided drivers/gpu/drm/radeon/atombios.h\n devres/irq: Fix devm_irq_match comment\n Remove reference to kthread_create_on_cpu\n tree-wide: Assorted spelling fixes\n tree-wide: fix \u0027lenght\u0027 typo in comments and code\n drm/kms: fix spelling in error message\n doc: capitalization and other minor fixes in pnp doc\n devres: typo fix s/dev/devm/\n Remove redundant trailing semicolons from macros\n fix typo \"definetly\" -\u003e \"definitely\" in comment\n tree-wide: s/widht/width/g typo in comments\n ...\n\nFix trivial conflict in Documentation/laptops/00-INDEX\n" }, { "commit": "318ae2edc3b29216abd8a2510f3f80b764f06858", "tree": "ce595adde342f57f379d277b25e4dd206988a052", "parents": [ "25cf84cf377c0aae5dbcf937ea89bc7893db5176", "3e58974027b04e84f68b964ef368a6cd758e2f84" ], "author": { "name": "Jiri Kosina", "email": "jkosina@suse.cz", "time": "Mon Mar 08 16:55:37 2010 +0100" }, "committer": { "name": "Jiri Kosina", "email": "jkosina@suse.cz", "time": "Mon Mar 08 16:55:37 2010 +0100" }, "message": "Merge branch \u0027for-next\u0027 into for-linus\n\nConflicts:\n\tDocumentation/filesystems/proc.txt\n\tarch/arm/mach-u300/include/mach/debug-macro.S\n\tdrivers/net/qlge/qlge_ethtool.c\n\tdrivers/net/qlge/qlge_main.c\n\tdrivers/net/typhoon.c\n" }, { "commit": "52cf25d0ab7f78eeecc59ac652ed5090f69b619e", "tree": "031d1ffb3890bd69c0260c864c512e0be62ac05c", "parents": [ "6c1733aca0b48db4d0e660d54976a1cca25b5eaf" ], "author": { "name": "Emese Revfy", "email": "re.emese@gmail.com", "time": "Tue Jan 19 02:58:23 2010 +0100" }, "committer": { "name": "Greg Kroah-Hartman", "email": "gregkh@suse.de", "time": "Sun Mar 07 17:04:49 2010 -0800" }, "message": "Driver core: Constify struct sysfs_ops in struct kobj_type\n\nConstify struct sysfs_ops.\n\nThis is part of the ops structure constification\neffort started by Arjan van de Ven et al.\n\nBenefits of this constification:\n\n * prevents modification of data that is shared\n (referenced) by many other structure instances\n at runtime\n\n * detects/prevents accidental (but not intentional)\n modification attempts on archs that enforce\n read-only kernel data at runtime\n\n * potentially better optimized code as the compiler\n can assume that the const data cannot be changed\n\n * the compiler/linker move const data into .rodata\n and therefore exclude them from false sharing\n\nSigned-off-by: Emese Revfy \u003cre.emese@gmail.com\u003e\nAcked-by: David Teigland \u003cteigland@redhat.com\u003e\nAcked-by: Matt Domsch \u003cMatt_Domsch@dell.com\u003e\nAcked-by: Maciej Sosnowski \u003cmaciej.sosnowski@intel.com\u003e\nAcked-by: Hans J. Koch \u003chjk@linutronix.de\u003e\nAcked-by: Pekka Enberg \u003cpenberg@cs.helsinki.fi\u003e\nAcked-by: Jens Axboe \u003cjens.axboe@oracle.com\u003e\nAcked-by: Stephen Hemminger \u003cshemminger@vyatta.com\u003e\nSigned-off-by: Greg Kroah-Hartman \u003cgregkh@suse.de\u003e\n\n" }, { "commit": "4a31c08d2fecc74a630653828f5388fbb037f8c2", "tree": "c3baf80157bab2cf6bdf3d26772001e43233aad6", "parents": [ "2ddb3b15f1b46836c61cfac5b00d8f08a24236e6", "0272282f7cffb469cd2676dcb6e58bc942fcf8a8" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Sun Mar 07 15:47:19 2010 -0800" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Sun Mar 07 15:47:19 2010 -0800" }, "message": "Merge git://git.kernel.org/pub/scm/linux/kernel/git/lethal/sh-2.6\n\n* git://git.kernel.org/pub/scm/linux/kernel/git/lethal/sh-2.6: (26 commits)\n sh: Convert sh to use read/update_persistent_clock\n sh: Move PMB debugfs entry initialization to later stage\n sh: Fix up flush_cache_vmap() on SMP.\n sh: fix up MMU reset with variable PMB mapping sizes.\n sh: establish PMB mappings for NUMA nodes.\n sh: check for existing mappings for bolted PMB entries.\n sh: fixed virt/phys mapping helpers for PMB.\n sh: make pmb iomapping configurable.\n sh: reworked dynamic PMB mapping.\n sh: Fix up cpumask_of_pcibus() for the NUMA build.\n serial: sh-sci: Tidy up build warnings.\n sh: Fix up ctrl_read/write stragglers in migor setup.\n serial: sh-sci: Add DMA support.\n dmaengine: shdma: extend .device_terminate_all() to record partial transfer\n sh: merge sh7722 and sh7724 DMA register definitions\n sh: activate runtime PM for dmaengine on sh7722 and sh7724\n dmaengine: shdma: add runtime PM support.\n dmaengine: shdma: separate DMA headers.\n dmaengine: shdma: convert to platform device resources\n dmaengine: shdma: fix DMA error handling.\n ...\n" }, { "commit": "984b3f5746ed2cde3d184651dabf26980f2b66e5", "tree": "87dc2162b4778b0075874d9592384530022e15a4", "parents": [ "e3cb91ce1ac1d93a7cc6f81bb5247f7602b572bb" ], "author": { "name": "Akinobu Mita", "email": "akinobu.mita@gmail.com", "time": "Fri Mar 05 13:41:37 2010 -0800" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Sat Mar 06 11:26:23 2010 -0800" }, "message": "bitops: rename for_each_bit() to for_each_set_bit()\n\nRename for_each_bit to for_each_set_bit in the kernel source tree. To\npermit for_each_clear_bit(), should that ever be added.\n\nThe patch includes a macro to map the old for_each_bit() onto the new\nfor_each_set_bit(). This is a (very) temporary thing to ease the migration.\n\n[akpm@linux-foundation.org: add temporary for_each_bit()]\nSuggested-by: Alexey Dobriyan \u003cadobriyan@gmail.com\u003e\nSuggested-by: Andrew Morton \u003cakpm@linux-foundation.org\u003e\nSigned-off-by: Akinobu Mita \u003cakinobu.mita@gmail.com\u003e\nCc: \"David S. Miller\" \u003cdavem@davemloft.net\u003e\nCc: Russell King \u003crmk@arm.linux.org.uk\u003e\nCc: David Woodhouse \u003cdwmw2@infradead.org\u003e\nCc: Artem Bityutskiy \u003cdedekind@infradead.org\u003e\nCc: Stephen Rothwell \u003csfr@canb.auug.org.au\u003e\nSigned-off-by: Andrew Morton \u003cakpm@linux-foundation.org\u003e\nSigned-off-by: Linus Torvalds \u003ctorvalds@linux-foundation.org\u003e\n" }, { "commit": "9bb676966aa85e56af00b353387d3c274a26e480", "tree": "cafc9a409aa05cc9060eb53f03c35881f41b6cec", "parents": [ "0f2cc4ecd81dc1917a041dc93db0ada28f8356fa", "dd58ffcf5a5352fc10820c8ffbcd5fed416a2c3a" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Thu Mar 04 08:20:14 2010 -0800" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Thu Mar 04 08:20:14 2010 -0800" }, "message": "Merge branch \u0027next\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/djbw/async_tx\n\n* \u0027next\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/djbw/async_tx: (28 commits)\n ioat: cleanup -\u003etimer_fn() and -\u003ecleanup_fn() prototypes\n ioat3: interrupt coalescing\n ioat: close potential BUG_ON race in the descriptor cleanup path\n ioat2: kill pending flag\n ioat3: use ioat2_quiesce()\n ioat3: cleanup, don\u0027t enable DCA completion writes\n DMAENGINE: COH 901 318 lli sg offset fix\n DMAENGINE: COH 901 318 configure channel direction\n DMAENGINE: COH 901 318 remove irq counting\n DMAENGINE: COH 901 318 descriptor pool refactoring\n DMAENGINE: COH 901 318 cleanups\n dma: Add MPC512x DMA driver\n Debugging options for the DMA engine subsystem\n iop-adma: redundant/wrong tests in iop_*_count()?\n dmatest: fix handling of an even number of xor_sources\n dmatest: correct raid6 PQ test\n fsldma: Fix cookie issues\n fsldma: Fix cookie issues\n dma: cases IPU_PIX_FMT_BGRA32, BGR32 and ABGR32 are the same in ipu_ch_param_set_size()\n dma: make Open Firmware device id constant\n ...\n" }, { "commit": "dd58ffcf5a5352fc10820c8ffbcd5fed416a2c3a", "tree": "f36172b40f9f3fc2c646f70da40e01705399b6b8", "parents": [ "aa4d72ae946a4fa40486b871717778734184fa29", "56a5d3cf21c71963c8fc506e9b9d3f71641d9c71" ], "author": { "name": "Dan Williams", "email": "dan.j.williams@intel.com", "time": "Wed Mar 03 21:22:21 2010 -0700" }, "committer": { "name": "Dan Williams", "email": "dan.j.williams@intel.com", "time": "Wed Mar 03 21:22:21 2010 -0700" }, "message": "Merge branch \u0027coh\u0027 into dmaengine\n" }, { "commit": "aa4d72ae946a4fa40486b871717778734184fa29", "tree": "5c98641f00a7866e28a364861b9af9b6df606fdd", "parents": [ "b9cc98697d1ca35a86bbb708acc6d93993c28f0f" ], "author": { "name": "Dan Williams", "email": "dan.j.williams@intel.com", "time": "Wed Mar 03 21:21:13 2010 -0700" }, "committer": { "name": "Dan Williams", "email": "dan.j.williams@intel.com", "time": "Wed Mar 03 21:21:13 2010 -0700" }, "message": "ioat: cleanup -\u003etimer_fn() and -\u003ecleanup_fn() prototypes\n\nIf the calling convention of -\u003etimer_fn() and -\u003ecleanup_fn() are unified\nacross hardware versions we can drop parameters to ioat_init_channel() and\nunify ioat_is_dma_complete() implementations.\n\nBoth -\u003etimer_fn() and -\u003ecleanup_fn() are modified to expect a struct\ndma_chan pointer.\n\nSigned-off-by: Dan Williams \u003cdan.j.williams@intel.com\u003e\n" }, { "commit": "b9cc98697d1ca35a86bbb708acc6d93993c28f0f", "tree": "22bace58c86068483209b8b2d9a2b6238eb0c179", "parents": [ "aa75db0080603bae27961c0502812dfd0f522bb3" ], "author": { "name": "Dan Williams", "email": "dan.j.williams@intel.com", "time": "Wed Mar 03 21:21:13 2010 -0700" }, "committer": { "name": "Dan Williams", "email": "dan.j.williams@intel.com", "time": "Wed Mar 03 21:21:13 2010 -0700" }, "message": "ioat3: interrupt coalescing\n\nThe hardware automatically disables further interrupts after each event\nuntil rearmed. This allows a delay to be injected between the occurence\nof the interrupt and the running of the cleanup routine. The delay is\nscaled by the descriptor backlog and then written to the INTRDELAY\nregister which specifies the number of microseconds to hold off\ninterrupt delivery after an interrupt event occurs. According to\npowertop this reduces the interrupt rate from ~5000 intr/s to ~150\nintr/s per without affecting throughput (simple dd to a raid6 array).\n\nSigned-off-by: Dan Williams \u003cdan.j.williams@intel.com\u003e\n" }, { "commit": "aa75db0080603bae27961c0502812dfd0f522bb3", "tree": "3e7fbb0ef4415c9f36107a81378f00bba6db9440", "parents": [ "281befa5592b0c5f9a3856b5666c62ac66d3d9ee" ], "author": { "name": "Dan Williams", "email": "dan.j.williams@intel.com", "time": "Wed Mar 03 21:21:10 2010 -0700" }, "committer": { "name": "Dan Williams", "email": "dan.j.williams@intel.com", "time": "Wed Mar 03 21:21:10 2010 -0700" }, "message": "ioat: close potential BUG_ON race in the descriptor cleanup path\n\nSince ioat_cleanup_preamble() and the update of the last completed\ndescriptor are not synchronized there is a chance that two cleanup threads\ncan see descriptors to clean. If the first cleans up all pending\ndescriptors then the second will trigger the BUG_ON.\n\nSigned-off-by: Dan Williams \u003cdan.j.williams@intel.com\u003e\n" }, { "commit": "281befa5592b0c5f9a3856b5666c62ac66d3d9ee", "tree": "a0e7ca560fd1f2c43d3352786b0a5317af97ccf7", "parents": [ "b372ec2d900a5b50e47ef9e9624536ad146236be" ], "author": { "name": "Dan Williams", "email": "dan.j.williams@intel.com", "time": "Wed Mar 03 11:47:43 2010 -0700" }, "committer": { "name": "Dan Williams", "email": "dan.j.williams@intel.com", "time": "Wed Mar 03 11:47:43 2010 -0700" }, "message": "ioat2: kill pending flag\n\nThe pending \u003d\u003d 2 case no longer exists in the driver so, we can use\nioat2_ring_pending() outside the lock to determine if there might be any\ndescriptors in the ring that the hardware has not seen.\n\nSigned-off-by: Dan Williams \u003cdan.j.williams@intel.com\u003e\n" }, { "commit": "b372ec2d900a5b50e47ef9e9624536ad146236be", "tree": "3c9efbdcac54e7b924057d8b60e223058195d768", "parents": [ "773d9e2d8dbf02cfaf65786cf9100eef02c9fda4" ], "author": { "name": "Dan Williams", "email": "dan.j.williams@intel.com", "time": "Wed Mar 03 11:47:42 2010 -0700" }, "committer": { "name": "Dan Williams", "email": "dan.j.williams@intel.com", "time": "Wed Mar 03 11:47:42 2010 -0700" }, "message": "ioat3: use ioat2_quiesce()\n\nReplace open coded ioat2_quiesce() call in ioat3_restart_channel\n\nSigned-off-by: Dan Williams \u003cdan.j.williams@intel.com\u003e\n" }, { "commit": "773d9e2d8dbf02cfaf65786cf9100eef02c9fda4", "tree": "f4cdd84bb7ebd3ae8340f02c3c1e0e641601f88c", "parents": [ "0fb6f739bb612bc989d295056877374b749e721b" ], "author": { "name": "Dan Williams", "email": "dan.j.williams@intel.com", "time": "Wed Mar 03 11:47:42 2010 -0700" }, "committer": { "name": "Dan Williams", "email": "dan.j.williams@intel.com", "time": "Wed Mar 03 11:47:42 2010 -0700" }, "message": "ioat3: cleanup, don\u0027t enable DCA completion writes\n\nWe already disallow raid operations while DCA is globally enabled, so\nhaving it locally enabled is a nop and confusing when reading the code.\n\nSigned-off-by: Dan Williams \u003cdan.j.williams@intel.com\u003e\n" }, { "commit": "0a135ba14d71fb84c691a5386aff5049691fe6d7", "tree": "adb1de887dd6839d69d2fc16ffa2a10ff63298fa", "parents": [ "4850f524b2c4c8a4e9f8ef4dd9c7c4afde2f2b2c", "a29d8b8e2d811a24bbe49215a0f0c536b72ebc18" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Wed Mar 03 07:34:18 2010 -0800" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Wed Mar 03 07:34:18 2010 -0800" }, "message": "Merge branch \u0027for-linus\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/tj/percpu\n\n* \u0027for-linus\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/tj/percpu:\n percpu: add __percpu sparse annotations to what\u0027s left\n percpu: add __percpu sparse annotations to fs\n percpu: add __percpu sparse annotations to core kernel subsystems\n local_t: Remove leftover local.h\n this_cpu: Remove pageset_notifier\n this_cpu: Page allocator conversion\n percpu, x86: Generic inc / dec percpu instructions\n local_t: Move local.h include to ringbuffer.c and ring_buffer_benchmark.c\n module: Use this_cpu_xx to dynamically allocate counters\n local_t: Remove cpu_local_xx macros\n percpu: refactor the code in pcpu_[de]populate_chunk()\n percpu: remove compile warnings caused by __verify_pcpu_ptr()\n percpu: make accessors check for percpu pointer in sparse\n percpu: add __percpu for sparse.\n percpu: make access macros universal\n percpu: remove per_cpu__ prefix.\n" }, { "commit": "56a5d3cf21c71963c8fc506e9b9d3f71641d9c71", "tree": "3f793e6f9323fa4d34b71c2f1bb85e0497135207", "parents": [ "516fd4305e5f5718475e81fe5c17c95888a8157b" ], "author": { "name": "Linus Walleij", "email": "linus.walleij@stericsson.com", "time": "Tue Mar 02 20:12:56 2010 +0100" }, "committer": { "name": "Dan Williams", "email": "dan.j.williams@intel.com", "time": "Tue Mar 02 14:17:46 2010 -0700" }, "message": "DMAENGINE: COH 901 318 lli sg offset fix\n\nThis makes the COH 901 318 respect the scatter offset field by using\nthe sg_phys() rather than the sg_dma_address() so we get a pointer\nto the actual data we want to send rather than the beginning of the\nbuffer. Also initialize the lli:s a bit more thoroughly.\n\nSigned-off-by: Linus Walleij \u003clinus.walleij@stericsson.com\u003e\nSigned-off-by: Dan Williams \u003cdan.j.williams@intel.com\u003e\n" }, { "commit": "516fd4305e5f5718475e81fe5c17c95888a8157b", "tree": "33d6648233b48178d58426d1659fd1234d9f95b0", "parents": [ "0b58828c923e57f1bfbbd2c4277ceb60666314fa" ], "author": { "name": "Linus Walleij", "email": "linus.walleij@stericsson.com", "time": "Tue Mar 02 20:12:46 2010 +0100" }, "committer": { "name": "Dan Williams", "email": "dan.j.williams@intel.com", "time": "Tue Mar 02 14:17:46 2010 -0700" }, "message": "DMAENGINE: COH 901 318 configure channel direction\n\nThis makes the COH 901 318 configure channel direction (to or from\ndevice) dynamically, instead of being passed in from the platform\ndata. This was necessary in order to get the MMC/SD-card channel\nbidirectional (all other channels on the U300 were either RX or\nTX but this one was both). This also sets memcpy() alignent to\neven 2^2 (32bit) boundaries, which makes the memcpy() stress tests\nstart working.\n\nSigned-off-by: Linus Walleij \u003clinus.walleij@stericsson.com\u003e\nSigned-off-by: Dan Williams \u003cdan.j.williams@intel.com\u003e\n" } ], "next": "0b58828c923e57f1bfbbd2c4277ceb60666314fa" }