)]}' { "log": [ { "commit": "94de648d72c8bc833590523f22386d4babbea988", "tree": "8507157200c687012e13da8a5ea5088528c0151f", "parents": [ "76bd061f5c7b7550cdaed68ad6219ea7cee288fc" ], "author": { "name": "Anatolij Gustschin", "email": "agust@denx.de", "time": "Mon Feb 15 22:35:23 2010 +0100" }, "committer": { "name": "Dan Williams", "email": "dan.j.williams@intel.com", "time": "Sun Feb 28 22:18:36 2010 -0700" }, "message": "dmatest: correct raid6 PQ test\n\nThe number of PQ sources specified by module parameter \"pq_sources\"\nis always forced odd to fit into dmatest\u0027s destination verificaton\nscheme. But number of PQ sources and coefficients as passed to the\ndriver\u0027s prep_dma_pq() is not adjusted accordingly.\n\nFix it now to get correct PQ testing results in the case passed\n\"pq_sources\" parameter is even.\n\nSigned-off-by: Anatolij Gustschin \u003cagust@denx.de\u003e\nSigned-off-by: Andrew Morton \u003cakpm@linux-foundation.org\u003e\nCc: Maciej Sosnowski \u003cmaciej.sosnowski@intel.com\u003e\nSigned-off-by: Dan Williams \u003cdan.j.williams@intel.com\u003e\n" }, { "commit": "76bd061f5c7b7550cdaed68ad6219ea7cee288fc", "tree": "5ae663b8bab6bd77cab2b8bc095c0743cc2da138", "parents": [ "6ca3a7a96e91b1aa8c704153c992b191d35b5747" ], "author": { "name": "Steven J. Magnani", "email": "steve@digidescorp.com", "time": "Sun Feb 28 22:18:16 2010 -0700" }, "committer": { "name": "Dan Williams", "email": "dan.j.williams@intel.com", "time": "Sun Feb 28 22:18:16 2010 -0700" }, "message": "fsldma: Fix cookie issues\n\nfsl_dma_update_completed_cookie() appears to calculate the last completed\ncookie incorrectly in the corner case where DMA on cookie 1 is in progress\njust following a cookie wrap.\n\nSigned-off-by: Steven J. Magnani \u003csteve@digidescorp.com\u003e\nAcked-by: Ira W. Snyder \u003ciws@ovro.caltech.edu\u003e\n[dan.j.williams@intel.com: fix an integer overflow warning with INT_MAX]\nSigned-off-by: Dan Williams \u003cdan.j.williams@intel.com\u003e\n" }, { "commit": "6ca3a7a96e91b1aa8c704153c992b191d35b5747", "tree": "4700e2eecbae9e33492df683d11e5366f16aeca2", "parents": [ "9ad7bd2944bd979ef4877cd439719be44c5f3b47" ], "author": { "name": "Steven J. Magnani", "email": "steve@digidescorp.com", "time": "Thu Feb 25 13:39:30 2010 -0600" }, "committer": { "name": "Dan Williams", "email": "dan.j.williams@intel.com", "time": "Sun Feb 28 20:27:42 2010 -0700" }, "message": "fsldma: Fix cookie issues\n\nfsl_dma_tx_submit() only sets the cookie on the first descriptor of a\ntransaction. It should set the cookie on all.\n\nSigned-off-by: Steven J. Magnani \u003csteve@digidescorp.com\u003e\nAcked-by: Ira W. Snyder \u003ciws@ovro.caltech.edu\u003e\nSigned-off-by: Dan Williams \u003cdan.j.williams@intel.com\u003e\n" }, { "commit": "9ad7bd2944bd979ef4877cd439719be44c5f3b47", "tree": "cf70d092016d677b68b4178b7f669939c3820b63", "parents": [ "4b1cf1facca31b7db2a61d8aa2ba40d5a93a0957" ], "author": { "name": "Roel Kluin", "email": "roel.kluin@gmail.com", "time": "Wed Jan 20 01:25:56 2010 +0100" }, "committer": { "name": "Dan Williams", "email": "dan.j.williams@intel.com", "time": "Tue Feb 02 23:42:25 2010 -0700" }, "message": "dma: cases IPU_PIX_FMT_BGRA32, BGR32 and ABGR32 are the same in ipu_ch_param_set_size()\n\nIn these cases the same statements are executed.\n\nSigned-off-by: Roel Kluin \u003croel.kluin@gmail.com\u003e\nAcked-by: Guennadi Liakhovetski \u003cg.liakhovetski@gmx.de\u003e\nSigned-off-by: Andrew Morton \u003cakpm@linux-foundation.org\u003e\nSigned-off-by: Dan Williams \u003cdan.j.williams@intel.com\u003e\n" }, { "commit": "4b1cf1facca31b7db2a61d8aa2ba40d5a93a0957", "tree": "97fd86a2a15a6e482546b7f8b92e47c5a56a2aaa", "parents": [ "9c3a50b7d7ec45da34e73cac66cde12dd6092dd8" ], "author": { "name": "Márton Németh", "email": "nm127@freemail.hu", "time": "Tue Feb 02 23:41:06 2010 -0700" }, "committer": { "name": "Dan Williams", "email": "dan.j.williams@intel.com", "time": "Tue Feb 02 23:41:06 2010 -0700" }, "message": "dma: make Open Firmware device id constant\n\nThe match_table field of the struct of_device_id is constant in \u003clinux/of_platform.h\u003e\nso it is worth to make the initialization data also constant.\n\nThe semantic match that finds this kind of pattern is as follows:\n(http://coccinelle.lip6.fr/)\n\n// \u003csmpl\u003e\n@r@\ndisable decl_init,const_decl_init;\nidentifier I1, I2, x;\n@@\n\tstruct I1 {\n\t ...\n\t const struct I2 *x;\n\t ...\n\t};\n@s@\nidentifier r.I1, y;\nidentifier r.x, E;\n@@\n\tstruct I1 y \u003d {\n\t .x \u003d E,\n\t};\n@c@\nidentifier r.I2;\nidentifier s.E;\n@@\n\tconst struct I2 E[] \u003d ... ;\n@depends on !c@\nidentifier r.I2;\nidentifier s.E;\n@@\n+\tconst\n\tstruct I2 E[] \u003d ...;\n// \u003c/smpl\u003e\n\nSigned-off-by: Márton Németh \u003cnm127@freemail.hu\u003e\nCc: Julia Lawall \u003cjulia@diku.dk\u003e\nCc: cocci@diku.dk\n[dan.j.williams@intel.com: resolved conflict with recent fsldma updates]\nSigned-off-by: Dan Williams \u003cdan.j.williams@intel.com\u003e\n" }, { "commit": "9c3a50b7d7ec45da34e73cac66cde12dd6092dd8", "tree": "a16b2dd972ba8ebdd9e6796ad8f0027513316f49", "parents": [ "a1c03319018061304be28d131073ac13a5cb86fb" ], "author": { "name": "Ira Snyder", "email": "iws@ovro.caltech.edu", "time": "Wed Jan 06 13:34:06 2010 +0000" }, "committer": { "name": "Dan Williams", "email": "dan.j.williams@intel.com", "time": "Tue Feb 02 14:51:42 2010 -0700" }, "message": "fsldma: major cleanups and fixes\n\nFix locking. Use two queues in the driver, one for pending transacions, and\none for transactions which are actually running on the hardware. Call\ndma_run_dependencies() on descriptor cleanup so that the async_tx API works\ncorrectly.\n\nThere are a number of places throughout the code where lists of descriptors\nare freed in a loop. Create functions to handle this, and use them instead\nof open-coding the loop each time.\n\nSigned-off-by: Ira W. Snyder \u003ciws@ovro.caltech.edu\u003e\nSigned-off-by: Dan Williams \u003cdan.j.williams@intel.com\u003e\n" }, { "commit": "a1c03319018061304be28d131073ac13a5cb86fb", "tree": "9d5e2f1d0a66d001e94c8dc34681ac49cf1b66bb", "parents": [ "d3f620b2c4fecdc8e060b70e8d92d29fc01c6126" ], "author": { "name": "Ira Snyder", "email": "iws@ovro.caltech.edu", "time": "Wed Jan 06 13:34:05 2010 +0000" }, "committer": { "name": "Dan Williams", "email": "dan.j.williams@intel.com", "time": "Tue Feb 02 14:51:41 2010 -0700" }, "message": "fsldma: rename fsl_chan to chan\n\nThe name fsl_chan seems too long, so it has been shortened to chan. There\nare only a few places where the higher level \"struct dma_chan *chan\" name\nconflicts. These have been changed to \"struct dma_chan *dchan\" instead.\n\nSigned-off-by: Ira W. Snyder \u003ciws@ovro.caltech.edu\u003e\nSigned-off-by: Dan Williams \u003cdan.j.williams@intel.com\u003e\n" }, { "commit": "d3f620b2c4fecdc8e060b70e8d92d29fc01c6126", "tree": "652ddf41247241ef3f82419a80e36bb5ee5dd810", "parents": [ "e7a29151de1bd52081f27f149b68074fac0323be" ], "author": { "name": "Ira Snyder", "email": "iws@ovro.caltech.edu", "time": "Wed Jan 06 13:34:04 2010 +0000" }, "committer": { "name": "Dan Williams", "email": "dan.j.williams@intel.com", "time": "Tue Feb 02 14:51:41 2010 -0700" }, "message": "fsldma: simplify IRQ probing and handling\n\nThe IRQ probing is needlessly complex. All off the 83xx device trees in\narch/powerpc/boot/dts/ specify 5 interrupts per DMA controller: one for the\ncontroller, and one for each channel. These interrupts are all attached to\nthe same IRQ line.\n\nThis causes an interesting situation if two channels interrupt at the same\ntime. The per-controller handler will handle the first channel, and the\nper-channel handler will handle the remaining channels.\n\nInstead of this mess, we fix the bug in the per-controller handler, and\nmake it handle all channels that generated an interrupt. When a\nper-controller handler is specified in the device tree, we prefer to use\nthe shared handler instead of the per-channel handler.\n\nThe 85xx/86xx controllers do not have a per-controller interrupt, and\ninstead use a per-channel interrupt. This behavior has not been changed.\n\nSigned-off-by: Ira W. Snyder \u003ciws@ovro.caltech.edu\u003e\nSigned-off-by: Dan Williams \u003cdan.j.williams@intel.com\u003e\n" }, { "commit": "e7a29151de1bd52081f27f149b68074fac0323be", "tree": "72fa616e49d5ca99e0a1dc79f467e73d071d5dd9", "parents": [ "738f5f7e1ae876448cb7d9c82bea258b69386647" ], "author": { "name": "Ira Snyder", "email": "iws@ovro.caltech.edu", "time": "Wed Jan 06 13:34:03 2010 +0000" }, "committer": { "name": "Dan Williams", "email": "dan.j.williams@intel.com", "time": "Tue Feb 02 14:51:41 2010 -0700" }, "message": "fsldma: clean up the OF subsystem routines\n\nThis fixes some errors in the cleanup paths of the OF subsystem, including\nmissing checks for ioremap failing. Also, some variables were renamed for\nbrevity.\n\nSigned-off-by: Ira W. Snyder \u003ciws@ovro.caltech.edu\u003e\nSigned-off-by: Dan Williams \u003cdan.j.williams@intel.com\u003e\n" }, { "commit": "738f5f7e1ae876448cb7d9c82bea258b69386647", "tree": "61616b4be922b7e3461f26d0d4dc2f9e5b0ac8cc", "parents": [ "a4f56d4b103d4e5d1a59a9118db0185a6bd1a83b" ], "author": { "name": "Ira Snyder", "email": "iws@ovro.caltech.edu", "time": "Wed Jan 06 13:34:02 2010 +0000" }, "committer": { "name": "Dan Williams", "email": "dan.j.williams@intel.com", "time": "Tue Feb 02 14:51:41 2010 -0700" }, "message": "fsldma: rename dest to dst for uniformity\n\nMost functions in the standard library use \"dst\" as a parameter, rather\nthan \"dest\". This renames all use of \"dest\" to \"dst\" to match the usual\nconvention.\n\nSigned-off-by: Ira W. Snyder \u003ciws@ovro.caltech.edu\u003e\nSigned-off-by: Dan Williams \u003cdan.j.williams@intel.com\u003e\n" }, { "commit": "a4f56d4b103d4e5d1a59a9118db0185a6bd1a83b", "tree": "aa00d6faf06d168e57c090f1eb05b16596b9a299", "parents": [ "4ce0e953f6286777452bf07c83056342d6b9b257" ], "author": { "name": "Ira Snyder", "email": "iws@ovro.caltech.edu", "time": "Wed Jan 06 13:34:01 2010 +0000" }, "committer": { "name": "Dan Williams", "email": "dan.j.williams@intel.com", "time": "Tue Feb 02 14:51:41 2010 -0700" }, "message": "fsldma: rename struct fsl_dma_chan to struct fsldma_chan\n\nThis is the beginning of a cleanup which will change all instances of\n\"fsl_dma\" to \"fsldma\" to match the name of the driver itself.\n\nSigned-off-by: Ira W. Snyder \u003ciws@ovro.caltech.edu\u003e\nSigned-off-by: Dan Williams \u003cdan.j.williams@intel.com\u003e\n" }, { "commit": "4ce0e953f6286777452bf07c83056342d6b9b257", "tree": "69a182aaa86cad2e8680132464b122374d7a53b0", "parents": [ "272ca655090978bdaa2630fc44fb2c03da5576fd" ], "author": { "name": "Ira Snyder", "email": "iws@ovro.caltech.edu", "time": "Wed Jan 06 13:34:00 2010 +0000" }, "committer": { "name": "Dan Williams", "email": "dan.j.williams@intel.com", "time": "Tue Feb 02 14:51:40 2010 -0700" }, "message": "fsldma: remove unused structure members\n\nRemove some unused members from the fsldma data structures. A few trivial\nuses of struct resource were converted to use the stack rather than keeping\nthe memory allocated for the lifetime of the driver.\n\nSigned-off-by: Ira W. Snyder \u003ciws@ovro.caltech.edu\u003e\nSigned-off-by: Dan Williams \u003cdan.j.williams@intel.com\u003e\n" }, { "commit": "272ca655090978bdaa2630fc44fb2c03da5576fd", "tree": "3ad63195951405f4a51c44f1a57f125415d649e6", "parents": [ "abe94c756c08d50566c09a65b9c7fe72f83071c5" ], "author": { "name": "Ira Snyder", "email": "iws@ovro.caltech.edu", "time": "Wed Jan 06 13:33:59 2010 +0000" }, "committer": { "name": "Dan Williams", "email": "dan.j.williams@intel.com", "time": "Tue Feb 02 14:51:40 2010 -0700" }, "message": "fsldma: reduce kernel text size\n\nSome of the functions are written in a way where they use multiple reads\nand writes where a single read/write pair could suffice. This shrinks the\nkernel text size measurably, while making the functions easier to\nunderstand.\n\nadd/remove: 0/0 grow/shrink: 1/4 up/down: 4/-196 (-192)\nfunction old new delta\nfsl_chan_set_request_count 120 124 +4\ndma_halt 300 272 -28\nfsl_chan_set_src_loop_size 208 156 -52\nfsl_chan_set_dest_loop_size 208 156 -52\nfsl_chan_xfer_ld_queue 500 436 -64\n\nSigned-off-by: Ira W. Snyder \u003ciws@ovro.caltech.edu\u003e\nSigned-off-by: Dan Williams \u003cdan.j.williams@intel.com\u003e\n" }, { "commit": "4995c0b3673c6be76e54b2c89479b1cdf29e69ca", "tree": "b4d48987207a77898d5c990e358c7390b8700253", "parents": [ "499a2673713c85734a54c37dd90b4b729de399c4" ], "author": { "name": "Dmitry Artamonow", "email": "mad_soft@inbox.ru", "time": "Sun Jan 24 00:20:20 2010 +0300" }, "committer": { "name": "Samuel Ortiz", "email": "sameo@linux.intel.com", "time": "Fri Jan 29 21:03:09 2010 +0100" }, "message": "mfd: Fix asic3 build\n\nasic3 also needs tmio_core or otherwise will fail to build.\n\nSigned-off-by: Dmitry Artamonow \u003cmad_soft@inbox.ru\u003e\nSigned-off-by: Samuel Ortiz \u003csameo@linux.intel.com\u003e\n" }, { "commit": "499a2673713c85734a54c37dd90b4b729de399c4", "tree": "426f8e4c7c792dad998beeefb094c439a81b776b", "parents": [ "a7016235a61d520e6806f38129001d935c4b6661", "f6bdc2303da6786cc22a7d24b6790e9f75b4cfdc" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Fri Jan 29 11:15:32 2010 -0800" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Fri Jan 29 11:15:32 2010 -0800" }, "message": "Merge branch \u0027for-linus\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/dtor/input\n\n* \u0027for-linus\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/dtor/input:\n Input: update multi-touch protocol documentation\n Input: add the ABS_MT_PRESSURE event\n Input: winbond-cir - remove dmesg spam\n Input: lifebook - add another Lifebook DMI signature\n Input: ad7879 - support auxiliary GPIOs via gpiolib\n" }, { "commit": "cb6ecf6f7afece066265e243657b0ac28150a7b2", "tree": "063906ad19c8bd9d1796312723f8e77b9b7ad5e7", "parents": [ "93fb84b50fe03aabca8d9dea5d3ba521a07e8571" ], "author": { "name": "Henrik Rydberg", "email": "rydberg@euromail.se", "time": "Thu Jan 28 22:28:27 2010 -0800" }, "committer": { "name": "Dmitry Torokhov", "email": "dmitry.torokhov@gmail.com", "time": "Thu Jan 28 22:32:45 2010 -0800" }, "message": "Input: add the ABS_MT_PRESSURE event\n\nFor pressure-based multi-touch devices, a direct way to send sensor\nintensity data per finger is needed. This patch adds the ABS_MT_PRESSURE\nevent to the MT protocol.\n\nRequested-by: Yoonyoung Shim \u003cjy0922.shim@samsung.com\u003e\nRequested-by: Mika Kuoppala \u003cmika.kuoppala@nokia.com\u003e\nRequested-by: Peter Hutterer \u003cpeter.hutterer@who-t.net\u003e\nSigned-off-by: Henrik Rydberg \u003crydberg@euromail.se\u003e\nSigned-off-by: Dmitry Torokhov \u003cdtor@mail.ru\u003e\n" }, { "commit": "93fb84b50fe03aabca8d9dea5d3ba521a07e8571", "tree": "9ad4cc5d086f14ce0348acce867c6d58f1a099d7", "parents": [ "57b5e2ae5b5f6b687ef2c644b1cb06bd217cdbe7" ], "author": { "name": "David Härdeman", "email": "david@hardeman.nu", "time": "Thu Jan 28 22:28:27 2010 -0800" }, "committer": { "name": "Dmitry Torokhov", "email": "dmitry.torokhov@gmail.com", "time": "Thu Jan 28 22:32:38 2010 -0800" }, "message": "Input: winbond-cir - remove dmesg spam\n\nI missed converting one dev_info call to deb_dbg before submitting the driver.\nWithout this change, a message will be printed to dmesg for each button press\nif a RC6 remote is used.\n\nSigned-off-by: David Härdeman \u003cdavid@hardeman.nu\u003e\nCc: stable \u003cstable@kernel.org\u003e\nSigned-off-by: Dmitry Torokhov \u003cdtor@mail.ru\u003e\n" }, { "commit": "64a028a6de08545a2c94f302bc7694bf48aee5b5", "tree": "d01fd905efb117cb5b00443464073a6539a23684", "parents": [ "3d29935ff0773fe466e957f17284ca777a2aaa89", "12e9a45609054fb83d4a8b716a5265cc1a393e10" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Thu Jan 28 18:48:53 2010 -0800" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Thu Jan 28 18:48:53 2010 -0800" }, "message": "Merge branch \u0027for-linus\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs-2.6\n\n* \u0027for-linus\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs-2.6:\n Fix failure exit in ipathfs\n fix oops in fs/9p late mount failure\n fix leak in romfs_fill_super()\n get rid of pointless checks after simple_pin_fs()\n Fix failure exits in bfs_fill_super()\n fix affs parse_options()\n Fix remount races with symlink handling in affs\n Fix a leak in affs_fill_super()\n" }, { "commit": "3d29935ff0773fe466e957f17284ca777a2aaa89", "tree": "dcbadff76bb481124fe996e4103c138f1810e984", "parents": [ "474118d06d1d5053f27450224f0541219483ec69", "e8e06eae4ffd683931b928f460c11c40cd3f7fd8" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Thu Jan 28 16:33:12 2010 -0800" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Thu Jan 28 16:33:12 2010 -0800" }, "message": "Merge branch \u0027for-linus\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/jbarnes/pci-2.6\n\n* \u0027for-linus\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/jbarnes/pci-2.6:\n x86/PCI: remove IOH range fetching\n PCI: fix nested spinlock hang in aer_inject\n" }, { "commit": "551e28dbe82f9de58993d7587201a2569b942341", "tree": "8f14618a4f5f016d41eb5b263784e3e2a4dd2bf3", "parents": [ "b39bda6e7329b1be6dfc2741ed298b6e814532a5", "c5ce5b46af76f52dea21f467397d24c4ae6cb3ff" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Thu Jan 28 12:57:50 2010 -0800" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Thu Jan 28 12:57:50 2010 -0800" }, "message": "Merge branch \u0027for-linus\u0027 of git://git.infradead.org/ubi-2.6\n\n* \u0027for-linus\u0027 of git://git.infradead.org/ubi-2.6:\n UBI: fix volume creation input checking\n" }, { "commit": "b39bda6e7329b1be6dfc2741ed298b6e814532a5", "tree": "c1d8f0bad47b45e47cc8aaa814aaba502ec28ea9", "parents": [ "be8cde8b24c9dca1e54598690115eee5b1476519", "7a481436787cbc932af6c407b317ac603969a242" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Thu Jan 28 12:56:23 2010 -0800" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Thu Jan 28 12:56:23 2010 -0800" }, "message": "Merge branch \u0027for-linus\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/ieee1394/linux1394-2.6\n\n* \u0027for-linus\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/ieee1394/linux1394-2.6:\n firewire: ohci: fix crashes with TSB43AB23 on 64bit systems\n firewire: core: fix use-after-free regression in FCP handler\n firewire: cdev: add_descriptor documentation fix\n firewire: core: add_descriptor size check\n" }, { "commit": "57b5e2ae5b5f6b687ef2c644b1cb06bd217cdbe7", "tree": "b079bd137ee16d0bd0d502b6d63a01985fe22f0e", "parents": [ "ec51b7f538c440bfa5a4d538133c659071c02155" ], "author": { "name": "Jon Dodgson", "email": "crayzeejon@gmail.com", "time": "Thu Jan 28 00:07:45 2010 -0800" }, "committer": { "name": "Dmitry Torokhov", "email": "dmitry.torokhov@gmail.com", "time": "Thu Jan 28 00:29:03 2010 -0800" }, "message": "Input: lifebook - add another Lifebook DMI signature\n\nThere are many many ways one can capitalize \"Lifebook B Series\"...\n\nSigned-off-by: Jon Dodgson \u003ccrayzeejon@gmail.com\u003e\nSigned-off-by: Dmitry Torokhov \u003cdtor@mail.ru\u003e\n" }, { "commit": "be8cde8b24c9dca1e54598690115eee5b1476519", "tree": "5142cedbf08050eb2af074f00979cf89d90b744f", "parents": [ "981a2edd1922c00e747680f30734ea50c86af28d", "534ef056db8a8fb6b9d50188d88ed5d1fbc66673" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Wed Jan 27 09:54:08 2010 -0800" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Wed Jan 27 09:54:08 2010 -0800" }, "message": "Merge git://git.kernel.org/pub/scm/linux/kernel/git/jejb/scsi-rc-fixes-2.6\n\n* git://git.kernel.org/pub/scm/linux/kernel/git/jejb/scsi-rc-fixes-2.6:\n [SCSI] aic79xx: check for non-NULL scb in ahd_handle_nonpkt_busfree\n [SCSI] zfcp: Set hardware timeout as requested by BSG request.\n [SCSI] zfcp: Introduce bsg_timeout callback.\n [SCSI] scsi_transport_fc: Allow LLD to reset FC BSG timeout\n [SCSI] zfcp: add missing compat ptr conversion\n [SCSI] zfcp: Fix linebreak in hba trace\n [SCSI] zfcp: Issue zfcp_fc_wka_port_put after FC CT BSG request\n [SCSI] qla2xxx: Update version number to 8.03.01-k10.\n [SCSI] fc-transport: Use packed modifier for fc_bsg_request structure.\n [SCSI] qla2xxx: Perform fast mailbox read of flash regardless of size nor address alignment.\n [SCSI] qla2xxx: Correct FCP2 recovery handling.\n [SCSI] scsi_lib: Fix bug in completion of bidi commands\n [SCSI] mptsas: Fix issue with chain pools allocation on katmai\n [SCSI] aacraid: fix File System going into read-only mode\n [SCSI] lpfc: fix file permissions\n" }, { "commit": "981a2edd1922c00e747680f30734ea50c86af28d", "tree": "e32a9896900ea525eeb6019e618f8fa9d233d81e", "parents": [ "4bdadb9785696439c6e2b3efe34aa76df1149c83", "21ec7f6dbf10492ce9a21718040677d3e68bd57d" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Wed Jan 27 09:27:44 2010 -0800" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Wed Jan 27 09:27:44 2010 -0800" }, "message": "Merge branch \u0027for-linus\u0027 of git://git390.marist.edu/pub/scm/linux-2.6\n\n* \u0027for-linus\u0027 of git://git390.marist.edu/pub/scm/linux-2.6:\n [S390] fix single stepped svcs with TRACE_IRQFLAGS\u003dy\n [S390] zcrypt: Do not remove coprocessor for error 8/72\n [S390] sclp_vt220: set initial terminal window size\n [S390] use set_current_state in sigsuspend\n [S390] irqflags: add missing types.h include\n [S390] dasd: fix possible NULL pointer errors\n" }, { "commit": "4bdadb9785696439c6e2b3efe34aa76df1149c83", "tree": "986b06ebf3f585f78a7e11cae39d5fdb7251c757", "parents": [ "0531b2aac59c2296570ac52bfc032ef2ace7d5e1" ], "author": { "name": "Chris Wilson", "email": "chris@chris-wilson.co.uk", "time": "Wed Jan 27 13:36:32 2010 +0000" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Wed Jan 27 09:26:43 2010 -0800" }, "message": "drm/i915: Selectively enable self-reclaim\n\nHaving missed the ENOMEM return via i915_gem_fault(), there are probably\nother paths that I also missed. By not enabling NORETRY by default these\npaths can run the shrinker and take memory from the system (but not from\nour own inactive lists because our shrinker can not run whilst we hold\nthe struct mutex) and this may allow the system to survive a little longer\nwhilst our drivers consume all available memory.\n\nReferences:\n OOM killer unexpectedly called with kernel 2.6.32\n http://bugzilla.kernel.org/show_bug.cgi?id\u003d14933\n\nv2: Pass gfp into page mapping.\nv3: Use new read_cache_page_gfp() instead of open-coding.\n\nSigned-off-by: Chris Wilson \u003cchris@chris-wilson.co.uk\u003e\nCc: KOSAKI Motohiro \u003ckosaki.motohiro@jp.fujitsu.com\u003e\nCc: Hugh Dickins \u003chugh.dickins@tiscali.co.uk\u003e\nCc: Jesse Barnes \u003cjbarnes@virtuousgeek.org\u003e\nCc: Eric Anholt \u003ceric@anholt.net\u003e\nCc: stable@kernel.org\nSigned-off-by: Linus Torvalds \u003ctorvalds@linux-foundation.org\u003e\n" }, { "commit": "7a481436787cbc932af6c407b317ac603969a242", "tree": "b58660247f56926f591b06bd9b1e77280beef51e", "parents": [ "281e20323ab72180137824a298ee9e21e6f9acf6" ], "author": { "name": "Stefan Richter", "email": "stefanr@s5r6.in-berlin.de", "time": "Tue Jan 26 21:39:07 2010 +0100" }, "committer": { "name": "Stefan Richter", "email": "stefanr@s5r6.in-berlin.de", "time": "Wed Jan 27 18:24:53 2010 +0100" }, "message": "firewire: ohci: fix crashes with TSB43AB23 on 64bit systems\n\nUnsurprisingly, Texas Instruments TSB43AB23 exhibits the same behaviour\nas TSB43AB22/A in dual buffer IR DMA mode: If descriptors are located\nat physical addresses above the 31 bit address range (2 GB), the\ncontroller will overwrite random memory. With luck, this merely\nprevents video reception. With only a little less luck, the machine\ncrashes.\n\nWe use the same workaround here as with TSB43AB22/A: Switch off the\ndual buffer capability flag and use packet-per-buffer IR DMA instead.\nAnother possible workaround would be to limit the coherent DMA mask to\n31 bits.\n\nIn Linux 2.6.33, this change serves effectively only as documentation\nsince dual buffer mode is not used for any controller anymore. But\nsomebody might want to re-enable it in the future to make use of\nfeatures of dual buffer DMA that are not available in packet-per-buffer\nmode.\n\nIn Linux 2.6.32 and older, this update is vital for anyone with this\ncontroller, more than 2 GB RAM, a 64 bit kernel, and FireWire video or\naudio applications.\n\nWe have at least four reports:\nhttp://bugzilla.kernel.org/show_bug.cgi?id\u003d13808\nhttp://marc.info/?l\u003dlinux1394-user\u0026m\u003d126154279004083\nhttps://bugzilla.redhat.com/show_bug.cgi?id\u003d552142\nhttp://marc.info/?l\u003dlinux1394-user\u0026m\u003d126432246128386\n\nReported-by: Paul Johnson\nReported-by: Ronneil Camara\nReported-by: G Zornetzer\nReported-by: Mark Thompson\nCc: stable@kernel.org\nSigned-off-by: Stefan Richter \u003cstefanr@s5r6.in-berlin.de\u003e\n" }, { "commit": "c5ce5b46af76f52dea21f467397d24c4ae6cb3ff", "tree": "cd45d66f718c6e632ab366e9847129c913821f41", "parents": [ "92dcffb916d309aa01778bf8963a6932e4014d07" ], "author": { "name": "Mika Westerberg", "email": "ext-mika.1.westerberg@nokia.com", "time": "Tue Jan 26 17:47:05 2010 +0200" }, "committer": { "name": "Artem Bityutskiy", "email": "Artem.Bityutskiy@nokia.com", "time": "Wed Jan 27 11:55:43 2010 +0200" }, "message": "UBI: fix volume creation input checking\n\nDo not use an unchecked variable UBI_IOCMKVOL ioctl.\n\nSigned-off-by: Mika Westerberg \u003cext-mika.1.westerberg@nokia.com\u003e\nSigned-off-by: Artem Bityutskiy \u003cArtem.Bityutskiy@nokia.com\u003e\nCc: stable@vger.kernel.org\n" }, { "commit": "19b123ebacacdce5e75045bfe82122b01c821a5b", "tree": "31a7975e6521f306bb7d6e09e7453d860d56ecdb", "parents": [ "0b665d770d2d4dca8e9ea53129735fe214838ec9" ], "author": { "name": "Felix Beck", "email": "felix.beck@de.ibm.com", "time": "Wed Jan 27 10:12:39 2010 +0100" }, "committer": { "name": "Martin Schwidefsky", "email": "sky@mschwide.boeblingen.de.ibm.com", "time": "Wed Jan 27 10:12:49 2010 +0100" }, "message": "[S390] zcrypt: Do not remove coprocessor for error 8/72\n\nIn a case where the number of the input data is bigger than the\nmodulus of the key, the coprocessor adapters will report an 8/72\nerror. This case is not caught yet, thus the adapter will be taken\noffline. To prevent this, we return an -EINVAL instead.\n\nSigned-off-by: Felix Beck \u003cfelix.beck@de.ibm.com\u003e\nSigned-off-by: Martin Schwidefsky \u003cschwidefsky@de.ibm.com\u003e\n" }, { "commit": "0b665d770d2d4dca8e9ea53129735fe214838ec9", "tree": "365f0b15c48fc2fe22bf5468c40998af95a96f9e", "parents": [ "0b4d78903bf48fe6b125c4c9f0755437a4f21d47" ], "author": { "name": "Hendrik Brueckner", "email": "brueckner@linux.vnet.ibm.com", "time": "Wed Jan 27 10:12:38 2010 +0100" }, "committer": { "name": "Martin Schwidefsky", "email": "sky@mschwide.boeblingen.de.ibm.com", "time": "Wed Jan 27 10:12:49 2010 +0100" }, "message": "[S390] sclp_vt220: set initial terminal window size\n\nWhen opening a SCLP VT220 terminal, the terminal window size is not\ninitialized (defaults to zero).\nSince the SCLP VT220 terminal supports only 80x24, explicitly set\nthe window size to prevent (n)curses applications from guessing\nthe default setting.\n\nSigned-off-by: Hendrik Brueckner \u003cbrueckner@linux.vnet.ibm.com\u003e\nSigned-off-by: Martin Schwidefsky \u003cschwidefsky@de.ibm.com\u003e\n" }, { "commit": "294001a80c9810e2fe27aaaad7df8be12a103065", "tree": "1615733697057a38054f68bf46109fffeeb5e549", "parents": [ "b04da8bfdfbbd79544cab2fadfdc12e87eb01600" ], "author": { "name": "Stefan Haberland", "email": "stefan.haberland@de.ibm.com", "time": "Wed Jan 27 10:12:35 2010 +0100" }, "committer": { "name": "Martin Schwidefsky", "email": "sky@mschwide.boeblingen.de.ibm.com", "time": "Wed Jan 27 10:12:48 2010 +0100" }, "message": "[S390] dasd: fix possible NULL pointer errors\n\nFix possible NULL pointer in DASD messages and correct discipline\nchecking.\n\nSigned-off-by: Stefan Haberland \u003cstefan.haberland@de.ibm.com\u003e\nSigned-off-by: Martin Schwidefsky \u003cschwidefsky@de.ibm.com\u003e\n" }, { "commit": "12e9a45609054fb83d4a8b716a5265cc1a393e10", "tree": "a760a5b72acc47fc0362ac8c0c8e42483beb2555", "parents": [ "083c73c253c23c20359a344dfe1198ea628e6259" ], "author": { "name": "Al Viro", "email": "viro@zeniv.linux.org.uk", "time": "Mon Jan 25 18:44:58 2010 -0500" }, "committer": { "name": "Al Viro", "email": "viro@zeniv.linux.org.uk", "time": "Tue Jan 26 22:22:27 2010 -0500" }, "message": "Fix failure exit in ipathfs\n\ndeactivate_locked_super() will be done by caller of fill_super, doing\nit there as well is b0rken.\n\nSigned-off-by: Al Viro \u003cviro@zeniv.linux.org.uk\u003e\n" }, { "commit": "281e20323ab72180137824a298ee9e21e6f9acf6", "tree": "b807edaafec3c00e442d41d9091b9783a53820f9", "parents": [ "6d3faf6f431bafb25f4b9926c50a7e5c267738c6" ], "author": { "name": "Stefan Richter", "email": "stefanr@s5r6.in-berlin.de", "time": "Sun Jan 24 16:45:03 2010 +0100" }, "committer": { "name": "Stefan Richter", "email": "stefanr@s5r6.in-berlin.de", "time": "Tue Jan 26 20:54:50 2010 +0100" }, "message": "firewire: core: fix use-after-free regression in FCP handler\n\nCommit db5d247a \"firewire: fix use of multiple AV/C devices, allow\nmultiple FCP listeners\" introduced a regression into 2.6.33-rc3:\nThe core freed payloads of incoming requests to FCP_Request or\nFCP_Response before a userspace driver accessed them.\n\nWe need to copy such payloads for each registered userspace client\nand free the copies according to the lifetime rules of non-FCP client\nrequest resources.\n\n(This could possibly be optimized by reference counts instead of\ncopies.)\n\nThe presently only kernelspace driver which listens for FCP requests,\nfiredtv, was not affected because it already copies FCP frames into an\nown buffer before returning to firewire-core\u0027s FCP handler dispatcher.\n\nSigned-off-by: Stefan Richter \u003cstefanr@s5r6.in-berlin.de\u003e\n" }, { "commit": "e300839da40e99581581c5d053a95a172651fec8", "tree": "bb6c59a38828f4af0fd728f959dcbd39546891ce", "parents": [ "92dcffb916d309aa01778bf8963a6932e4014d07" ], "author": { "name": "Stefan Richter", "email": "stefanr@s5r6.in-berlin.de", "time": "Sun Jan 24 14:47:02 2010 +0100" }, "committer": { "name": "Stefan Richter", "email": "stefanr@s5r6.in-berlin.de", "time": "Tue Jan 26 20:54:50 2010 +0100" }, "message": "firewire: core: add_descriptor size check\n\nPresently, firewire-core only checks whether descriptors that are to be\nadded by userspace drivers to the local node\u0027s config ROM do not exceed\na size of 256 quadlets. However, the sum of the bare minimum ROM plus\nall descriptors (from firewire-core, from firewire-net, from userspace)\nmust not exceed 256 quadlets.\n\nOtherwise, the bounds of a statically allocated buffer will be\noverwritten. If the kernel survives that, firewire-core will\nsubsequently be unable to parse the local node\u0027s config ROM.\n\n(Note, userspace drivers can add descriptors only through device files\nof local nodes. These are usually only accessible by root, unlike\ndevice files of remote nodes which may be accessible to lesser\nprivileged users.)\n\nTherefore add a test which takes the actual present and required ROM\nsize into account for all descriptors of kernelspace and userspace\ndrivers.\n\nCc: stable@kernel.org\nSigned-off-by: Stefan Richter \u003cstefanr@s5r6.in-berlin.de\u003e\n" }, { "commit": "01974ea61fc22f086d2987b4b717cbda055f0d03", "tree": "bf5dacb0640bece071cc2b68378bc75a40cfa94a", "parents": [ "7c1c05afddf6bb0a4804cb506f3885248a749aa2", "ef39a1bf3c4fbdea085c618be424cc88b803f248" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Mon Jan 25 19:03:58 2010 -0800" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Mon Jan 25 19:03:58 2010 -0800" }, "message": "Merge git://git.kernel.org/pub/scm/linux/kernel/git/wim/linux-2.6-watchdog\n\n* git://git.kernel.org/pub/scm/linux/kernel/git/wim/linux-2.6-watchdog:\n [WATCHDOG] sbc_fitpc2_wdt: fix I/O space access technique.\n [WATCHDOG] ixp2000: Fix build failure caused by missing include\n" }, { "commit": "a8d0b6666ecfe14226f1e46d693d5e2cde072337", "tree": "fc561f1e0d1489961782fb3c37466ce9c7f1951e", "parents": [ "c799d15333ff52a3f19ca926636a7774a16cca58", "ebddd63b74dcf1cb676d14328d5852f1fee19a8a" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Mon Jan 25 19:02:06 2010 -0800" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Mon Jan 25 19:02:06 2010 -0800" }, "message": "Merge branch \u0027linux-next\u0027 of git://git.infradead.org/ubi-2.6\n\n* \u0027linux-next\u0027 of git://git.infradead.org/ubi-2.6:\n UBI: fix memory leak in update path\n UBI: add more checks to chdev open\n UBI: initialise update marker\n" }, { "commit": "c799d15333ff52a3f19ca926636a7774a16cca58", "tree": "0b0cdb1665aad0ff215a8297cf7af64e63a97f57", "parents": [ "abefedd538f57f63199d821ade33f282e7fe0921", "c453615f77aa51593c1c9c9031b4278797d3fd19" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Mon Jan 25 19:00:56 2010 -0800" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Mon Jan 25 19:00:56 2010 -0800" }, "message": "Merge branch \u0027hwmon-for-linus\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/jdelvare/staging\n\n* \u0027hwmon-for-linus\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/jdelvare/staging:\n hwmon: (fschmd) Fix a memleak on multiple opens of /dev/watchdog\n hwmon: (asus_atk0110) Do not fail if MBIF is missing\n hwmon: (amc6821) Double unlock bug\n hwmon: (smsc47m1) Fix section mismatch\n" }, { "commit": "abefedd538f57f63199d821ade33f282e7fe0921", "tree": "d5b442c1d504ac0ed12c2801b98b6418a7f79764", "parents": [ "840f51ffe126123e748df0f36c411a90db1efd93", "7087e16286913b41ba9a5186360645b57b8508dd" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Mon Jan 25 18:59:47 2010 -0800" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Mon Jan 25 18:59:47 2010 -0800" }, "message": "Merge branch \u0027drm-linus\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/airlied/drm-2.6\n\n* \u0027drm-linus\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/airlied/drm-2.6: (95 commits)\n drm/radeon/kms: preface warning printk with driver name\n drm/radeon/kms: drop unnecessary printks.\n drm: fix regression in fb blank handling\n drm/radeon/kms: make hibernate work on IGPs\n drm/vmwgfx: Optimize memory footprint for DMA buffers.\n drm/ttm: Allow system memory as a busy placement.\n drm/ttm: Fix race condition in ttm_bo_delayed_delete (v3, final)\n drm/nv50: prevent switching off SOR when in use for DVI-over-DP\n drm/nv50: fail auxch transaction if reply count not what we expect\n drm/nouveau: fix failure path if userspace specifies no valid memtypes\n drm/nouveau: report LVDS as disconnected if lid closed\n drm/radeon/kms: fix legacy get_engine/memory clock\n drm/radeon/kms/atom: atom parser fixes\n drm/radeon/kms: clean up atombios pll code\n drm/radeon/kms: clean up pll struct\n drm/radeon/kms/atom: fix crtc lock ordering\n drm/radeon: r6xx/r7xx possible security issue, system ram access\n drm/radeon/kms: r600/r700 don\u0027t test ib if ib initialization fails\n drm/radeon/kms: Forbid creation of framebuffer with no valid GEM object\n drm/radeon/kms: r600 handle irq vector ring overflow\n ...\n" }, { "commit": "e2197787efe54c0dcbdc4f6acb6dabb65f27f347", "tree": "fb9bbf08293f0f43954f128708e6422f1d21a404", "parents": [ "4f4e65d2484811210a2826fa9d59712c7fcf1b49", "39d321577405e8e269fd238b278aaf2425fa788a" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Mon Jan 25 18:57:07 2010 -0800" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Mon Jan 25 18:57:07 2010 -0800" }, "message": "Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-2.6\n\n* git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-2.6: (42 commits)\n virtio_net: Make delayed refill more reliable\n sfc: Use fixed-size buffers for MCDI NVRAM requests\n sfc: Add workspace for GMAC bug workaround to MCDI MAC_STATS buffer\n tcp_probe: avoid modulus operation and wrap fix\n qlge: Only free resources if they were allocated\n netns xfrm: deal with dst entries in netns\n sky2: revert config space change\n vlan: fix vlan_skb_recv()\n netns xfrm: fix \"ip xfrm state|policy count\" misreport\n sky2: Enable/disable WOL per hardware device\n net: Fix IPv6 GSO type checks in Intel ethernet drivers\n igb/igbvf: cleanup exception handling in tx_map_adv\n MAINTAINERS: Add Intel igbvf maintainer\n e1000/e1000e: don\u0027t use small hardware rx buffers\n fmvj18x_cs: add new id (Panasonic lan \u0026 modem card)\n be2net: swap only first 2 fields of mcc_wrb\n Please add support for Microsoft MN-120 PCMCIA network card\n be2net: fix bug in rx page posting\n wimax/i2400m: Add support for more i6x50 SKUs\n e1000e: enhance frame fragment detection\n ...\n" }, { "commit": "39d321577405e8e269fd238b278aaf2425fa788a", "tree": "923bded413373b0ee72b0929fa7413953888da12", "parents": [ "5a27e86babe79cf5f575394bb1055448458df6c7" ], "author": { "name": "Herbert Xu", "email": "herbert@gondor.apana.org.au", "time": "Mon Jan 25 15:51:01 2010 -0800" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Mon Jan 25 15:51:01 2010 -0800" }, "message": "virtio_net: Make delayed refill more reliable\n\nI have seen RX stalls on a machine that experienced a suspected\nOOM. After the stall, the RX buffer is empty on the guest side\nand there are exactly 16 entries available on the host side. As\nthe number of entries is less than that required by a maximal\nskb, the host cannot proceed.\n\nThe guest did not have a refill job scheduled.\n\nMy diagnosis is that an OOM had occured, with the delayed refill\njob scheduled. The job was able to allocate at least one skb, but\nnot enough to overcome the minimum required by the host to proceed.\n\nAs the refill job would only reschedule itself if it failed completely\nto allocate any skbs, this would lead to an RX stall.\n\nThe following patch removes this stall possibility by always\nrescheduling the refill job until the ring is totally refilled.\n\nTesting has shown that the RX stall no longer occurs whereas\npreviously it would occur within a day.\n\nSigned-off-by: Herbert Xu \u003cherbert@gondor.apana.org.au\u003e\nAcked-by: Rusty Russell \u003crusty@rustcorp.com.au\u003e\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "5a27e86babe79cf5f575394bb1055448458df6c7", "tree": "fa64f367db6367525ed6fb3097e6a509ec93c581", "parents": [ "8704a2c8e9db24157a7b08d1678bf840f2318779" ], "author": { "name": "Ben Hutchings", "email": "bhutchings@solarflare.com", "time": "Mon Jan 25 15:49:59 2010 -0800" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Mon Jan 25 15:49:59 2010 -0800" }, "message": "sfc: Use fixed-size buffers for MCDI NVRAM requests\n\nThe low-level MCDI code always uses 32-bit MMIO operations, and\ncallers must pad input and output buffers to multiples of 4 bytes.\nThe MCDI NVRAM functions are not doing this. Also, their buffers are\ndeclared as variable-length arrays with no explicit maximum length.\n\nSwitch to a fixed buffer size based on the chunk size used by the\nMTD driver (which is a multiple of 4).\n\nSigned-off-by: Ben Hutchings \u003cbhutchings@solarflare.com\u003e\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "8704a2c8e9db24157a7b08d1678bf840f2318779", "tree": "c05b65c9497729a38afbf7146a8d97f7261b2f86", "parents": [ "f81074f86176605bfbfafb9944e27628a4e26ce6" ], "author": { "name": "Guido Barzini", "email": "gbarzini@solarflare.com", "time": "Mon Jan 25 15:49:19 2010 -0800" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Mon Jan 25 15:49:19 2010 -0800" }, "message": "sfc: Add workspace for GMAC bug workaround to MCDI MAC_STATS buffer\n\nDue to a hardware bug in the SFC9000 family, the firmware must\ntransfer raw GMAC statistics to host memory before aggregating them\ninto the cooked (speed-independent) MAC statistics. Extend the stats\nbuffer to support this.\n\nThe length of the buffer is explicit in the MAC_STATS command, so this\nchange is backward-compatible on both sides.\n\nSigned-off-by: Ben Hutchings \u003cbhutchings@solarflare.com\u003e\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "4f9a91c81273b66afe0b6a9be460b47581b28246", "tree": "a9868d5c1765e7bb13d7b4bf4013a4f8df043052", "parents": [ "d7c7544c3d5f59033d1bf3236bc7b289f5f26b75" ], "author": { "name": "Breno Leitao", "email": "leitao@linux.vnet.ibm.com", "time": "Mon Jan 25 15:46:58 2010 -0800" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Mon Jan 25 15:46:58 2010 -0800" }, "message": "qlge: Only free resources if they were allocated\n\nCurrently qlge tries to release regions even if they were not allocated.\nThis causes messages like the following in the kernel log\n\nTrying to free nonexistent resource \u003c00000000006af400-00000000006af4ff\u003e\nTrying to free nonexistent resource \u003c00003c04ff9f4000-00003c04ff9f7fff\u003e\nTrying to free nonexistent resource \u003c00003c04ffc00000-00003c04ffcfffff\u003e\n\nThis patch fixes the goto logic in order to not release the resources\nif they were not allocated.\n\nSigned-off-by: Breno Leitao \u003cleitao@linux.vnet.ibm.com\u003e\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "ef39a1bf3c4fbdea085c618be424cc88b803f248", "tree": "44be93747836260b3fb2778cfe5830c2c467abe1", "parents": [ "e605d554ec17be55741b066387ae9f341777f52c" ], "author": { "name": "Denis Turischev", "email": "denis@compulab.co.il", "time": "Thu Jan 21 16:10:07 2010 +0200" }, "committer": { "name": "Wim Van Sebroeck", "email": "wim@iguana.be", "time": "Mon Jan 25 19:48:49 2010 +0000" }, "message": "[WATCHDOG] sbc_fitpc2_wdt: fix I/O space access technique.\n\nThe mdelay function was used between I/O access commands, that causes peak\nin CPU usage. Fix it by substitution mdelay to msleep.\n\nExpand usage on fitPC2 compatible boards according to DMI identification.\n\nSigned-off-by: Denis Turischev \u003cdenis@compulab.co.il\u003e\nSigned-off-by: Wim Van Sebroeck \u003cwim@iguana.be\u003e\n\n" }, { "commit": "bd1f46deba615971a58193afd0202878cadf19a7", "tree": "1a197e82ad0f6314f0ff0507c04030aaad933c7c", "parents": [ "61c39bb354a1f791ba6f562b766a72e508a036ee" ], "author": { "name": "Andrew Patterson", "email": "andrew.patterson@hp.com", "time": "Fri Jan 22 14:06:53 2010 -0700" }, "committer": { "name": "Jesse Barnes", "email": "jbarnes@virtuousgeek.org", "time": "Mon Jan 25 10:42:52 2010 -0800" }, "message": "PCI: fix nested spinlock hang in aer_inject\n\nThe aer_inject module hangs in aer_inject() when checking the device\u0027s\nerror masks. The hang is due to a recursive use of the aer_inject lock.\nThe aer_inject() routine grabs the lock while processing the error and then\ncalls pci_read_config_dword to read the masks. The pci_read_config_dword\nroutine is earlier overridden by pci_read_aer, which among other things,\ngrabs the aer_inject lock.\n\nFixed by moving the pci_read_config_dword calls to read the masks to before\nthe lock is taken.\n\nAcked-by: Huang Ying \u003cying.huang@intel.com\u003e\nSigned-off-by: Andrew Patterson \u003candrew.patterson@hp.com\u003e\nSigned-off-by: Jesse Barnes \u003cjbarnes@virtuousgeek.org\u003e\n" }, { "commit": "c453615f77aa51593c1c9c9031b4278797d3fd19", "tree": "7d6c05c9487b311d4f276d4c4bdf42d4e06fa445", "parents": [ "5542482b9c61c2588f1178f315310a794988051a" ], "author": { "name": "Hans de Goede", "email": "hdegoede@redhat.com", "time": "Mon Jan 25 15:00:50 2010 +0100" }, "committer": { "name": "Jean Delvare", "email": "khali@linux-fr.org", "time": "Mon Jan 25 15:00:50 2010 +0100" }, "message": "hwmon: (fschmd) Fix a memleak on multiple opens of /dev/watchdog\n\nWhen /dev/watchdog gets opened a second time we return -EBUSY, but\nwe already have got a kref then, so we end up leaking our data struct.\n\nSigned-off-by: Hans de Goede \u003chdegoede@redhat.com\u003e\nSigned-off-by: Jean Delvare \u003ckhali@linux-fr.org\u003e\nCc: stable@kernel.org\n" }, { "commit": "5542482b9c61c2588f1178f315310a794988051a", "tree": "13f23a4bca5d825a8eecddeff1097e286bf20d7d", "parents": [ "316e2664dcc82e9c5f73360a4fb8f9279a8152ed" ], "author": { "name": "Luca Tettamanti", "email": "kronos.it@gmail.com", "time": "Mon Jan 25 15:00:49 2010 +0100" }, "committer": { "name": "Jean Delvare", "email": "khali@linux-fr.org", "time": "Mon Jan 25 15:00:49 2010 +0100" }, "message": "hwmon: (asus_atk0110) Do not fail if MBIF is missing\n\nMBIF (motherboard identification) is only used to print the name of\nthe board, it\u0027s not essential for the driver; do not fail if it\u0027s\nmissing. Based on Juan\u0027s patch.\n\nSigned-off-by: Luca Tettamanti \u003ckronos.it@gmail.com\u003e\nAcked-by: Juan RP \u003cxtraeme@gmail.com\u003e\nSigned-off-by: Jean Delvare \u003ckhali@linux-fr.org\u003e\n" }, { "commit": "316e2664dcc82e9c5f73360a4fb8f9279a8152ed", "tree": "e305e6e6ef37ff528af19434ef86dce06b711045", "parents": [ "a00d643a2a841e76dfb76ec4f8a1e71844252974" ], "author": { "name": "Dan Carpenter", "email": "error27@gmail.com", "time": "Mon Jan 25 15:00:49 2010 +0100" }, "committer": { "name": "Jean Delvare", "email": "khali@linux-fr.org", "time": "Mon Jan 25 15:00:49 2010 +0100" }, "message": "hwmon: (amc6821) Double unlock bug\n\nThe mutex gets unlocked after we goto EXIT.\n\nSigned-off-by: Dan Carpenter \u003cerror27@gmail.com\u003e\nSigned-off-by: Jean Delvare \u003ckhali@linux-fr.org\u003e\n" }, { "commit": "a00d643a2a841e76dfb76ec4f8a1e71844252974", "tree": "7173fc5d9655a17a109298b919ea4e7aeb690abe", "parents": [ "f6760aa024199cfbce564311dc4bc4d47b6fb349" ], "author": { "name": "Jeff Mahoney", "email": "jeffm@suse.com", "time": "Mon Jan 25 15:00:48 2010 +0100" }, "committer": { "name": "Jean Delvare", "email": "khali@linux-fr.org", "time": "Mon Jan 25 15:00:48 2010 +0100" }, "message": "hwmon: (smsc47m1) Fix section mismatch\n\nsmsc47m1_restore is called from sm_smsc47m1_exit, which is an __exit\nfunction, so it can\u0027t be __init.\n\nSigned-off-by: Jeff Mahoney \u003cjeffm@suse.com\u003e\nSigned-off-by: Jean Delvare \u003ckhali@linux-fr.org\u003e\n" }, { "commit": "a40ccc6868943e74ec12f26a266ce1d0373b2b32", "tree": "7ac30003808ea30998d0949927c150b09aa1364e", "parents": [ "2dc85e91d05be91343033df78e4e6d99dc7ea50e" ], "author": { "name": "stephen hemminger", "email": "shemminger@vyatta.com", "time": "Sun Jan 24 18:46:06 2010 +0000" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Sun Jan 24 22:37:07 2010 -0800" }, "message": "sky2: revert config space change\n\nObviously, this register had some other impact that is causing\nthe regression. Either it is masking some other access or needs\nto be reset in some path.\n\nEither, way it is best to just revert the change for 2.6.33\n\nThis reverts commit 166a0fd4c788ec7f10ca8194ec6d526afa12db75.\n\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "7087e16286913b41ba9a5186360645b57b8508dd", "tree": "5a199665f9c04a78c0a3cbb5d1b98785d3edfaf7", "parents": [ "f2ab3a13d2cbe19426c27c35a014c98212e914a5" ], "author": { "name": "Dave Airlie", "email": "airlied@redhat.com", "time": "Mon Jan 25 16:13:55 2010 +1000" }, "committer": { "name": "Dave Airlie", "email": "airlied@redhat.com", "time": "Mon Jan 25 16:13:55 2010 +1000" }, "message": "drm/radeon/kms: preface warning printk with driver name\n\nThis just adds a little more info to the warning for old -ati/mesa\nuserspaces.\n\nSigned-off-by: Dave Airlie \u003cairlied@redhat.com\u003e\n" }, { "commit": "f2ab3a13d2cbe19426c27c35a014c98212e914a5", "tree": "976a541f1394200ac57ad25c939723dff66c801c", "parents": [ "5fd4df4d475a7fee96fff54f6341192f547984e0" ], "author": { "name": "Dave Airlie", "email": "airlied@redhat.com", "time": "Mon Jan 25 16:13:12 2010 +1000" }, "committer": { "name": "Dave Airlie", "email": "airlied@redhat.com", "time": "Mon Jan 25 16:13:12 2010 +1000" }, "message": "drm/radeon/kms: drop unnecessary printks.\n\nThese printks aren\u0027t required anymore.\n\nSigned-off-by: Dave Airlie \u003cairlied@redhat.com\u003e\n" }, { "commit": "5fd4df4d475a7fee96fff54f6341192f547984e0", "tree": "d6a5c1f2c9cf8cca953aabed543f86c732e2adee", "parents": [ "d796d8446fe0ff4442c1a1d0b10c861f17ac8168" ], "author": { "name": "Zhenyu Wang", "email": "zhenyuw@linux.intel.com", "time": "Mon Jan 18 16:47:04 2010 +0800" }, "committer": { "name": "Dave Airlie", "email": "airlied@redhat.com", "time": "Mon Jan 25 16:04:47 2010 +1000" }, "message": "drm: fix regression in fb blank handling\n\ncommit 731b5a15a3b1474a41c2ca29b4c32b0f21bc852e\nAuthor: James Simmons \u003cjsimmons@infradead.org\u003e\nDate: Thu Oct 29 20:39:07 2009 +0000\n\n drm/kms: properly handle fbdev blanking\n\nuses DRM_MODE_DPMS_ON for FB_BLANK_NORMAL, but DRM_MODE_DPMS_ON\nis actually for turning output on instead of blank.\n\nThis makes fb blank broken on my T61, it put LVDS on but leave\npipe disabled which made screen totally white or caused some\n\u0027burning\u0027 effect.\n\n[airlied: James objects to this but at this point in 2.6.33,\nI can\u0027t see a patch that will fix this properly like he wants coming\nin time and otherwise this is a regression - proper fix for 2.6.34\nhopefully.]\n\nCc: James Simmons \u003cjsimmons@infradead.org\u003e\nSigned-off-by: Zhenyu Wang \u003czhenyuw@linux.intel.com\u003e\nSigned-off-by: Dave Airlie \u003cairlied@redhat.com\u003e\n" }, { "commit": "d796d8446fe0ff4442c1a1d0b10c861f17ac8168", "tree": "c3457449a8c9bf019fb81becd042a3f64ee0b972", "parents": [ "8ba5152a3acd5914cade42a1c8c9dc58ad8d1a89" ], "author": { "name": "Dave Airlie", "email": "airlied@redhat.com", "time": "Mon Jan 25 13:08:08 2010 +1000" }, "committer": { "name": "Dave Airlie", "email": "airlied@redhat.com", "time": "Mon Jan 25 16:04:42 2010 +1000" }, "message": "drm/radeon/kms: make hibernate work on IGPs\n\nThis is the least invasive fix without migrating the radeon driver\nto pm_ops from what I can see. We just always migrate VRAM objects\non IGPs for now and we can fix it up later to migrate depending\non STR vs STD.\n\nSigned-off-by: Dave Airlie \u003cairlied@redhat.com\u003e\n" }, { "commit": "8ba5152a3acd5914cade42a1c8c9dc58ad8d1a89", "tree": "7e5433d4d03d753a152a9e1eec5c6e4c6958709a", "parents": [ "0eaddb28d3460f13102cd82cf58af875bfb1bd53" ], "author": { "name": "Thomas Hellstrom", "email": "thellstrom@vmware.com", "time": "Sat Jan 16 16:05:05 2010 +0100" }, "committer": { "name": "Dave Airlie", "email": "airlied@redhat.com", "time": "Mon Jan 25 16:04:39 2010 +1000" }, "message": "drm/vmwgfx: Optimize memory footprint for DMA buffers.\n\nUse VRAM whenever there is free space for DMA buffers,\nbut use system GMR memory if using VRAM would cause an eviction.\n\nThis significantly reduces the guest system memory usage for\nVMs with a large amount of VRAM allocated.\n\nSigned-off-by: Thomas Hellstrom \u003cthellstrom@vmware.com\u003e\nSigned-off-by: Dave Airlie \u003cairlied@redhat.com\u003e\n" }, { "commit": "0eaddb28d3460f13102cd82cf58af875bfb1bd53", "tree": "5fe3e9f8c1e7d6c5c1fd2c2bf445a3d7cc9d33e2", "parents": [ "9299795c6e1e11b2d1e6f53a03902dc80cfb3320" ], "author": { "name": "Thomas Hellstrom", "email": "thellstrom@vmware.com", "time": "Sat Jan 16 16:05:04 2010 +0100" }, "committer": { "name": "Dave Airlie", "email": "airlied@redhat.com", "time": "Mon Jan 25 16:04:30 2010 +1000" }, "message": "drm/ttm: Allow system memory as a busy placement.\n\nThis is needed to fix a vmwgfx memory usage bug.\n\nSigned-off-by: Thomas Hellstrom \u003cthellstrom@vmware.com\u003e\nSigned-off-by: Dave Airlie \u003cairlied@redhat.com\u003e\n" }, { "commit": "9299795c6e1e11b2d1e6f53a03902dc80cfb3320", "tree": "abfda0d16d1c8239e2be8294a8e5c02190d9384a", "parents": [ "8d586fe65a33b1a3a2a2539119248ce12f4bab50", "38678d3557420a1c40f7ad5a04a46a7de7a305b9" ], "author": { "name": "Dave Airlie", "email": "airlied@redhat.com", "time": "Mon Jan 25 16:04:21 2010 +1000" }, "committer": { "name": "Dave Airlie", "email": "airlied@redhat.com", "time": "Mon Jan 25 16:04:21 2010 +1000" }, "message": "Merge remote branch \u0027korg/drm-radeon-next\u0027 into drm-linus\n\n* korg/drm-radeon-next:\n drm/radeon/kms: fix legacy get_engine/memory clock\n drm/radeon/kms/atom: atom parser fixes\n drm/radeon/kms: clean up atombios pll code\n drm/radeon/kms: clean up pll struct\n drm/radeon/kms/atom: fix crtc lock ordering\n drm/radeon: r6xx/r7xx possible security issue, system ram access\n drm/radeon/kms: r600/r700 don\u0027t test ib if ib initialization fails\n drm/radeon/kms: Forbid creation of framebuffer with no valid GEM object\n drm/radeon/kms: r600 handle irq vector ring overflow\n drm/radeon/kms: r600/r700 don\u0027t process IRQ if not initialized\n drm/radeon/kms: r600/r700 disable irq at suspend\n drm/radeon/kms/r4xx: cleanup atom path\n drm/radeon/kms: fix atombios_crtc_set_base\n drm/radeon/kms/atom: upstream parser updates\n drm/radeon/kms/atom: fix some parser bugs\n drm/radeon/kms: fix hardcoded mmio size in register functions\n drm/radeon/kms/r100: fix bug in CS parser\n drm/radeon/kms/r200: fix bug in CS parser\n drm/radeon/kms/r200: fix bug in CS parser\n" }, { "commit": "8d586fe65a33b1a3a2a2539119248ce12f4bab50", "tree": "05b20c54ec304069002358c7e7682237099ff5d2", "parents": [ "1a961ce09fe39df9a1b796df98794fd32c76c413", "162265367a96d381f07066581d65e52627b08618" ], "author": { "name": "Dave Airlie", "email": "airlied@redhat.com", "time": "Mon Jan 25 16:04:11 2010 +1000" }, "committer": { "name": "Dave Airlie", "email": "airlied@redhat.com", "time": "Mon Jan 25 16:04:11 2010 +1000" }, "message": "Merge remote branch \u0027nouveau/for-airlied\u0027 of ../drm-nouveau-next into drm-linus\n\n* \u0027nouveau/for-airlied\u0027 of ../drm-nouveau-next:\n drm/nv50: prevent switching off SOR when in use for DVI-over-DP\n drm/nv50: fail auxch transaction if reply count not what we expect\n drm/nouveau: fix failure path if userspace specifies no valid memtypes\n drm/nouveau: report LVDS as disconnected if lid closed\n drm/nv50: prevent accidently turning off encoders we\u0027re actually using\n drm/nv50: fix alignment of per-channel fifo cache\n drm/nouveau: Evict buffers in VRAM before freeing sgdma\n drm/nouveau: Acknowledge DMA_VTX_PROTECTION PGRAPH interrupts\n drm/nouveau: fix thinko in nv04_instmem.c\n drm/nouveau: fix a race condition in nouveau_dma_wait()\n" }, { "commit": "1a961ce09fe39df9a1b796df98794fd32c76c413", "tree": "06ab04dd5f4fb780f23a8468cf2b65d152c3db1f", "parents": [ "8471a26b9c36c965d278020cc0699e2e95d120e5" ], "author": { "name": "Luca Barbieri", "email": "luca@luca-barbieri.com", "time": "Wed Jan 20 20:01:30 2010 +0100" }, "committer": { "name": "Dave Airlie", "email": "airlied@redhat.com", "time": "Mon Jan 25 11:43:54 2010 +1000" }, "message": "drm/ttm: Fix race condition in ttm_bo_delayed_delete (v3, final)\n\nResending this with Thomas Hellstrom\u0027s signoff for merging into 2.6.33\n\nttm_bo_delayed_delete has a race condition, because after we do:\nkref_put(\u0026nentry-\u003elist_kref, ttm_bo_release_list);\n\nwe are not holding the list lock and not holding any reference to\nobjects, and thus every bo in the list can be removed and freed at\nthis point.\n\nHowever, we then use the next pointer we stored, which is not guaranteed\nto be valid.\n\nThis was apparently the cause of some Nouveau oopses I experienced.\n\nThis patch rewrites the function so that it keeps the reference to nentry\nuntil nentry itself is freed and we already got a reference to nentry-\u003enext.\n\nv2 updated by me according to Thomas Hellstrom\u0027s feedback.\nv3 proposed by Thomas Hellstrom. Commit comment updated by me.\n\nBoth updates fixed minor efficiency/style issues only and all three versions\nshould be correct.\n\nSigned-off-by: Luca Barbieri \u003cluca@luca-barbieri.com\u003e\nSigned-off-by: Thomas Hellstrom \u003cthellstrom@vmware.com\u003e\nSigned-off-by: Dave Airlie \u003cairlied@redhat.com\u003e\n" }, { "commit": "162265367a96d381f07066581d65e52627b08618", "tree": "d39acdcba8c392355f95a9a9e39a0ba84ae1f3a8", "parents": [ "0107bae01add219e1a146f2b412d64a7f1946028" ], "author": { "name": "Ben Skeggs", "email": "bskeggs@redhat.com", "time": "Fri Jan 22 10:57:01 2010 +1000" }, "committer": { "name": "Ben Skeggs", "email": "bskeggs@redhat.com", "time": "Mon Jan 25 10:35:33 2010 +1000" }, "message": "drm/nv50: prevent switching off SOR when in use for DVI-over-DP\n\nAnother hack because of us exposing each encoder block\u0027s function as\nan encoder rather than exposing a single encoder that deals with them\nall.\n\nA proper fix will come, it\u0027s just rather invasive so this hack will\ndo until then.\n\nSigned-off-by: Ben Skeggs \u003cbskeggs@redhat.com\u003e\n" }, { "commit": "0107bae01add219e1a146f2b412d64a7f1946028", "tree": "7432b1d6c37f53ba03a65fe2fe2a102336bd6c67", "parents": [ "0208843dd59330c30e0773c77d5362260aa340e0" ], "author": { "name": "Ben Skeggs", "email": "bskeggs@redhat.com", "time": "Fri Jan 22 09:10:05 2010 +1000" }, "committer": { "name": "Ben Skeggs", "email": "bskeggs@redhat.com", "time": "Mon Jan 25 10:35:25 2010 +1000" }, "message": "drm/nv50: fail auxch transaction if reply count not what we expect\n\nSigned-off-by: Ben Skeggs \u003cbskeggs@redhat.com\u003e\n" }, { "commit": "0208843dd59330c30e0773c77d5362260aa340e0", "tree": "c37f2dffe30c252b7f0a46fe5e8f6462227fd98f", "parents": [ "a1470890f29da73783e932078ed911f5871e3ad3" ], "author": { "name": "Ben Skeggs", "email": "bskeggs@redhat.com", "time": "Thu Jan 21 15:03:23 2010 +1000" }, "committer": { "name": "Ben Skeggs", "email": "bskeggs@redhat.com", "time": "Mon Jan 25 10:35:19 2010 +1000" }, "message": "drm/nouveau: fix failure path if userspace specifies no valid memtypes\n\nWe need to add the buffer to the list even if we fail, otherwise the\nvalidate_fini() call won\u0027t unreserve + unreference the GEM object,\nmaking TTM very unhappy.\n\nSigned-off-by: Ben Skeggs \u003cbskeggs@redhat.com\u003e\n" }, { "commit": "a1470890f29da73783e932078ed911f5871e3ad3", "tree": "689f07958c378d173cdafab61365324f750f8921", "parents": [ "58d65b84dee524b0a4a8b747b8eb8bbf2fb16d9d" ], "author": { "name": "Ben Skeggs", "email": "bskeggs@redhat.com", "time": "Mon Jan 18 11:42:37 2010 +1000" }, "committer": { "name": "Ben Skeggs", "email": "bskeggs@redhat.com", "time": "Mon Jan 25 10:35:13 2010 +1000" }, "message": "drm/nouveau: report LVDS as disconnected if lid closed\n\nAlso adds a module option to ignore the status reported via ACPI, in case\nwe hit systems with broken ACPI.\n\nSigned-off-by: Ben Skeggs \u003cbskeggs@redhat.com\u003e\n" }, { "commit": "90ea301916688d010862395b00817f3c1c8e09a4", "tree": "2c10f7c44daa1d4176777907aa802f4aa9624ef5", "parents": [ "b8be634e01b400fa2528848ad0cd6a5580a15bc4", "4927fbf11dc1057cd9c94dd40358e5f98c999311" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Sun Jan 24 10:37:51 2010 -0800" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Sun Jan 24 10:37:51 2010 -0800" }, "message": "Merge branch \u0027for-linus/i2c\u0027 of git://git.fluff.org/bjdooks/linux\n\n* \u0027for-linus/i2c\u0027 of git://git.fluff.org/bjdooks/linux:\n i2c: imx: call ioremap only after request_mem_region\n i2c: mxc: let time to generate stop bit\n" }, { "commit": "b8be634e01b400fa2528848ad0cd6a5580a15bc4", "tree": "f36da264249540727a60e13a54d1d44c8821b48d", "parents": [ "298a4c3a57fed38df365a6807728d1930a72c728", "f5e2bae0aad03164ffc7ce9dfeee6608e2c87dba" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Sun Jan 24 10:31:34 2010 -0800" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Sun Jan 24 10:31:34 2010 -0800" }, "message": "Merge git://git.infradead.org/~dwmw2/mtd-2.6.33\n\n* git://git.infradead.org/~dwmw2/mtd-2.6.33:\n mtd: tests: fix read, speed and stress tests on NOR flash\n mtd: Really add ARM pismo support\n kmsg_dump: Dump on crash_kexec as well\n" }, { "commit": "4927fbf11dc1057cd9c94dd40358e5f98c999311", "tree": "ef929d0d38cc58424865b5a1fe177922ca523397", "parents": [ "a1ee06b72968d80ab9362ec61143c4f090cc2d1b" ], "author": { "name": "Uwe Kleine-König", "email": "u.kleine-koenig@pengutronix.de", "time": "Fri Jan 08 17:23:17 2010 +0100" }, "committer": { "name": "Ben Dooks", "email": "ben-linux@fluff.org", "time": "Sun Jan 24 15:25:57 2010 +0000" }, "message": "i2c: imx: call ioremap only after request_mem_region\n\naccordingly adapt order of release_mem_region and release_mem_region on\nremove.\n\nSigned-off-by: Uwe Kleine-König \u003cu.kleine-koenig@pengutronix.de\u003e\nCc: Ben Dooks \u003cben-linux@fluff.org\u003e\nCc: Wolfram Sang \u003cw.sang@pengutronix.de\u003e\nCc: Richard Zhao \u003clinuxzsc@gmail.com\u003e\nCc: Darius Augulis \u003caugulis.darius@gmail.com\u003e\nCc: Sascha Hauer \u003cs.hauer@pengutronix.de\u003e\nCc: linux-i2c@vger.kernel.org\nAcked-by: Wolfram Sang \u003cw.sang@pengutronix.de\u003e\nSigned-off-by: Ben Dooks \u003cben-linux@fluff.org\u003e\n" }, { "commit": "a1ee06b72968d80ab9362ec61143c4f090cc2d1b", "tree": "ae31134e2069a7d82377dbffa5a10b449c2e7575", "parents": [ "92dcffb916d309aa01778bf8963a6932e4014d07" ], "author": { "name": "Valentin Longchamp", "email": "valentin.longchamp@epfl.ch", "time": "Thu Jan 21 18:55:32 2010 +0100" }, "committer": { "name": "Ben Dooks", "email": "ben-linux@fluff.org", "time": "Sun Jan 24 15:25:56 2010 +0000" }, "message": "i2c: mxc: let time to generate stop bit\n\nAfter generating the stop bit by changing MSTA from 1 to 0,\nthe i2c_imx-\u003estopped was immediatly set to 1. The second test\non i2c_imx-\u003estopped then is correct and the controller never\nwaits if the bus is busy. This patch corrects this.\n\nOn mx31moboard, stop bit was not generated on single write transfers.\nThis was kept unnoticed as other transfers are made afterwards that\nhelp the write recipient to resynchronize.\n\nThanks to Philippe and Michael for the debugging.\n\nSigned-off-by: Valentin Longchamp \u003cvalentin.longchamp@epfl.ch\u003e\nSigned-off by: Philippe Rétornaz \u003cphilippe.retornaz@epfl.ch\u003e\nReported-by: Michael Bonani \u003cmichael.bonani@epfl.ch\u003e\nAcked-by; Wolfram Sang \u003cw.sang@pengutronix.de\u003e\nSigned-off-by: Ben Dooks \u003cben-linux@fluff.org\u003e\n" }, { "commit": "38678d3557420a1c40f7ad5a04a46a7de7a305b9", "tree": "cfd81d00cfe47373921bb0c23589302cc7f1b576", "parents": [ "947bfc83043181e86e3e3134da158e479c9bcc51" ], "author": { "name": "Alex Deucher", "email": "alexdeucher@gmail.com", "time": "Thu Jan 21 19:28:18 2010 -0500" }, "committer": { "name": "Dave Airlie", "email": "airlied@redhat.com", "time": "Sun Jan 24 17:25:38 2010 +1000" }, "message": "drm/radeon/kms: fix legacy get_engine/memory clock\n\nFix a bad shift in the post div.\n\nShould fix fdo bug 26145\n\nSigned-off-by: Alex Deucher \u003calexdeucher@gmail.com\u003e\nSigned-off-by: Dave Airlie \u003cairlied@redhat.com\u003e\n" }, { "commit": "947bfc83043181e86e3e3134da158e479c9bcc51", "tree": "d3a7111bf9d8e6dd55519d7a28762d0dffd581db", "parents": [ "4eaeca33512b9774c25507b9a9bdcfe3791a5cc5" ], "author": { "name": "Alex Deucher", "email": "alexdeucher@gmail.com", "time": "Thu Jan 21 17:14:49 2010 -0500" }, "committer": { "name": "Dave Airlie", "email": "airlied@redhat.com", "time": "Sun Jan 24 17:25:05 2010 +1000" }, "message": "drm/radeon/kms/atom: atom parser fixes\n\nOnly reset the reg block on the initial execute\ntable call; nested calls require the reg block not be\nreset on each call. Also reset the fb window and\nio mode. This matches the upstream parser behavior.\n\nSigned-off-by: Alex Deucher \u003calexdeucher@gmail.com\u003e\nSigned-off-by: Dave Airlie \u003cairlied@redhat.com\u003e\n" }, { "commit": "4eaeca33512b9774c25507b9a9bdcfe3791a5cc5", "tree": "d171b1cf87604c4af8893a299cb872c950365aac", "parents": [ "fc10332b8ac5ca32d11f898027d84c007543bd80" ], "author": { "name": "Alex Deucher", "email": "alexdeucher@gmail.com", "time": "Tue Jan 19 17:32:27 2010 -0500" }, "committer": { "name": "Dave Airlie", "email": "airlied@redhat.com", "time": "Sun Jan 24 17:24:29 2010 +1000" }, "message": "drm/radeon/kms: clean up atombios pll code\n\n- split pll adjust into a separate function\n- use a union for SetPixelClock params\n\nSigned-off-by: Alex Deucher \u003calexdeucher@gmail.com\u003e\nSigned-off-by: Dave Airlie \u003cairlied@redhat.com\u003e\n" }, { "commit": "fc10332b8ac5ca32d11f898027d84c007543bd80", "tree": "28b24fb83e4c4bfc71286ce93f01271fa5027c95", "parents": [ "a348c84d953f61c776e53cde0a63a4e407a23c18" ], "author": { "name": "Alex Deucher", "email": "alexdeucher@gmail.com", "time": "Tue Jan 19 17:16:10 2010 -0500" }, "committer": { "name": "Dave Airlie", "email": "airlied@redhat.com", "time": "Sun Jan 24 17:24:23 2010 +1000" }, "message": "drm/radeon/kms: clean up pll struct\n\n- add a new flag for fixed post div\n- pull the pll flags into the struct\n\nSigned-off-by: Alex Deucher \u003calexdeucher@gmail.com\u003e\nSigned-off-by: Dave Airlie \u003cairlied@redhat.com\u003e\n" }, { "commit": "a348c84d953f61c776e53cde0a63a4e407a23c18", "tree": "92c2b62e05bc4bac4895eb5eb31f70d0ea25f345", "parents": [ "c8c15ff1e90bfc4a2db1ba77a01b3b2783e723fc" ], "author": { "name": "Alex Deucher", "email": "alexdeucher@gmail.com", "time": "Thu Jan 21 16:50:30 2010 -0500" }, "committer": { "name": "Dave Airlie", "email": "airlied@redhat.com", "time": "Sun Jan 24 17:23:38 2010 +1000" }, "message": "drm/radeon/kms/atom: fix crtc lock ordering\n\nThis makes crtc_prepare and crtc_commit match.\n\nSigned-off-by: Alex Deucher \u003calexdeucher@gmail.com\u003e\nSigned-off-by: Dave Airlie \u003cairlied@redhat.com\u003e\n" }, { "commit": "2ca4231de7f7a5fd7137bac152030ba71f15e8c3", "tree": "681b53327e45e3843b9aaa4e049ff9400f19c781", "parents": [ "8e1e8a4779cb23c1d9f51e9223795e07ec54d77a" ], "author": { "name": "Mike McCormack", "email": "mikem@ring3k.org", "time": "Sat Jan 23 02:09:26 2010 -0800" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Sat Jan 23 02:09:26 2010 -0800" }, "message": "sky2: Enable/disable WOL per hardware device\n\nY2_HW_WOL_ON/Y2_HW_WOL_OFF should be set and cleared per chip,\nnot per port. On dual port cards, Y2_HW_WOL_ON should be\nenabled if either sky2 port has WOL enabled.\n\nFound while reviewing code for a WOL regression, though this is\nprobably not the cause of the regression.\n\nSigned-off-by: Mike McCormack \u003cmikem@ring3k.org\u003e\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "8e1e8a4779cb23c1d9f51e9223795e07ec54d77a", "tree": "e381b1cacfdc3351574d650dc0dbf77ada2e91a4", "parents": [ "8581145f39c39b00cd1b6a2dcb4ce5bf7d8d6070" ], "author": { "name": "Sridhar Samudrala", "email": "sri@us.ibm.com", "time": "Sat Jan 23 02:02:21 2010 -0800" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Sat Jan 23 02:02:21 2010 -0800" }, "message": "net: Fix IPv6 GSO type checks in Intel ethernet drivers\n\nFound this problem when testing IPv6 from a KVM guest to a remote\nhost via e1000e device on the host.\nThe following patch fixes the check for IPv6 GSO packet in Intel\nethernet drivers to use skb_is_gso_v6(). SKB_GSO_DODGY is also set\nwhen packets are forwarded from a guest.\n\nSigned-off-by: Sridhar Samudrala \u003csri@us.ibm.com\u003e\nSigned-off-by: Jeff Kirsher \u003cjeffrey.t.kirsher@intel.com\u003e\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "8581145f39c39b00cd1b6a2dcb4ce5bf7d8d6070", "tree": "61283610e6f7c92754df71fe7b8a93888331ac81", "parents": [ "de4fc07aff770743b2c3e3ee30a23a691450a4f6" ], "author": { "name": "Alexander Duyck", "email": "alexander.h.duyck@intel.com", "time": "Sat Jan 23 01:35:00 2010 -0800" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Sat Jan 23 01:35:00 2010 -0800" }, "message": "igb/igbvf: cleanup exception handling in tx_map_adv\n\nAfter removing the skb_dma_map/unmap calls the exception handling in\nigb_tx_map_adv is not correct. The issue is that the count value was not\nbeing correctly handled so as a result we were not rewinding the ring as\nback as we should have been.\n\nSigned-off-by: Alexander Duyck \u003calexander.h.duyck@intel.com\u003e\nSigned-off-by: Jeff Kirsher \u003cjeffrey.t.kirsher@intel.com\u003e\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "9926146b15fd96d78a4f7c32e7a26d50639369f4", "tree": "264806b984ed232d80e6998ce895c6497be952b3", "parents": [ "33d7959a7a9ef36573bfd0cc85ebef29ed4b846d" ], "author": { "name": "Jesse Brandeburg", "email": "jesse.brandeburg@intel.com", "time": "Fri Jan 22 22:56:16 2010 +0000" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Sat Jan 23 01:08:53 2010 -0800" }, "message": "e1000/e1000e: don\u0027t use small hardware rx buffers\n\nWhen testing the \"e1000: enhance frame fragment detection\" (and e1000e)\npatches we found some bugs with reducing the MTU size. The 1024 byte\ndescriptor used with the 1000 mtu test also (re) introduced the\n(originally) reported bug, and causes us to need the e1000_clean_tx_irq\n\"enhance frame fragment detection\" fix.\n\nSo what has occured here is that 2.6.32 is only vulnerable for mtu \u003c\n1500 due to the jumbo specific routines in both e1000 and e1000e.\nSo, 2.6.32 needs the 2kB buffer len fix for those smaller MTUs, but\nis not vulnerable to the original issue reported. It has been pointed\nout that this vulnerability needs to be patched in older kernels that\ndon\u0027t have the e1000 jumbo routine. Without the jumbo routines, we\nneed the \"enhance frame fragment detection\" fix the e1000, old\ne1000e is only vulnerable for \u003c 1500 mtu, and needs a similar\nfix. We split the patches up to provide easy backport paths.\n\nThere is only a slight bit of extra code when this fix and the\noriginal \"enhance frame fragment detection\" fixes are applied, so\nplease apply both, even though it is a bit of overkill.\n\nSigned-off-by: Jesse Brandeburg \u003cjesse.brandeburg@intel.com\u003e\nSigned-off-by: Jeff Kirsher \u003cjeffrey.t.kirsher@intel.com\u003e\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "33d7959a7a9ef36573bfd0cc85ebef29ed4b846d", "tree": "ebe69072c18645f4e9aa5bac33e61140910f8ebc", "parents": [ "fa4281bbbcb44d1f8bdac894ad0696535272cc43" ], "author": { "name": "Ken Kawasaki", "email": "ken_kawasaki@spring.nifty.jp", "time": "Fri Jan 22 11:56:25 2010 +0000" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Sat Jan 23 01:08:52 2010 -0800" }, "message": "fmvj18x_cs: add new id (Panasonic lan \u0026 modem card)\n\nfmvj18x_cs, serial_cs:\n add new id\n Panasonic lan \u0026 modem card (model name:AL-VML101)\n\nSigned-off-by: Ken Kawasaki \u003cken_kawasaki@spring.nifty.jp\u003e\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "fa4281bbbcb44d1f8bdac894ad0696535272cc43", "tree": "fe7ec8395ecd2177bb777481377e9a43af26d2ed", "parents": [ "60abe78279568a7109db2bcbc71131766a91c2e5" ], "author": { "name": "Sathya Perla", "email": "sathyap@serverengines.com", "time": "Thu Jan 21 22:51:36 2010 +0000" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Sat Jan 23 01:08:51 2010 -0800" }, "message": "be2net: swap only first 2 fields of mcc_wrb\n\nOnly the first two fields of mcc wrb - embedded, payload_len\nneed to be cpu_to_le32() swapped while issuing a cmd to the hw.\nThe fields tag0, tag1 are opaque and returned back to cpu as is...\n\nSigned-off-by: Sathya Perla \u003csathyap@serverengines.com\u003e\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "60abe78279568a7109db2bcbc71131766a91c2e5", "tree": "de8a8533c5bf4f59a2cd487c46ebbe8a64012ddc", "parents": [ "f9fd2394b194b6dcc596961021d16dbc5b222265" ], "author": { "name": "Ron Murray", "email": "rjmx@rjmx.net", "time": "Tue Jan 19 08:02:48 2010 +0000" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Sat Jan 23 01:08:51 2010 -0800" }, "message": "Please add support for Microsoft MN-120 PCMCIA network card\n\nPlease add support for Microsoft MN-120 PCMCIA network card. It\u0027s an\nold card, I know, but adding support is very easy. You just need to\nget tulip_core.c to recognise its vendor/device ID.\n\nPatch for kernel 2.6.32.4 (and many previous) attached.\n\n .....Ron Murray\n\nSigned-off-by: Ron Murray \u003crjmx@rjmx.net\u003e\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "f9fd2394b194b6dcc596961021d16dbc5b222265", "tree": "f371d25d4ca89197304643cf8475b21d83830ce1", "parents": [ "6be325719b3e54624397e413efd4b33a997e55a3", "b81124696e6a47d5db02b2b3561d66d1392b0f2f" ], "author": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Sat Jan 23 01:08:39 2010 -0800" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Sat Jan 23 01:08:39 2010 -0800" }, "message": "Merge branch \u0027linux-2.6.33.y\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/inaky/wimax\n" }, { "commit": "6be325719b3e54624397e413efd4b33a997e55a3", "tree": "57f321a56794cab2222e179b16731e0d76a4a68a", "parents": [ "26d92f9276a56d55511a427fb70bd70886af647a", "92dcffb916d309aa01778bf8963a6932e4014d07" ], "author": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Fri Jan 22 22:45:46 2010 -0800" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Fri Jan 22 22:45:46 2010 -0800" }, "message": "Merge branch \u0027master\u0027 of /home/davem/src/GIT/linux-2.6/\n" }, { "commit": "26d92f9276a56d55511a427fb70bd70886af647a", "tree": "dd7ce9164a504badabb7bfbe56c296ad1529d6fc", "parents": [ "b94b50289622e816adc9f94111cfc2679c80177c" ], "author": { "name": "Sathya Perla", "email": "sathyap@serverengines.com", "time": "Thu Jan 21 22:52:08 2010 -0800" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Thu Jan 21 22:52:08 2010 -0800" }, "message": "be2net: fix bug in rx page posting\n\nPages are posted to the rxq in such a way that more than one frag\ncan share the page. The last frag that uses the page unmaps the\npage. In the case when a page is not fully used (due to lack of space in rxq)\nthe last frag that uses the page is not being set as a \"last_page_user\";\ninstead, the next frag in the rxq is incorrectly being set.\n\nThe fix has also been tested on ppc64 with 64k pages...\n\nSigned-off-by: Sathya Perla \u003csathyap@serverengines.com\u003e\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "b81124696e6a47d5db02b2b3561d66d1392b0f2f", "tree": "91017b8ed2600f94413f729baef2adf216d69487", "parents": [ "b94b50289622e816adc9f94111cfc2679c80177c" ], "author": { "name": "Inaky Perez-Gonzalez", "email": "inaky@linux.intel.com", "time": "Wed Jan 20 12:41:13 2010 -0800" }, "committer": { "name": "Inaky Perez-Gonzalez", "email": "inaky@linux.intel.com", "time": "Thu Jan 21 16:49:24 2010 -0800" }, "message": "wimax/i2400m: Add support for more i6x50 SKUs\n\nThe Intel WiMax Wireless Link 6050 can show under more than one USB\nID. Add support for all, introducing a generic flag (i2400mu-\u003ei6050)\nthat denotes a 6x50 based device.\n\nSigned-off-by: Inaky Perez-Gonzalez \u003cinaky@linux.intel.com\u003e\n" }, { "commit": "836f48c5f8c6ef004419f1605514aa05eb58eefb", "tree": "ca9d806077e709252c0f33532a55595275b11637", "parents": [ "bdeef61cd053b6a88be7d2c82fd43e12f8c9f75e", "534ead709235b967b659947c55d9130873a432c4" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Thu Jan 21 07:42:59 2010 -0800" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Thu Jan 21 07:42:59 2010 -0800" }, "message": "Merge branch \u0027upstream-linus\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/jgarzik/libata-dev\n\n* \u0027upstream-linus\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/jgarzik/libata-dev:\n libata: retry FS IOs even if it has failed with AC_ERR_INVALID\n" }, { "commit": "bdeef61cd053b6a88be7d2c82fd43e12f8c9f75e", "tree": "6980d178f5402260dfc3c35840b95dc5584cf85e", "parents": [ "4caca5f917ce991dc67fbb42fa82a1f044538e23", "703625118069f9f8960d356676662d3db5a9d116" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Thu Jan 21 07:37:20 2010 -0800" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Thu Jan 21 07:37:20 2010 -0800" }, "message": "Merge git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/tty-2.6\n\n* git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/tty-2.6:\n tty: fix race in tty_fasync\n serial: serial_cs: oxsemi quirk breaks resume\n serial: imx: bit \u0026/| confusion\n serial: Fix crash if the minimum rate of the device is \u003e 9600 baud\n serial-core: resume serial hardware with no_console_suspend\n serial: 8250_pnp: use wildcard for serial Wacom tablets\n nozomi: quick fix for the close/close bug\n compat_ioctl: Supress \"unknown cmd\" message on serial /dev/console\n" }, { "commit": "4caca5f917ce991dc67fbb42fa82a1f044538e23", "tree": "29c9dadc3ab4aed954d8900f7171b44cd7a873bd", "parents": [ "f8c7e6c2038a96f427911264a0c1448c9e3c2a9e", "7692fd4d441afac728cb83fdd33349d5ba07406c" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Thu Jan 21 07:36:55 2010 -0800" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Thu Jan 21 07:36:55 2010 -0800" }, "message": "Merge git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/staging-2.6\n\n* git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/staging-2.6:\n Staging: hv: fix smp problems in the hyperv core code\n Staging: et131x: Fix 2.6.33rc1 regression in et131x\n Staging: asus_oled: fix oops in 2.6.32.2\n" }, { "commit": "f8c7e6c2038a96f427911264a0c1448c9e3c2a9e", "tree": "2013405da9810dc4d9a5e77497f1afadb5b8d5d3", "parents": [ "c9140487b4601ea0b4479af3d92ceb0cda2c691f", "bd796671f093d5b1841d383674d5650f5ec6c9c6" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Thu Jan 21 07:36:31 2010 -0800" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Thu Jan 21 07:36:31 2010 -0800" }, "message": "Merge git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/driver-core-2.6\n\n* git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/driver-core-2.6:\n Revert \"sysdev: fix prototype for memory_sysdev_class show/store functions\"\n driver-core: fix devtmpfs crash on s390\n" }, { "commit": "c9140487b4601ea0b4479af3d92ceb0cda2c691f", "tree": "6ff23dfe9d7366accade95b6aaad9ffd434690d0", "parents": [ "456eac94789e1b512515e6974e091ef655f343de", "0a2fea2e0dea9df8ead1cb45e4b9cd68e1b1d29b" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Thu Jan 21 07:35:43 2010 -0800" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Thu Jan 21 07:35:43 2010 -0800" }, "message": "Merge git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/usb-2.6\n\n* git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/usb-2.6:\n USB: isp1362: fix build failure on ARM systems via irq_flags cleanup\n USB: isp1362: better 64bit printf warning fixes\n USB: fix usbstorage for 2770:915d delivers no FAT\n USB: Fix level of isp1760 Reloading ptd error message\n USB: FHCI: avoid NULL pointer dereference\n USB: Fix duplicate sysfs problem after device reset.\n USB: add speed values for USB 3.0 and wireless controllers\n USB: add missing delay during remote wakeup\n USB: EHCI \u0026 UHCI: fix race between root-hub suspend and port resume\n USB: EHCI: fix handling of unusual interrupt intervals\n USB: Don\u0027t use GFP_KERNEL while we cannot reset a storage device\n USB: fix bitmask merge error\n usb: serial: fix memory leak in generic driver\n USB: serial: fix USB serial fix kfifo_len locking\n" }, { "commit": "456eac94789e1b512515e6974e091ef655f343de", "tree": "79f277d02e5e480a373c129bdce7564421d360c7", "parents": [ "dedd0c2a48d1eb779373de5eddd04a3e059ce540", "f06f135d8642e2f6812cfcb4ea8e4e9122d4d58c" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Thu Jan 21 07:32:11 2010 -0800" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Thu Jan 21 07:32:11 2010 -0800" }, "message": "Merge branch \u0027for-linus\u0027 of git://git.kernel.dk/linux-2.6-block\n\n* \u0027for-linus\u0027 of git://git.kernel.dk/linux-2.6-block:\n fs/bio.c: fix shadows sparse warning\n drbd: The kernel code is now equivalent to out of tree release 8.3.7\n drbd: Allow online resizing of DRBD devices while peer not reachable (needs to be explicitly forced)\n drbd: Don\u0027t go into StandAlone mode when authentification failes because of network error\n drivers/block/drbd/drbd_receiver.c: correct NULL test\n cfq-iosched: Respect ioprio_class when preempting\n genhd: overlapping variable definition\n block: removed unused as_io_context\n DM: Fix device mapper topology stacking\n block: bdev_stack_limits wrapper\n block: Fix discard alignment calculation and printing\n block: Correct handling of bottom device misaligment\n drbd: check on CONFIG_LBDAF, not LBD\n drivers/block/drbd: Correct NULL test\n drbd: Silenced an assert that could triggered after changing write ordering method\n drbd: Kconfig fix\n drbd: Fix for a race between IO and a detach operation [Bugz 262]\n drbd: Use drbd_crypto_is_hash() instead of an open coded check\n" }, { "commit": "b94b50289622e816adc9f94111cfc2679c80177c", "tree": "9545a229c7ef2dbdcdc8300fd4d84ff3cafc7808", "parents": [ "40a14deaf411592b57cb0720f0e8004293ab9865" ], "author": { "name": "Jesse Brandeburg", "email": "jesse.brandeburg@intel.com", "time": "Tue Jan 19 14:15:59 2010 +0000" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Wed Jan 20 16:21:23 2010 -0800" }, "message": "e1000e: enhance frame fragment detection\n\nOriginally patched by Neil Horman \u003cnhorman@tuxdriver.com\u003e\n\ne1000e could with a jumbo frame enabled interface, and packet split disabled,\nreceive a packet that would overflow a single rx buffer. While in practice\nvery hard to craft a packet that could abuse this, it is possible.\n\nthis is related to CVE-2009-4538\n\nSigned-off-by: Jesse Brandeburg \u003cjesse.brandeburg@intel.com\u003e\nCC: Neil Horman \u003cnhorman@tuxdriver.com\u003e\nSigned-off-by: Jeff Kirsher \u003cjeffrey.t.kirsher@intel.com\u003e\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "40a14deaf411592b57cb0720f0e8004293ab9865", "tree": "fc485d84b49042915e5d03a03f9bb988e8c3d175", "parents": [ "c1fa347f20f17f14a4a1575727fa24340e8a9117" ], "author": { "name": "Jesse Brandeburg", "email": "jesse.brandeburg@intel.com", "time": "Tue Jan 19 14:15:38 2010 +0000" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Wed Jan 20 16:21:22 2010 -0800" }, "message": "e1000: enhance frame fragment detection\n\nOriginally From: Neil Horman \u003cnhorman@tuxdriver.com\u003e\nModified by: Jesse Brandeburg \u003cjesse.brandeburg@intel.com\u003e\n\nHey all-\n\tA security discussion was recently given:\nhttp://events.ccc.de/congress/2009/Fahrplan//events/3596.en.html\nAnd a patch that I submitted awhile back was brought up. Apparently some of\ntheir testing revealed that they were able to force a buffer fragment in e1000\nin which the trailing fragment was greater than 4 bytes. As a result the\nfragment check I introduced failed to detect the fragement and a partial\ninvalid frame was passed up into the network stack. I\u0027ve written this patch\nto correct it. I\u0027m in the process of testing it now, but it makes good\nlogical sense to me. Effectively it maintains a per-adapter state variable\nwhich detects a non-EOP frame, and discards it and subsequent non-EOP frames\nleading up to _and_ _including_ the next positive-EOP frame (as it is by\ndefinition the last fragment). This should prevent any and all partial frames\nfrom entering the network stack from e1000.\n\nSigned-off-by: Jesse Brandeburg \u003cjesse.brandeburg@intel.com\u003e\nAcked-by: Neil Horman \u003cnhorman@tuxdriver.com\u003e\nSigned-off-by: Jeff Kirsher \u003cjeffrey.t.kirsher@intel.com\u003e\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "c1fa347f20f17f14a4a1575727fa24340e8a9117", "tree": "520a4cc063e0f64030ddae6744970c7fcb0785db", "parents": [ "b4ced2b768ab6c580148d1163c82a655fe147edc" ], "author": { "name": "Roel Kluin", "email": "roel.kluin@gmail.com", "time": "Tue Jan 19 14:21:45 2010 +0000" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Wed Jan 20 16:21:22 2010 -0800" }, "message": "e1000/e1000e/igb/igbvf/ixgb/ixgbe: Fix tests of unsigned in *_tx_map()\n\nThe variable count and i are unsigned so the (\u003c|\u003e\u003d)0 tests do not work.\n\nSigned-off-by: Roel Kluin \u003croel.kluin@gmail.com\u003e\nSigned-off-by: Jeff Kirsher \u003cjeffrey.t.kirsher@intel.com\u003e\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "0a2fea2e0dea9df8ead1cb45e4b9cd68e1b1d29b", "tree": "bda5ff5da128b3a79ef9cc68ef60b1aa9e3e235e", "parents": [ "96b85179b464cc80d85b5c602af119d1dd6d50bb" ], "author": { "name": "Lothar Wassmann", "email": "LW@KARO-electronics.de", "time": "Fri Jan 15 14:42:02 2010 -0500" }, "committer": { "name": "Greg Kroah-Hartman", "email": "gregkh@suse.de", "time": "Wed Jan 20 15:24:36 2010 -0800" }, "message": "USB: isp1362: fix build failure on ARM systems via irq_flags cleanup\n\nThere was some left over #ifdef ARM logic that is outdated but no one\nreally noticed. So instead of relying on this tricky logic, properly\nload and utilize the platform irq_flags resources.\n\nReported-by: Ben Hutchings \u003cben@decadent.org.uk\u003e\nSigned-off-by: Lothar Wassmann \u003cLW@KARO-electronics.de\u003e\nSigned-off-by: Mike Frysinger \u003cvapier@gentoo.org\u003e\nSigned-off-by: Greg Kroah-Hartman \u003cgregkh@suse.de\u003e\n\n" }, { "commit": "96b85179b464cc80d85b5c602af119d1dd6d50bb", "tree": "17fed64614d81a9136f1774d74d9222e75c657a8", "parents": [ "10d2cdb6102669279bee2d9a00a22431b74583d5" ], "author": { "name": "Lothar Wassmann", "email": "LW@KARO-electronics.de", "time": "Fri Jan 15 08:04:55 2010 -0500" }, "committer": { "name": "Greg Kroah-Hartman", "email": "gregkh@suse.de", "time": "Wed Jan 20 15:24:35 2010 -0800" }, "message": "USB: isp1362: better 64bit printf warning fixes\n\nSome hosts that treat the return value of sizeof differently from unsigned\nlong might still hit warnings. So use %zu for sizeof() values. This is a\nbetter version of the previous commit b0a9cf297e58721933.\n\nSigned-off-by: Lothar Wassmann \u003cLW@KARO-electronics.de\u003e\nSigned-off-by: Mike Frysinger \u003cvapier@gentoo.org\u003e\nSigned-off-by: Greg Kroah-Hartman \u003cgregkh@suse.de\u003e\n\n" }, { "commit": "10d2cdb6102669279bee2d9a00a22431b74583d5", "tree": "f2eb906df27b062f314fd87af4dfb688a776f5bf", "parents": [ "c0d74142531c7ec23bb29885aec8f924ee4c1a46" ], "author": { "name": "Ryan May", "email": "rmay31@gmail.com", "time": "Wed Jan 06 10:09:25 2010 -0600" }, "committer": { "name": "Greg Kroah-Hartman", "email": "gregkh@suse.de", "time": "Wed Jan 20 15:24:35 2010 -0800" }, "message": "USB: fix usbstorage for 2770:915d delivers no FAT\n\nResolves kernel.org bug 14914.\n\nRemove entry for 2770:915d (usb digital camera with mass storage\nsupport) from unusual_devs.h. The fix triggered by the entry causes\nthe file system on the camera to be completely inaccessible (no\npartition table, the device is not mountable).\n\nThe patch works, but let me clarify a few things about it. All the\npatch does is remove the entry for this device from the\ndrivers/usb/storage/unusual_devs.h, which is supposed to help with a\nproblem with the device\u0027s reported size (I think). I\u0027m pretty sure it\nwas originally added for a reason, so I\u0027m not sure removing it won\u0027t\ncause other problems to reappear. Also, I should note that this\nunusual_devs.h entry was present (and activating workarounds) in\n2.6.29, but in that version everything works fine. Starting with\n2.6.30, things no longer work.\n\nSigned-off-by: Ryan May \u003crmay31@gmail.com\u003e\nCc: Rohan Hart \u003crohan.hart17@gmail.com\u003e\nSigned-off-by: Greg Kroah-Hartman \u003cgregkh@suse.de\u003e\n\n\n" }, { "commit": "c0d74142531c7ec23bb29885aec8f924ee4c1a46", "tree": "fcf1a8a168ecb281de18959c34dbaaec335df327", "parents": [ "ae35fe9e8abe828b25053cd3efdc6953fbb710e3" ], "author": { "name": "Colin Tuckley", "email": "colin.tuckley@arm.com", "time": "Thu Jan 07 11:22:47 2010 +0000" }, "committer": { "name": "Greg Kroah-Hartman", "email": "gregkh@suse.de", "time": "Wed Jan 20 15:24:35 2010 -0800" }, "message": "USB: Fix level of isp1760 Reloading ptd error message\n\nThis error message is not actually an error, it\u0027s an information\nmessage. It is triggered when a transfer which ended in a NAQ is\nretried successfully by the hardware.\n\nSigned-off-by: Colin Tuckley \u003ccolin.tuckley@arm.com\u003e\nCc: Sebastian Andrzej Siewior \u003cbigeasy@linutronix.de\u003e\nCc: Catalin Marinas \u003ccatalin.marinas@arm.com\u003e\nSigned-off-by: Greg Kroah-Hartman \u003cgregkh@suse.de\u003e\n\n" }, { "commit": "ae35fe9e8abe828b25053cd3efdc6953fbb710e3", "tree": "df06177ef93f656171606a2caa485138abba06a1", "parents": [ "04a723ea9c53ba608b0411aa36948bb57c51a08e" ], "author": { "name": "Alexander Beregalov", "email": "a.beregalov@gmail.com", "time": "Thu Jan 07 04:17:32 2010 +0300" }, "committer": { "name": "Greg Kroah-Hartman", "email": "gregkh@suse.de", "time": "Wed Jan 20 15:24:35 2010 -0800" }, "message": "USB: FHCI: avoid NULL pointer dereference\n\nAssign fhci only if usb is not NULL.\n\nSigned-off-by: Alexander Beregalov \u003ca.beregalov@gmail.com\u003e\nSigned-off-by: Greg Kroah-Hartman \u003cgregkh@suse.de\u003e\n\n" }, { "commit": "04a723ea9c53ba608b0411aa36948bb57c51a08e", "tree": "1a5d7395ccc864b8bdf8688396688951e28a4ca8", "parents": [ "b132b04e193908a94d95065d0628f8fb0159cc55" ], "author": { "name": "Sarah Sharp", "email": "sarah.a.sharp@linux.intel.com", "time": "Wed Jan 06 10:16:51 2010 -0800" }, "committer": { "name": "Greg Kroah-Hartman", "email": "gregkh@suse.de", "time": "Wed Jan 20 15:24:35 2010 -0800" }, "message": "USB: Fix duplicate sysfs problem after device reset.\n\nBorislav Petkov reports issues with duplicate sysfs endpoint files after a\nresume from a hibernate. It turns out that the code to support alternate\nsettings under xHCI has issues when a device with a non-default alternate\nsetting is reset during the hibernate:\n\n[ 427.681810] Restarting tasks ...\n[ 427.681995] hub 1-0:1.0: state 7 ports 6 chg 0004 evt 0000\n[ 427.682019] usb usb3: usb resume\n[ 427.682030] ohci_hcd 0000:00:12.0: wakeup root hub\n[ 427.682191] hub 1-0:1.0: port 2, status 0501, change 0000, 480 Mb/s\n[ 427.682205] usb 1-2: usb wakeup-resume\n[ 427.682226] usb 1-2: finish reset-resume\n[ 427.682886] done.\n[ 427.734658] ehci_hcd 0000:00:12.2: port 2 high speed\n[ 427.734663] ehci_hcd 0000:00:12.2: GetStatus port 2 status 001005 POWER sig\u003dse0 PE CONNECT\n[ 427.746682] hub 3-0:1.0: hub_reset_resume\n[ 427.746693] hub 3-0:1.0: trying to enable port power on non-switchable hub\n[ 427.786715] usb 1-2: reset high speed USB device using ehci_hcd and address 2\n[ 427.839653] ehci_hcd 0000:00:12.2: port 2 high speed\n[ 427.839666] ehci_hcd 0000:00:12.2: GetStatus port 2 status 001005 POWER sig\u003dse0 PE CONNECT\n[ 427.847717] ohci_hcd 0000:00:12.0: GetStatus roothub.portstatus [1] \u003d 0x00010100 CSC PPS\n[ 427.915497] hub 1-2:1.0: remove_intf_ep_devs: if: ffff88022f9e8800 -\u003eep_devs_created: 1\n[ 427.915774] hub 1-2:1.0: remove_intf_ep_devs: bNumEndpoints: 1\n[ 427.915934] hub 1-2:1.0: if: ffff88022f9e8800: endpoint devs removed.\n[ 427.916158] hub 1-2:1.0: create_intf_ep_devs: if: ffff88022f9e8800 -\u003eep_devs_created: 0, -\u003eunregistering: 0\n[ 427.916434] hub 1-2:1.0: create_intf_ep_devs: bNumEndpoints: 1\n[ 427.916609] ep_81: create, parent hub\n[ 427.916632] ------------[ cut here ]------------\n[ 427.916644] WARNING: at fs/sysfs/dir.c:477 sysfs_add_one+0x82/0x96()\n[ 427.916649] Hardware name: System Product Name\n[ 427.916653] sysfs: cannot create duplicate filename \u0027/devices/pci0000:00/0000:00:12.2/usb1/1-2/1-2:1.0/ep_81\u0027\n[ 427.916658] Modules linked in: binfmt_misc kvm_amd kvm powernow_k8 cpufreq_ondemand cpufreq_powersave cpufreq_userspace freq_table cpufreq_conservative ipv6 vfat fat\n+8250_pnp 8250 pcspkr ohci_hcd serial_core k10temp edac_core\n[ 427.916694] Pid: 278, comm: khubd Not tainted 2.6.33-rc2-00187-g08d869a-dirty #13\n[ 427.916699] Call Trace:\n\nThe problem is caused by a mismatch between the USB core\u0027s view of the\ndevice state and the USB device and xHCI host\u0027s view of the device state.\n\nAfter the device reset and re-configuration, the device and the xHCI host\nthink they are using alternate setting 0 of all interfaces. However, the\nUSB core keeps track of the old state, which may include non-zero\nalternate settings. It uses intf-\u003ecur_altsetting to keep the endpoint\nsysfs files for the old state across the reset.\n\nThe bandwidth allocation functions need to know what the xHCI host thinks\nthe current alternate settings are, so original patch set\nintf-\u003ecur_altsetting to the alternate setting 0. This caused duplicate\nendpoint files to be created.\n\nThe solution is to not set intf-\u003ecur_altsetting before calling\nusb_set_interface() in usb_reset_and_verify_device(). Instead, we add a\nnew flag to struct usb_interface to tell usb_hcd_alloc_bandwidth() to use\nalternate setting 0 as the currently installed alternate setting.\n\nSigned-off-by: Sarah Sharp \u003csarah.a.sharp@linux.intel.com\u003e\nTested-by: Borislav Petkov \u003cpetkovbb@googlemail.com\u003e\nCc: Alan Stern \u003cstern@rowland.harvard.edu\u003e\nSigned-off-by: Greg Kroah-Hartman \u003cgregkh@suse.de\u003e\n\n" }, { "commit": "b132b04e193908a94d95065d0628f8fb0159cc55", "tree": "4bbe8b2bd71b61d16dcdb2773419e165b4ad99d1", "parents": [ "49d0f078f494b9d81e820a13dd8093a9bfb0b6b1" ], "author": { "name": "Greg Kroah-Hartman", "email": "gregkh@suse.de", "time": "Thu Jan 14 10:33:19 2010 -0800" }, "committer": { "name": "Greg Kroah-Hartman", "email": "gregkh@suse.de", "time": "Wed Jan 20 15:24:35 2010 -0800" }, "message": "USB: add speed values for USB 3.0 and wireless controllers\n\nThese controllers say \"unknown\" for their speed in sysfs, which\nobviously isn\u0027t correct.\n\nReported-by: Kurt Garloff \u003cgarloff@novell.com\u003e\nCc: Sarah Sharp \u003csarah.a.sharp@linux.intel.com\u003e\nCc: David Vrabel \u003cdavid.vrabel@csr.com\u003e\nCc: stable \u003cstable@kernel.org\u003e\nSigned-off-by: Greg Kroah-Hartman \u003cgregkh@suse.de\u003e\n\n" }, { "commit": "49d0f078f494b9d81e820a13dd8093a9bfb0b6b1", "tree": "6256ecbc3314bb7e15032e9acbb62a6278f496aa", "parents": [ "cec3a53c7fe794237b582e8e77fc0e48465e65ee" ], "author": { "name": "Alan Stern", "email": "stern@rowland.harvard.edu", "time": "Fri Jan 08 11:18:38 2010 -0500" }, "committer": { "name": "Greg Kroah-Hartman", "email": "gregkh@suse.de", "time": "Wed Jan 20 15:24:34 2010 -0800" }, "message": "USB: add missing delay during remote wakeup\n\nThis patch (as1330) fixes a bug in khbud\u0027s handling of remote\nwakeups. When a device sends a remote-wakeup request, the parent hub\n(or the host controller driver, for directly attached devices) begins\nthe resume sequence and notifies khubd when the sequence finishes. At\nthis point the port\u0027s SUSPEND feature is automatically turned off.\n\nHowever the device needs an additional 10-ms resume-recovery time\n(TRSMRCY in the USB spec). Khubd does not wait for this delay if the\nSUSPEND feature is off, and as a result some devices fail to behave\nproperly following a remote wakeup. This patch adds the missing\ndelay to the remote-wakeup path.\n\nIt also extends the resume-signalling delay used by ehci-hcd and\nuhci-hcd from 20 ms (the value in the spec) to 25 ms (the value we use\nfor non-remote-wakeup resumes). The extra time appears to help some\ndevices.\n\nSigned-off-by: Alan Stern \u003cstern@rowland.harvard.edu\u003e\nCc: stable \u003cstable@kernel.org\u003e\nCc: Rickard Bellini \u003crickard.bellini@ericsson.com\u003e\nSigned-off-by: Greg Kroah-Hartman \u003cgregkh@suse.de\u003e\n\n\n" }, { "commit": "cec3a53c7fe794237b582e8e77fc0e48465e65ee", "tree": "bc73dbdef0688d6c656d04f288e736cb9b60d9b9", "parents": [ "1b9a38bfa6e664ff02511314f5586d711c83cc91" ], "author": { "name": "Alan Stern", "email": "stern@rowland.harvard.edu", "time": "Fri Jan 08 11:18:20 2010 -0500" }, "committer": { "name": "Greg Kroah-Hartman", "email": "gregkh@suse.de", "time": "Wed Jan 20 15:24:34 2010 -0800" }, "message": "USB: EHCI \u0026 UHCI: fix race between root-hub suspend and port resume\n\nThis patch (as1321) fixes a problem with EHCI and UHCI root-hub\nsuspends: If the suspend occurs while a port is trying to resume, the\nresume doesn\u0027t finish and simply gets lost. When remote wakeup is\nenabled, this is undesirable behavior.\n\nThe patch checks first to see if any port resumes are in progress, and\nif they are then it fails the root-hub suspend with -EBUSY.\n\nSigned-off-by: Alan Stern \u003cstern@rowland.harvard.edu\u003e\nCc: stable \u003cstable@kernel.org\u003e\nSigned-off-by: Greg Kroah-Hartman \u003cgregkh@suse.de\u003e\n\n" } ], "next": "1b9a38bfa6e664ff02511314f5586d711c83cc91" }