)]}' { "log": [ { "commit": "2154c704c7240379fae4633359e06e8df875c1fd", "tree": "43d3cf7419f91736e25434b5fe0c1593d09cbbf0", "parents": [ "7136e11e0cf520ab3fc7b55a20e60c2ec5ea88e1" ], "author": { "name": "Florian Fainelli", "email": "florian@openwrt.org", "time": "Sun Aug 08 10:08:44 2010 +0000" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Tue Aug 17 02:32:54 2010 -0700" }, "message": "r6040: fix all checkpatch errors and warnings\n\nThis patch fixes a couple of errors and warnings spotted by checkpatch.pl:\n- some lines were over 80 columns\n- there were some whitespaces left\n\nThe call to printk is now replaced by a call to pr_info and the log-level\nincluded in the driver version is now removed, so there are no longer false\npositives on this warning.\n\nSigned-off-by: Florian Fainelli \u003cflorian@openwrt.org\u003e\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "7136e11e0cf520ab3fc7b55a20e60c2ec5ea88e1", "tree": "7d52e07cbdfdca5c697fdac0768c05ac778048cb", "parents": [ "ea0a52c4fd8eb2c8e0586b939c484e160fb4a721" ], "author": { "name": "Joe Perches", "email": "joe@perches.com", "time": "Sun Aug 08 04:50:36 2010 +0000" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Tue Aug 17 02:32:54 2010 -0700" }, "message": "pcnet_cs: Use pr_fmt and pr_\u003clevel\u003e\n\nIt looks as if the printks in get_ax88190 are\nincorrect and were duplicated and superceded by a\ntest in pcnet_config, so I removed them.\n\nChanged the level of the ax88190 test to KERN_NOTICE\nto match the other message styles in pcnet_config.\n\nCompiled but untested.\n\nSigned-off-by: Joe Perches \u003cjoe@perches.com\u003e\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "ea0a52c4fd8eb2c8e0586b939c484e160fb4a721", "tree": "b397eba0f19359684250e0cea4e10c6e405ae316", "parents": [ "01414802054c382072b6cb9a1bdc6e243c74b2d5" ], "author": { "name": "Wolfram Sang", "email": "w.sang@pengutronix.de", "time": "Sun Aug 08 02:32:05 2010 +0000" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Tue Aug 17 02:32:53 2010 -0700" }, "message": "pcnet_cs: Use proper netdev_*-printouts\n\nTo prevent broken messages like:\n\n[ 204.024291] eth%d: pcnet_reset_8390() did not complete.\n\nSigned-off-by: Wolfram Sang \u003cw.sang@pengutronix.de\u003e\nCc: Dominik Brodowski \u003clinux@dominikbrodowski.net\u003e\nCc: Joe Perches \u003cjoe@perches.com\u003e\nCc: David Miller \u003cdavem@davemloft.net\u003e\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "01414802054c382072b6cb9a1bdc6e243c74b2d5", "tree": "f09b05eb9fff16a69d83ec28653992d1bae8d74c", "parents": [ "bb8a10bbd10a45db0eb45bac520489bdbc0917ef" ], "author": { "name": "Ben Hutchings", "email": "bhutchings@solarflare.com", "time": "Tue Aug 17 02:31:15 2010 -0700" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Tue Aug 17 02:31:15 2010 -0700" }, "message": "ethtool: Provide a default implementation of ethtool_ops::get_drvinfo\n\nThe driver name and bus address for a net_device can normally be found\nthrough the driver model now. Instead of requiring drivers to provide\nthis information redundantly through the ethtool_ops::get_drvinfo\noperation, use the driver model to do so if the driver does not define\nthe operation. Since ETHTOOL_GDRVINFO no longer requires the driver\nto implement any operations, do not require net_device::ethtool_ops to\nbe set either.\n\nRemove implementations of get_drvinfo and ethtool_ops that provide\nonly this information.\n\nSigned-off-by: Ben Hutchings \u003cbhutchings@solarflare.com\u003e\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "9e1634a734bdd2dac5687f57dd427bef083e4659", "tree": "5d85e577d497ad820fb7f1dc13beea4127170b8f", "parents": [ "1f1d47ef4779fb45e8cccde6f31c76c3cdabbec1" ], "author": { "name": "Julia Lawall", "email": "julia@diku.dk", "time": "Thu Aug 05 10:28:31 2010 +0000" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Mon Aug 16 21:06:29 2010 -0700" }, "message": "drivers/net: Adjust confusing if indentation\n\nOutdent the code following the if.\n\nThe semantic match that finds this problem is as follows:\n(http://coccinelle.lip6.fr/)\n\n// \u003csmpl\u003e\n@r disable braces4@\nposition p1,p2;\nstatement S1,S2;\n@@\n\n(\nif (...) { ... }\n|\nif (...) S1@p1 S2@p2\n)\n\n@script:python@\np1 \u003c\u003c r.p1;\np2 \u003c\u003c r.p2;\n@@\n\nif (p1[0].column \u003d\u003d p2[0].column):\n cocci.print_main(\"branch\",p1)\n cocci.print_secs(\"after\",p2)\n// \u003c/smpl\u003e\n\nSigned-off-by: Julia Lawall \u003cjulia@diku.dk\u003e\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "1f1d47ef4779fb45e8cccde6f31c76c3cdabbec1", "tree": "041aaa3071b38536a83b2d20f9a28fea17d1ccde", "parents": [ "cc81735e8099deaed7436418f6d83a98be2c2101" ], "author": { "name": "Julia Lawall", "email": "julia@diku.dk", "time": "Thu Aug 05 10:28:12 2010 +0000" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Mon Aug 16 21:06:29 2010 -0700" }, "message": "drivers/net/hamradio: Adjust confusing if indentation\n\nIndent the branch of an if.\n\nThe semantic match that finds this problem is as follows:\n(http://coccinelle.lip6.fr/)\n\n// \u003csmpl\u003e\n@r disable braces4@\nposition p1,p2;\nstatement S1,S2;\n@@\n\n(\nif (...) { ... }\n|\nif (...) S1@p1 S2@p2\n)\n\n@script:python@\np1 \u003c\u003c r.p1;\np2 \u003c\u003c r.p2;\n@@\n\nif (p1[0].column \u003d\u003d p2[0].column):\n cocci.print_main(\"branch\",p1)\n cocci.print_secs(\"after\",p2)\n// \u003c/smpl\u003e\n\nSigned-off-by: Julia Lawall \u003cjulia@diku.dk\u003e\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "cc81735e8099deaed7436418f6d83a98be2c2101", "tree": "694e38698aec71a836696ee47ef0fbcd1f552933", "parents": [ "2145f1afc6b2abe97d983e90c53a1dc17e2da831" ], "author": { "name": "Julia Lawall", "email": "julia@diku.dk", "time": "Thu Aug 05 10:26:38 2010 +0000" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Mon Aug 16 21:06:28 2010 -0700" }, "message": "drivers/net/bnx2x: Adjust confusing if indentation\n\nOutdent the code following the if.\n\nThe semantic match that finds this problem is as follows:\n(http://coccinelle.lip6.fr/)\n\n// \u003csmpl\u003e\n@r disable braces4@\nposition p1,p2;\nstatement S1,S2;\n@@\n\n(\nif (...) { ... }\n|\nif (...) S1@p1 S2@p2\n)\n\n@script:python@\np1 \u003c\u003c r.p1;\np2 \u003c\u003c r.p2;\n@@\n\nif (p1[0].column \u003d\u003d p2[0].column):\n cocci.print_main(\"branch\",p1)\n cocci.print_secs(\"after\",p2)\n// \u003c/smpl\u003e\n\nSigned-off-by: Julia Lawall \u003cjulia@diku.dk\u003e\nAcked-by: Eilon Greenstein \u003ceilong@broadcom.com\u003e\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "2145f1afc6b2abe97d983e90c53a1dc17e2da831", "tree": "397a915c55a5584219003c7cd1356b891766633a", "parents": [ "6f74dbbc29df6f53bc0deaa8e5a6ff81a4f91534" ], "author": { "name": "Julia Lawall", "email": "julia@diku.dk", "time": "Thu Aug 05 10:26:20 2010 +0000" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Mon Aug 16 21:06:28 2010 -0700" }, "message": "drivers/net: Adjust confusing if indentation\n\nOutdent the code following the if.\n\nThe semantic match that finds this problem is as follows:\n(http://coccinelle.lip6.fr/)\n\n// \u003csmpl\u003e\n@r disable braces4@\nposition p1,p2;\nstatement S1,S2;\n@@\n\n(\nif (...) { ... }\n|\nif (...) S1@p1 S2@p2\n)\n\n@script:python@\np1 \u003c\u003c r.p1;\np2 \u003c\u003c r.p2;\n@@\n\nif (p1[0].column \u003d\u003d p2[0].column):\n cocci.print_main(\"branch\",p1)\n cocci.print_secs(\"after\",p2)\n// \u003c/smpl\u003e\n\nSigned-off-by: Julia Lawall \u003cjulia@diku.dk\u003e\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "022484c17253aea84aa2603068ea065ca59bb5e5", "tree": "0c1c047589aaf2eefd0ef564e684fc54ef905500", "parents": [ "9b0f1d85968334c9bbe8675a0fc676c6e15ba577" ], "author": { "name": "Julia Lawall", "email": "julia@diku.dk", "time": "Thu Aug 05 10:22:20 2010 +0000" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Mon Aug 16 21:06:26 2010 -0700" }, "message": "drivers/net: Adjust confusing if indentation\n\nIn amd8111e.c, indent the branch of an if.\nIn eepro.c, outdent the code following the if.\n\nThe semantic match that finds this problem is as follows:\n(http://coccinelle.lip6.fr/)\n\n// \u003csmpl\u003e\n@r disable braces4@\nposition p1,p2;\nstatement S1,S2;\n@@\n\n(\nif (...) { ... }\n|\nif (...) S1@p1 S2@p2\n)\n\n@script:python@\np1 \u003c\u003c r.p1;\np2 \u003c\u003c r.p2;\n@@\n\nif (p1[0].column \u003d\u003d p2[0].column):\n cocci.print_main(\"branch\",p1)\n cocci.print_secs(\"after\",p2)\n// \u003c/smpl\u003e\n\nSigned-off-by: Julia Lawall \u003cjulia@diku.dk\u003e\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "9b0f1d85968334c9bbe8675a0fc676c6e15ba577", "tree": "579b8ec2ce56e33b546d0cb6003041d59a8bc803", "parents": [ "510a05edce43ec29ceb105677ad8e6ff58f02c72" ], "author": { "name": "Julia Lawall", "email": "julia@diku.dk", "time": "Thu Aug 05 10:22:00 2010 +0000" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Mon Aug 16 21:06:26 2010 -0700" }, "message": "drivers/net/irda: Adjust confusing if indentation\n\nIndent the branch of an if.\n\nThe semantic match that finds this problem is as follows:\n(http://coccinelle.lip6.fr/)\n\n// \u003csmpl\u003e\n@r disable braces4@\nposition p1,p2;\nstatement S1,S2;\n@@\n\n(\nif (...) { ... }\n|\nif (...) S1@p1 S2@p2\n)\n\n@script:python@\np1 \u003c\u003c r.p1;\np2 \u003c\u003c r.p2;\n@@\n\nif (p1[0].column \u003d\u003d p2[0].column):\n cocci.print_main(\"branch\",p1)\n cocci.print_secs(\"after\",p2)\n// \u003c/smpl\u003e\n\nSigned-off-by: Julia Lawall \u003cjulia@diku.dk\u003e\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "354c8e3104a8513dbbdc4dea1ffbefe714371e88", "tree": "133b58f7929710a203a9a160b6633a50917aabef", "parents": [ "1565c7c1c4c8e931bdba66abc8aa6f141a406872" ], "author": { "name": "Julia Lawall", "email": "julia@diku.dk", "time": "Thu Aug 05 10:17:00 2010 +0000" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Mon Aug 16 21:06:25 2010 -0700" }, "message": "drivers/net/wan: Adjust confusing if indentation\n\nIndent the branch of an if.\n\nThe semantic match that finds this problem is as follows:\n(http://coccinelle.lip6.fr/)\n\n// \u003csmpl\u003e\n@r disable braces4@\nposition p1,p2;\nstatement S1,S2;\n@@\n\n(\nif (...) { ... }\n|\nif (...) S1@p1 S2@p2\n)\n\n@script:python@\np1 \u003c\u003c r.p1;\np2 \u003c\u003c r.p2;\n@@\n\nif (p1[0].column \u003d\u003d p2[0].column):\n cocci.print_main(\"branch\",p1)\n cocci.print_secs(\"after\",p2)\n// \u003c/smpl\u003e\n\nSigned-off-by: Julia Lawall \u003cjulia@diku.dk\u003e\nAcked-by: Krzysztof Hałasa \u003ckhc@pm.waw.pl\u003e\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "1565c7c1c4c8e931bdba66abc8aa6f141a406872", "tree": "2e2f732e113faa24f4b0e7c804b37bf4283595c3", "parents": [ "bfb564e7391340638afe4ad67744a8f3858e7566" ], "author": { "name": "Krishna Kumar", "email": "krkumar2@in.ibm.com", "time": "Wed Aug 04 06:15:59 2010 +0000" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Mon Aug 16 21:06:25 2010 -0700" }, "message": "macvtap: Implement multiqueue for macvtap driver\n\nImplement multiqueue facility for macvtap driver. The idea is that\na macvtap device can be opened multiple times and the fd\u0027s can be\nused to register eg, as backend for vhost.\n\nSigned-off-by: Krishna Kumar \u003ckrkumar2@in.ibm.com\u003e\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "6891dd25d3f82e50979b27fde1980aa96320b975", "tree": "8e1b1b74726f6ff6590864c648caa846b6734ea0", "parents": [ "eca6fc7836af8eec9ba7e029b604690451bb44a0" ], "author": { "name": "Dmitry Kravkov", "email": "dmitry@broadcom.com", "time": "Tue Aug 03 21:49:40 2010 +0000" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Mon Aug 16 21:06:18 2010 -0700" }, "message": "bnx2x: Load firmware in open() instead of probe()\n\nLoading firmware when actually bringing eth device up.\nThis also will allow driver to be insmoded when filesystem with\nfirmware files is not available yet.\n\nSuggested by Stephen Hemminger \u003cshemminger@vyatta.com\u003e\n\nSigned-off-by: Dmitry Kravkov \u003cdmitry@broadcom.com\u003e\nSigned-off-by: Eilon Greenstein \u003ceilong@broadcom.com\u003e\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "eca6fc7836af8eec9ba7e029b604690451bb44a0", "tree": "759656c7a125530a8e2b860aa5bd377df23db6f8", "parents": [ "da5cabf80e2433131bf0ed8993abc0f7ea618c73", "5ca6f7c85159a5ca7e637b1d9f79f0d9bc56e5dc" ], "author": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Mon Aug 16 20:44:14 2010 -0700" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Mon Aug 16 20:44:14 2010 -0700" }, "message": "Merge branch \u0027master\u0027 of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6\n" }, { "commit": "5ca6f7c85159a5ca7e637b1d9f79f0d9bc56e5dc", "tree": "ed4f35d48b2859d7ced04c9f8e0f4f6b3ac0f603", "parents": [ "daa3766e705c2605bd7f63b80c7742014ef9e04e", "6ccf15a1a76d2ff915cdef6ae4d12d0170087118" ], "author": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Mon Aug 16 13:56:01 2010 -0700" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Mon Aug 16 13:56:01 2010 -0700" }, "message": "Merge branch \u0027master\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless-2.6\n" }, { "commit": "4914c7f881845367b9198631a014ab466329b9e5", "tree": "32a4691b88960a0773b9acfe2a63b776257c25e4", "parents": [ "fe622e76fddd986e56f22842a6ce292504727ef1" ], "author": { "name": "Dominik Brodowski", "email": "linux@dominikbrodowski.net", "time": "Fri Aug 13 20:33:34 2010 +0200" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Fri Aug 13 16:55:26 2010 -0700" }, "message": "pcmcia: xirc2ps_cs bugfix\n\nWe need to set io_lines to 10 unconditionally.\n\nReported-by: Komuro \u003ckomurojun-mbn@nifty.com\u003e\nCC: netdev@vger.kernel.org\nSigned-off-by: Dominik Brodowski \u003clinux@dominikbrodowski.net\u003e\nSigned-off-by: Linus Torvalds \u003ctorvalds@linux-foundation.org\u003e\n" }, { "commit": "6ccf15a1a76d2ff915cdef6ae4d12d0170087118", "tree": "87c656424d86f5856f332e33fc2c68487f4dfa80", "parents": [ "ca6cff1f80f30cc6313a943339361ad6f9e76548" ], "author": { "name": "Maxim Levitsky", "email": "maximlevitsky@gmail.com", "time": "Fri Aug 13 11:27:28 2010 -0400" }, "committer": { "name": "John W. Linville", "email": "linville@tuxdriver.com", "time": "Fri Aug 13 13:46:20 2010 -0400" }, "message": "ath5k: disable ASPM L0s for all cards\n\nAtheros PCIe wireless cards handled by ath5k do require L0s disabled.\nFor distributions shipping with CONFIG_PCIEASPM (this will be enabled\nby default in the future in 2.6.36) this will also mean both L1 and L0s\nwill be disabled when a pre 1.1 PCIe device is detected. We do know L1\nworks correctly even for all ath5k pre 1.1 PCIe devices though but cannot\ncurrently undue the effect of a blacklist, for details you can read\npcie_aspm_sanity_check() and see how it adjusts the device link\ncapability.\n\nIt may be possible in the future to implement some PCI API to allow\ndrivers to override blacklists for pre 1.1 PCIe but for now it is\nbest to accept that both L0s and L1 will be disabled completely for\ndistributions shipping with CONFIG_PCIEASPM rather than having this\nissue present. Motivation for adding this new API will be to help\nwith power consumption for some of these devices.\n\nExample of issues you\u0027d see:\n\n - On the Acer Aspire One (AOA150, Atheros Communications Inc. AR5001\n Wireless Network Adapter [168c:001c] (rev 01)) doesn\u0027t work well\n with ASPM enabled, the card will eventually stall on heavy traffic\n with often \u0027unsupported jumbo\u0027 warnings appearing. Disabling\n ASPM L0s in ath5k fixes these problems.\n\n - On the same card you would see a storm of RXORN interrupts\n even though medium is idle.\n\nCredit for root causing and fixing the bug goes to Jussi Kivilinna.\n\nCc: David Quan \u003cDavid.Quan@atheros.com\u003e\nCc: Matthew Garrett \u003cmjg59@srcf.ucam.org\u003e\nCc: Tim Gardner \u003ctim.gardner@canonical.com\u003e\nCc: Jussi Kivilinna \u003cjussi.kivilinna@mbnet.fi\u003e\nCc: stable@kernel.org\nSigned-off-by: Luis R. Rodriguez \u003clrodriguez@atheros.com\u003e\nSigned-off-by: Maxim Levitsky \u003cmaximlevitsky@gmail.com\u003e\nSigned-off-by: John W. Linville \u003clinville@tuxdriver.com\u003e\n" }, { "commit": "ca6cff1f80f30cc6313a943339361ad6f9e76548", "tree": "fdbc896961b96bab7dba33232d4c0dc361e145a2", "parents": [ "fe0dbcc9d2e941328b3269dab102b94ad697ade5" ], "author": { "name": "Rajkumar Manoharan", "email": "rmanoharan@atheros.com", "time": "Fri Aug 13 18:36:40 2010 +0530" }, "committer": { "name": "John W. Linville", "email": "linville@tuxdriver.com", "time": "Fri Aug 13 13:46:20 2010 -0400" }, "message": "ath9k_htc: load proper firmware for device ID 7015\n\nThis patch handles the firmware loading properly\nfor device ID 7015.\n\nSigned-off-by: Rajkumar Manoharan \u003crmanoharan@atheros.com\u003e\nSigned-off-by: John W. Linville \u003clinville@tuxdriver.com\u003e\n" }, { "commit": "fe0dbcc9d2e941328b3269dab102b94ad697ade5", "tree": "54a0e4682f4145593474ae7b0fd45276dcbb0a8d", "parents": [ "71ba186c123630ddab17667ec9ecf7e2ef211295" ], "author": { "name": "Yuri Kululin", "email": "ext-yuri.kululin@nokia.com", "time": "Fri Aug 13 13:46:12 2010 +0400" }, "committer": { "name": "John W. Linville", "email": "linville@tuxdriver.com", "time": "Fri Aug 13 13:46:19 2010 -0400" }, "message": "wl1251: fix trigger scan timeout usage\n\nUse appropriate command (CMD_TRIGGER_SCAN_TO) instead of scan command\n(CMD_SCAN) to configure trigger scan timeout.\n\nThis was broken in commit 3a98c30f3e8bb1f32b5bcb74a39647b3670de275.\n\nThis fix address the bug reported here:\n\nhttps://bugzilla.kernel.org/show_bug.cgi?id\u003d16554\n\nCc: stable@kernel.org\nSigned-off-by: Yuri Ershov \u003cext-yuri.ershov@nokia.com\u003e\nSigned-off-by: Yuri Kululin \u003cext-yuri.kululin@nokia.com\u003e\nAcked-by: Kalle Valo \u003ckvalo@adurom.com\u003e\nSigned-off-by: John W. Linville \u003clinville@tuxdriver.com\u003e\n" }, { "commit": "71ba186c123630ddab17667ec9ecf7e2ef211295", "tree": "b5407869aa8d4b55751cc59bc85ef9882ff952b0", "parents": [ "da93f10684bfba2983a70c10b5d417232b6a5245" ], "author": { "name": "Vivek Natarajan", "email": "vnatarajan@atheros.com", "time": "Thu Aug 12 14:23:28 2010 +0530" }, "committer": { "name": "John W. Linville", "email": "linville@tuxdriver.com", "time": "Fri Aug 13 13:46:19 2010 -0400" }, "message": "ath9k_htc: Fix disconnect issue in HT40 mode.\n\nSome APs advertise that they may be HT40 capable in the capabilites\nbut the current operating channel configuration may be only HT20.\nThis causes disconnection as ath9k_htc sets WLAN_RC_40_FLAG despite\nthe AP operating in HT20 mode.\nHence set this flag only if the current channel configuration\nis HT40 enabled.\n\nCc: stable@kernel.org\nSigned-off-by: Vivek Natarajan \u003cvnatarajan@atheros.com\u003e\nSigned-off-by: John W. Linville \u003clinville@tuxdriver.com\u003e\n" }, { "commit": "2f2c779583e9646097b57599f8efeb8eca7bd654", "tree": "aa7c88eb4f4deb668cba56e6f1fddd8dcc5006cf", "parents": [ "2897c684d1d5140e0e0302e73660c7cb97981b27", "3c09e2647b5e1f1f9fd383971468823c2505e1b0" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Fri Aug 13 10:38:12 2010 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Fri Aug 13 10:38:12 2010 -0700" }, "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: (30 commits)\n ctcm: rename READ/WRITE defines to avoid redefinitions\n claw: rename READ/WRITE defines to avoid redefinitions\n phylib: available for any speed ethernet\n can: add limit for nframes and clean up signed/unsigned variables\n pkt_sched: Check .walk and .leaf class handlers\n pkt_sched: Fix sch_sfq vs tc_modify_qdisc oops\n caif-spi: Bugfix SPI_DATA_POS settings were inverted.\n caif: Bugfix - Increase default headroom size for control channel.\n net: make netpoll_rx return bool for !CONFIG_NETPOLL\n Bluetooth: Use 3-DH5 payload size for default ERTM max PDU size\n Bluetooth: Fix incorrect setting of remote_tx_win for L2CAP ERTM\n Bluetooth: Change default L2CAP ERTM retransmit timeout\n Bluetooth: Fix endianness issue with L2CAP MPS configuration\n net: Use NET_XMIT_SUCCESS where possible.\n isdn: mISDN: call pci_disable_device() if pci_probe() failed\n isdn: avm: call pci_disable_device() if pci_probe() failed\n isdn: avm: call pci_disable_device() if pci_probe() failed\n usbnet: rx_submit() should return an error code.\n pkt_sched: Add some basic qdisc class ops verification. Was: [PATCH] sfq: add dummy bind/unbind handles\n pkt_sched: sch_sfq: Add dummy unbind_tcf and put handles. Was: [PATCH] sfq: add dummy bind/unbind handles\n ...\n" }, { "commit": "26df0766a73a859bb93dc58e747c5028557a23fd", "tree": "4776de567425a7fb66ca9a87228309f9c84de633", "parents": [ "580287628cdd99366b10c9050c4479b387283be8", "a6de51b2787012ba3ab62c7d50df1b749b83d5f0" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Thu Aug 12 10:01:59 2010 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Thu Aug 12 10:01:59 2010 -0700" }, "message": "Merge branch \u0027params\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/rusty/linux-2.6-for-linus\n\n* \u0027params\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/rusty/linux-2.6-for-linus: (22 commits)\n param: don\u0027t deref arg in __same_type() checks\n param: update drivers/acpi/debug.c to new scheme\n param: use module_param in drivers/message/fusion/mptbase.c\n ide: use module_param_named rather than module_param_call\n param: update drivers/char/ipmi/ipmi_watchdog.c to new scheme\n param: lock if_sdio\u0027s lbs_helper_name and lbs_fw_name against sysfs changes.\n param: lock myri10ge_fw_name against sysfs changes.\n param: simple locking for sysfs-writable charp parameters\n param: remove unnecessary writable charp\n param: add kerneldoc to moduleparam.h\n param: locking for kernel parameters\n param: make param sections const.\n param: use free hook for charp (fix leak of charp parameters)\n param: add a free hook to kernel_param_ops.\n param: silence .init.text references from param ops\n Add param ops struct for hvc_iucv driver.\n nfs: update for module_param_named API change\n AppArmor: update for module_param_named API change\n param: use ops in struct kernel_param, rather than get and set fns directly\n param: move the EXPORT_SYMBOL to after the definitions.\n ...\n" }, { "commit": "58d4ea65b98f154f3326b038eecda32f90b46ea8", "tree": "636aed413349dece12c08a4bd3d1fea0254976d8", "parents": [ "26f0cf91813bdc8e61595f8ad6660251e2ee9cf6", "fbe0f8348fd6c3d016a3f48756eb729b41a67c22" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Thu Aug 12 09:11:31 2010 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Thu Aug 12 09:11:31 2010 -0700" }, "message": "Merge branch \u0027next-devicetree\u0027 of git://git.secretlab.ca/git/linux-2.6\n\n* \u0027next-devicetree\u0027 of git://git.secretlab.ca/git/linux-2.6:\n mmc_spi: Fix unterminated of_match_table\n of/sparc: fix build regression from of_device changes\n of/device: Replace struct of_device with struct platform_device\n" }, { "commit": "cba86f2e20a33cd2e6f41bd5e5b23aa2d55c95b8", "tree": "c964a45832f2b9a88e8f9b46bf4979ca1e3bd6b8", "parents": [ "5b75c4973ce779520b9d1e392483207d6f842cde" ], "author": { "name": "Randy Dunlap", "email": "randy.dunlap@oracle.com", "time": "Wed Aug 11 13:26:57 2010 +0000" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Wed Aug 11 23:03:50 2010 -0700" }, "message": "phylib: available for any speed ethernet\n\nSeveral gigabit network drivers (SB1250_MAC, TIGON3, FSL, GIANFAR,\nUCC_GETH, MV643XX_ETH, XILINX_LL_TEMAC, S6GMAC, STMMAC_ETH, PASEMI_MAC,\nand OCTEON_ETHERNET) select PHYLIB. These drivers are not under\nNET_ETHERNET (10/100 mbit), so this warning is generated (long, irrelevant\nparts are omitted):\n\nwarning: (NET_DSA \u0026\u0026 NET \u0026\u0026 EXPERIMENTAL \u0026\u0026 NET_ETHERNET \u0026\u0026 !S390 || ... || SB1250_MAC \u0026\u0026 NETDEVICES \u0026\u0026 NETDEV_1000 \u0026\u0026 SIBYTE_SB1xxx_SOC || TIGON3 \u0026\u0026 NETDEVICES \u0026\u0026 NETDEV_1000 \u0026\u0026 PCI || FSL_PQ_MDIO \u0026\u0026 NETDEVICES \u0026\u0026 NETDEV_1000 \u0026\u0026 FSL_SOC || GIANFAR \u0026\u0026 NETDEVICES \u0026\u0026 NETDEV_1000 \u0026\u0026 FSL_SOC || UCC_GETH \u0026\u0026 NETDEVICES \u0026\u0026 NETDEV_1000 \u0026\u0026 QUICC_ENGINE || MV643XX_ETH \u0026\u0026 NETDEVICES \u0026\u0026 NETDEV_1000 \u0026\u0026 (MV64X60 || PPC32 || PLAT_ORION) || XILINX_LL_TEMAC \u0026\u0026 NETDEVICES \u0026\u0026 NETDEV_1000 \u0026\u0026 (PPC || MICROBLAZE) || S6GMAC \u0026\u0026 NETDEVICES \u0026\u0026 NETDEV_1000 \u0026\u0026 XTENSA_VARIANT_S6000 || STMMAC_ETH \u0026\u0026 NETDEV_1000 \u0026\u0026 NETDEVICES \u0026\u0026 CPU_SUBTYPE_ST40 || PASEMI_MAC \u0026\u0026 NETDEVICES \u0026\u0026 NETDEV_10000 \u0026\u0026 PPC_PASEMI \u0026\u0026 PCI || OCTEON_ETHERNET \u0026\u0026 STAGING \u0026\u0026 !STAGING_EXCLUDE_BUILD \u0026\u0026 CPU_CAVIUM_OCTEON) selects PHYLIB which has unmet direct dependencies (!S390 \u0026\u0026 NET_ETHERNET)\n\nPHYLIB is used by non-10/100 mbit ethernet drivers, so change the dependencies\nto be NETDEVICES instead of NET_ETHERNET.\n\nSigned-off-by: Randy Dunlap \u003crandy.dunlap@oracle.com\u003e\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "da93f10684bfba2983a70c10b5d417232b6a5245", "tree": "3fe5d3ec67657920a9763fd8c2fdb744b3c1e728", "parents": [ "2f81b47135a971a22ccad9f3cc8c68a583b93ea4" ], "author": { "name": "Rajkumar Manoharan", "email": "rmanoharan@atheros.com", "time": "Wed Aug 11 20:27:43 2010 +0530" }, "committer": { "name": "John W. Linville", "email": "linville@tuxdriver.com", "time": "Wed Aug 11 16:24:43 2010 -0400" }, "message": "ath9k_htc: fix panic on packet injection using airbase-ng tool.\n\nThis should fix the oops which occurs during the packet injection\non monitor interface.\n\nEIP is at ath9k_htc_tx_start+0x69/0x220 [ath9k_htc]\n [\u003cf84dc8ea\u003e] ? invoke_tx_handlers+0xa5a/0xee0 [mac80211]\n [\u003cf82c84f4\u003e] ? ath9k_htc_tx+0x44/0xe0 [ath9k_htc]\n [\u003cf84db7b8\u003e] ? __ieee80211_tx+0xf8/0x190 [mac80211]\n [\u003cf84dce0d\u003e] ? ieee80211_tx+0x9d/0x1a0 [mac80211]\n [\u003cf84dcfac\u003e] ? ieee80211_xmit+0x9c/0x1c0 [mac80211]\n [\u003cf84dd1b5\u003e] ? ieee80211_monitor_start_xmit+0x85/0xb0 [mac80211]\n [\u003cc04c30cd\u003e] ? dev_hard_start_xmit+0x1ad/0x210\n [\u003cc04b97c2\u003e] ? __alloc_skb+0x52/0x130\n [\u003cc04d7cd5\u003e] ? sch_direct_xmit+0x105/0x170\n [\u003cc04c5e9f\u003e] ? dev_queue_xmit+0x37f/0x4b0\n [\u003cc0567e1e\u003e] ? packet_snd+0x21e/0x250\n [\u003cc05684a2\u003e] ? packet_sendmsg+0x32/0x40\n [\u003cc04b4c63\u003e] ? sock_aio_write+0x113/0x130\n [\u003cc0207934\u003e] ? do_sync_write+0xc4/0x100\n [\u003cc0167740\u003e] ? autoremove_wake_function+0x0/0x50\n [\u003cc02f4414\u003e] ? security_file_permission+0x14/0x20\n [\u003cc0207ad4\u003e] ? rw_verify_area+0x64/0xe0\n [\u003cc01e6458\u003e] ? handle_mm_fault+0x338/0x390\n [\u003cc0207cd5\u003e] ? vfs_write+0x185/0x1a0\n [\u003cc058db20\u003e] ? do_page_fault+0x160/0x3a0\n [\u003cc0208512\u003e] ? sys_write+0x42/0x70\n [\u003cc01033ec\u003e] ? syscall_call+0x7/0xb\n\nSigned-off-by: Rajkumar Manoharan \u003crmanoharan@atheros.com\u003e\nCc: stable@kernel.org\nSigned-off-by: John W. Linville \u003clinville@tuxdriver.com\u003e\n" }, { "commit": "2f81b47135a971a22ccad9f3cc8c68a583b93ea4", "tree": "412d942ef67635760dffde197ca7b22a506d284b", "parents": [ "533b12c88d895cf42d5f439e25be2a2ea026b9e8" ], "author": { "name": "John W. Linville", "email": "linville@tuxdriver.com", "time": "Wed Aug 11 16:11:00 2010 -0400" }, "committer": { "name": "John W. Linville", "email": "linville@tuxdriver.com", "time": "Wed Aug 11 16:18:01 2010 -0400" }, "message": "ipw2100: register pm_qos request before registering pci driver\n\nIt is necessary to call pm_qos_add_request prior to calling\npm_qos_update_request. It was revealed that ipw2100 has been\ndoing this wrong since \"pm_qos: Get rid of the allocation in\npm_qos_add_request()\" (commit 82f682514a5df89ffb3890627eebf0897b7a84ec)\nadded a WARN that results in the following backtrace:\n\nWARNING: at kernel/pm_qos_params.c:264 pm_qos_update_request+0x5e/0x70()\npm_qos_update_request() called for unknown object\nCall Trace:\n[\u003cc1024088\u003e] ? warn_slowpath_common+0x78/0xb0\n[\u003cc1041c9e\u003e] ? pm_qos_update_request+0x5e/0x70\n[\u003cc1041c9e\u003e] ? pm_qos_update_request+0x5e/0x70\n[\u003cc1024153\u003e] ? warn_slowpath_fmt+0x33/0x40\n[\u003cc1041c9e\u003e] ? pm_qos_update_request+0x5e/0x70\n[\u003cf89fe15f\u003e] ? ipw2100_up+0x3f/0xf10 [ipw2100]\n[\u003cc11961c9\u003e] ? vsnprintf+0xc9/0x530\n[\u003cf89ff36c\u003e] ? ipw2100_net_init+0x2c/0x1c0 [ipw2100]\n[\u003cc12f542d\u003e] ? register_netdevice+0x7d/0x3c0\n[\u003cf89f9b00\u003e] ? ipw2100_irq_tasklet+0x910/0x9a0 [ipw2100]\n[\u003cc12f579f\u003e] ? register_netdev+0x2f/0x40\n[\u003cf89fd471\u003e] ? ipw2100_pci_init_one+0xd21/0x1060 [ipw2100]\n[\u003cc11a5ebb\u003e] ? local_pci_probe+0xb/0x10\n[\u003cc11a6d49\u003e] ? pci_device_probe+0x69/0x90\n[\u003cc1224704\u003e] ? driver_probe_device+0x74/0x180\n[\u003cc10dd15a\u003e] ? sysfs_create_dir+0x6a/0xb0\n[\u003cc1224889\u003e] ? __driver_attach+0x79/0x80\n[\u003cc1224810\u003e] ? __driver_attach+0x0/0x80\n[\u003cc1223fa2\u003e] ? bus_for_each_dev+0x52/0x80\n[\u003cc1224586\u003e] ? driver_attach+0x16/0x20\n[\u003cc1224810\u003e] ? __driver_attach+0x0/0x80\n[\u003cc122395f\u003e] ? bus_add_driver+0x17f/0x250\n[\u003cc11a5ec0\u003e] ? pci_device_shutdown+0x0/0x20\n[\u003cc11a6c80\u003e] ? pci_device_remove+0x0/0x40\n[\u003cc1224b13\u003e] ? driver_register+0x63/0x120\n[\u003cc11a6f96\u003e] ? __pci_register_driver+0x36/0xa0\n[\u003cf84f9048\u003e] ? ipw2100_init+0x48/0x67 [ipw2100]\n[\u003cc1001122\u003e] ? do_one_initcall+0x32/0x170\n[\u003cc1087078\u003e] ? __vunmap+0xb8/0xf0\n[\u003cf84f9000\u003e] ? ipw2100_init+0x0/0x67 [ipw2100]\n[\u003cc10510c1\u003e] ? sys_init_module+0x161/0x1000\n[\u003cc108f847\u003e] ? sys_close+0x67/0xe0\n[\u003cc13647c1\u003e] ? syscall_call+0x7/0xb\n\nThis patch moves pm_qos_add_request prior to pci_register_driver in\nipw2100 in order to avoid this problem.\n\nReported-by: Christoph Fritz \u003cchf.fritz@googlemail.com\u003e\nSigned-off-by: John W. Linville \u003clinville@tuxdriver.com\u003e\n" }, { "commit": "946880fa270c18c137654af70ba939f03181c6b6", "tree": "1fc66f0f55c17be3026d55fc261f4cbddaf80e90", "parents": [ "636d17427b1ef0e97bd9df9b3b0e0f314ff889d3", "42ea573f872365b0797ddbcee2e1f1f48913f507" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Wed Aug 11 09:17:27 2010 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Wed Aug 11 09:17:27 2010 -0700" }, "message": "Merge branch \u0027ixp4xx\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/chris/linux-2.6\n\n* \u0027ixp4xx\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/chris/linux-2.6:\n IXP4xx: Fix LL debugging on little-endian CPU.\n IXP4xx: Fix sparse warnings in I/O primitives.\n IXP4xx: Make mdio_bus struct static in the Ethernet driver.\n IXP4xx: Fix ixp4xx_crypto little-endian operation.\n IXP4xx: Prevent HSS transmitter lockup by disabling FRaMe signals.\n ixp4xx/vulcan: add PCI support\n ixp4xx: base support for Arcom Vulcan\n" }, { "commit": "636d17427b1ef0e97bd9df9b3b0e0f314ff889d3", "tree": "f573602c1a78e9140c36e220c47675b79af1c270", "parents": [ "dd21e9bdff14a9882f2c485fe533c6ce64ea2675", "0b019a41553a919965bb02d07d54e3e6c57a796d" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Wed Aug 11 09:13:19 2010 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Wed Aug 11 09:13:19 2010 -0700" }, "message": "Merge branch \u0027for-linus\u0027 of master.kernel.org:/home/rmk/linux-2.6-arm\n\n* \u0027for-linus\u0027 of master.kernel.org:/home/rmk/linux-2.6-arm: (226 commits)\n ARM: 6323/1: cam60: don\u0027t use __init for cam60_spi_{flash_platform_data,partitions}\n ARM: 6324/1: cam60: move cam60_spi_devices to .init.data\n ARM: 6322/1: imx/pca100: Fix name of spi platform data\n ARM: 6321/1: fix syntax error in main Kconfig file\n ARM: 6297/1: move U300 timer to dynamic clock lookup\n ARM: 6296/1: clock U300 intcon and timer properly\n ARM: 6295/1: fix U300 apb_pclk split\n ARM: 6306/1: fix inverted MMC card detect in U300\n ARM: 6299/1: errata: TLBIASIDIS and TLBIMVAIS operations can broadcast a faulty ASID\n ARM: 6294/1: etm: do a dummy read from OSSRR during initialization\n ARM: 6292/1: coresight: add ETM management registers\n ARM: 6288/1: ftrace: document mcount formats\n ARM: 6287/1: ftrace: clean up mcount assembly indentation\n ARM: 6286/1: fix Thumb-2 decompressor broken by \"Auto calculate ZRELADDR\"\n ARM: 6281/1: video/imxfb.c: allow usage without BACKLIGHT_CLASS_DEVICE\n ARM: 6280/1: imx: Fix build failure when including \u003cmach/gpio.h\u003e without \u003clinux/spinlock.h\u003e\n ARM: S5PV210: Fix on missing s3c-sdhci card detection method for hsmmc3\n ARM: S5P: Fix on missing S5P_DEV_FIMC in plat-s5p/Kconfig\n ARM: S5PV210: Override FIMC driver name on Aquila board\n ARM: S5PC100: enable FIMC on SMDKC100\n ...\n\nFix up conflicts in arch/arm/mach-{s5pc100,s5pv210}/cpu.c due to\ndifferent subsystem \u0027setname\u0027 calls, and trivial port types in\ninclude/linux/serial_core.h\n" }, { "commit": "241a6a542b908c0332ff00d967df459dbc5d372f", "tree": "f66ec20e0f3b027f69b9591ae5b12ee1d67e8b50", "parents": [ "5003bab82d56754b27be01eef24495a02e00039d" ], "author": { "name": "Andrew Morton", "email": "akpm@linux-foundation.org", "time": "Tue Aug 10 18:01:06 2010 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Wed Aug 11 08:58:59 2010 -0700" }, "message": "drivers/net/wireless/libertas/cfg.c: needs sched.h\n\ni386 allmodconfig:\n\ndrivers/net/wireless/libertas/cfg.c: In function \u0027lbs_scan_worker\u0027:\ndrivers/net/wireless/libertas/cfg.c:722: error: \u0027TASK_NORMAL\u0027 undeclared (first use in this function)\ndrivers/net/wireless/libertas/cfg.c:722: error: (Each undeclared identifier is reported only once\ndrivers/net/wireless/libertas/cfg.c:722: error: for each function it appears in.)\ndrivers/net/wireless/libertas/cfg.c: In function \u0027lbs_cfg_connect\u0027:\ndrivers/net/wireless/libertas/cfg.c:1267: error: \u0027TASK_INTERRUPTIBLE\u0027 undeclared (first use in this function)\ndrivers/net/wireless/libertas/cfg.c:1267: error: implicit declaration of function \u0027signal_pending\u0027\ndrivers/net/wireless/libertas/cfg.c:1267: error: implicit declaration of function \u0027schedule_timeout\u0027\n\nSo wait.h has a dependency on sched.h, but doesn\u0027t include sched.h. This\npatch doesn\u0027t fix that.\n\nCc: Dan Williams \u003cdcbw@redhat.com\u003e\nCc: \"John W. Linville\" \u003clinville@tuxdriver.com\u003e\nCc: Ingo Molnar \u003cmingo@elte.hu\u003e\nCc: Peter Zijlstra \u003ca.p.zijlstra@chello.nl\u003e\nSigned-off-by: Andrew Morton \u003cakpm@linux-foundation.org\u003e\nSigned-off-by: Linus Torvalds \u003ctorvalds@linux-foundation.org\u003e\n" }, { "commit": "886275ce41a9751117367fb387ed171049eb6148", "tree": "0e712d9902ab3c2c23dffb1c3565369fac72d2fa", "parents": [ "7d3510356b066bcfa9898ec3f90c9c7810ba6ed7" ], "author": { "name": "Rusty Russell", "email": "rusty@rustcorp.com.au", "time": "Wed Aug 11 23:04:33 2010 -0600" }, "committer": { "name": "Rusty Russell", "email": "rusty@rustcorp.com.au", "time": "Wed Aug 11 23:04:37 2010 +0930" }, "message": "param: lock if_sdio\u0027s lbs_helper_name and lbs_fw_name against sysfs changes.\n\nSince it can be changed via sysfs, we need to make a copy. This most\ngeneric way of doing this is to keep a flag so we know when to free it.\n\nSigned-off-by: Rusty Russell \u003crusty@rustcorp.com.au\u003e\nReviewed-by: Takashi Iwai \u003ctiwai@suse.de\u003e\nCc: Dan Williams \u003cdcbw@redhat.com\u003e\nCc: John W. Linville \u003clinville@tuxdriver.com\u003e\nCc: libertas-dev@lists.infradead.org\nCc: linux-wireless@vger.kernel.org\nCc: netdev@vger.kernel.org\n" }, { "commit": "7d3510356b066bcfa9898ec3f90c9c7810ba6ed7", "tree": "ff39499bd06c42bc7cd3965f2491091ab937b9ee", "parents": [ "d6d1b650ae6acce73d55dd0246de22180303ae73" ], "author": { "name": "Rusty Russell", "email": "rusty@rustcorp.com.au", "time": "Wed Aug 11 23:04:31 2010 -0600" }, "committer": { "name": "Rusty Russell", "email": "rusty@rustcorp.com.au", "time": "Wed Aug 11 23:04:32 2010 +0930" }, "message": "param: lock myri10ge_fw_name against sysfs changes.\n\nSince it can be changed via sysfs, we need to make a copy. This most\ngeneric way of doing this is to keep a flag so we know when to free it.\n\nSigned-off-by: Rusty Russell \u003crusty@rustcorp.com.au\u003e\nReviewed-by: Takashi Iwai \u003ctiwai@suse.de\u003e\nCc: Andrew Gallatin \u003cgallatin@myri.com\u003e\nCc: Brice Goglin \u003cbrice@myri.com\u003e\nCc: netdev@vger.kernel.org\n" }, { "commit": "d6d1b650ae6acce73d55dd0246de22180303ae73", "tree": "7a342999c119a5ee6395966cee91ddf5186f5665", "parents": [ "dca41306395eab37e222ff9e72765e692fcc7251" ], "author": { "name": "Rusty Russell", "email": "rusty@rustcorp.com.au", "time": "Wed Aug 11 23:04:27 2010 -0600" }, "committer": { "name": "Rusty Russell", "email": "rusty@rustcorp.com.au", "time": "Wed Aug 11 23:04:31 2010 +0930" }, "message": "param: simple locking for sysfs-writable charp parameters\n\nSince the writing to sysfs can free the old one, we need to block that\nwhen we access the charp variables.\n\nSigned-off-by: Rusty Russell \u003crusty@rustcorp.com.au\u003e\nReviewed-by: Takashi Iwai \u003ctiwai@suse.de\u003e\nTested-by: Phil Carmody \u003cext-phil.2.carmody@nokia.com\u003e\nCc: Jeff Dike \u003cjdike@addtoit.com\u003e\nCc: Dan Williams \u003cdcbw@redhat.com\u003e\nCc: John W. Linville \u003clinville@tuxdriver.com\u003e\nCc: Jing Huang \u003chuangj@brocade.com\u003e\nCc: James E.J. Bottomley \u003cJames.Bottomley@suse.de\u003e\nCc: Greg Kroah-Hartman \u003cgregkh@suse.de\u003e\nCc: Johannes Berg \u003cjohannes@sipsolutions.net\u003e\nCc: David S. Miller \u003cdavem@davemloft.net\u003e\nCc: user-mode-linux-devel@lists.sourceforge.net\nCc: libertas-dev@lists.infradead.org\nCc: linux-wireless@vger.kernel.org\nCc: netdev@vger.kernel.org\nCc: linux-scsi@vger.kernel.org\nCc: linux-usb@vger.kernel.org\n" }, { "commit": "98a21ef0abb666eeb12cf67e60203befb07e4210", "tree": "49951f6b93ccb4a2b091c5ebe9907ef609abeaf1", "parents": [ "24e263adba5fea744a3965ab1ca44620b74cb9c8" ], "author": { "name": "Sjur Braendeland", "email": "sjur.brandeland@stericsson.com", "time": "Tue Aug 10 07:36:47 2010 +0000" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Tue Aug 10 16:39:28 2010 -0700" }, "message": "caif-spi: Bugfix SPI_DATA_POS settings were inverted.\n\nThe setting of SPI_DATA_POS depending on CONFIG_CAIF_SPI_SYNC\nwhere inverted.\n\nSigned-off-by: Sjur Braendeland \u003csjur.brandeland@stericsson.com\u003e\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "1c114f42a597346de793a1d166478266a7ec3b61", "tree": "5eb2b7d0484a5a57f8f0a26b655068fd51c752c6", "parents": [ "9871e50edd25e2adf69b369817100821cb1e6de8", "533b12c88d895cf42d5f439e25be2a2ea026b9e8" ], "author": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Tue Aug 10 15:59:38 2010 -0700" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Tue Aug 10 15:59:38 2010 -0700" }, "message": "Merge branch \u0027master\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless-2.6\n" }, { "commit": "0b019a41553a919965bb02d07d54e3e6c57a796d", "tree": "6e329b4159b440d2aac5200a5c07103fe261c096", "parents": [ "5f6878b0d22f9b93f9698f88c335007e2a3c3bbc", "054d5c9238f3c577ad51195c3ee7803613f322cc" ], "author": { "name": "Russell King", "email": "rmk+kernel@arm.linux.org.uk", "time": "Tue Aug 10 23:17:52 2010 +0100" }, "committer": { "name": "Russell King", "email": "rmk+kernel@arm.linux.org.uk", "time": "Tue Aug 10 23:17:52 2010 +0100" }, "message": "Merge branches \u0027master\u0027 and \u0027devel\u0027 into for-linus\n\nConflicts:\n\tarch/arm/Kconfig\n\tarch/arm/mm/Kconfig\n" }, { "commit": "dacb397511289154a68dea1f4bd674c660161c23", "tree": "ad82840c1acd2f8e88d828cf8b8d819f1ca64f6f", "parents": [ "68fd26b59856b466edd14d8a90d01255983cd3ee" ], "author": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Tue Aug 10 02:50:55 2010 -0700" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Tue Aug 10 02:50:55 2010 -0700" }, "message": "usbnet: rx_submit() should return an error code.\n\nThis patch makes rx_submit() return an error code, and makes some call sites\nthat care check the return value. This is important because it lets us properly\nhandle cases where the device isn\u0027t ready to handle URB submissions (e.g., when\nit is autosuspended under some drivers); previously, we would attempt and fail\nto submit URBs and reschedule ourselves to try and fail again. This patch is\nagainst Linus\u0027s 2.6 repo commit 45d7f32c7a43cbb9592886d38190e379e2eb2226.\n\nSigned-Off-By: Elizabeth Jones \u003cellyjones@google.com\u003e\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "e88db3bd46801a9c2cd0ac5e46122d47c285faec", "tree": "090576e6117fa71d37d876e3b9143a63b649ce2d", "parents": [ "ca315ac22c1a91fc8047254b250599890d8a7b30" ], "author": { "name": "Dan Carpenter", "email": "error27@gmail.com", "time": "Mon Aug 09 21:49:36 2010 +0000" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Tue Aug 10 01:34:36 2010 -0700" }, "message": "qlcnic: using too much stack\n\nqlcnic_pci_info structs are 128 bytes so an array of 8 uses 1024 bytes.\nThat\u0027s a lot if you run with 4K stacks. I allocated them with kcalloc()\ninstead.\n\nSigned-off-by: Dan Carpenter \u003cerror27@gmail.com\u003e\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "ca315ac22c1a91fc8047254b250599890d8a7b30", "tree": "814076c69d1779aa3fe04fd2b0c3c9a2e09aa054", "parents": [ "00c7d9202a19091d1873954ba158375d2efd5a64" ], "author": { "name": "Dan Carpenter", "email": "error27@gmail.com", "time": "Mon Aug 09 21:47:56 2010 +0000" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Tue Aug 10 01:34:36 2010 -0700" }, "message": "qlcnic: clean up qlcnic_init_pci_info()\n\nIn the original code we allocated memory conditionally and freed it in\nthe error handling unconditionally. It turns out that this function is\nonly called during initialization and \"adapter-\u003enpars\" and\n\"adapter-\u003eeswitch\" are always NULL at the start of the function. I\nremoved those checks.\n\nAlso since I was cleaning things, I changed the error handling for\nqlcnic_get_pci_info() and pulled everything in an indent level.\n\nSigned-off-by: Dan Carpenter \u003cerror27@gmail.com\u003e\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "00c7d9202a19091d1873954ba158375d2efd5a64", "tree": "06077a32dce003ae65fad7a5105bd827e08c0273", "parents": [ "53c3fa206415d8a3f8b2a4f77689ea044c4a9c65" ], "author": { "name": "Randy Dunlap", "email": "randy.dunlap@oracle.com", "time": "Mon Aug 09 13:41:59 2010 +0000" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Tue Aug 10 00:09:21 2010 -0700" }, "message": "phy.c: fix kernel-doc warnings\n\nFix phy.c kernel-doc notation:\n\nWarning(drivers/net/phy/phy.c:313): No description found for parameter \u0027ifr\u0027\nWarning(drivers/net/phy/phy.c:313): Excess function parameter \u0027mii_data\u0027 description in \u0027phy_mii_ioctl\u0027\n\nSigned-off-by: Randy Dunlap \u003crandy.dunlap@oracle.com\u003e\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "5d337d6f64d150b6577972cc23f709ee85f66881", "tree": "ece22e5268bc869902827ceefd281fbb864158fe", "parents": [ "c4e9b56e24422e71424b24eee27c2b134a191d7b" ], "author": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Tue Aug 10 00:06:58 2010 -0700" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Tue Aug 10 00:06:58 2010 -0700" }, "message": "farsync: Fix compile warnings.\n\ndrivers/net/wan/farsync.c: In function \u0027fst_intr_rx\u0027:\ndrivers/net/wan/farsync.c:1312: warning: cast to pointer from integer of different size\ndrivers/net/wan/farsync.c: In function \u0027do_bottom_half_tx\u0027:\ndrivers/net/wan/farsync.c:1407: warning: cast to pointer from integer of different size\n\nThe \"skb\" and \"mem\" arguments being passed here are DMA addresses\nbeing programmed into the hardware registers, so pass them as the type\nthat they actually are. And use the correct printf formatting in\ndebug logging statements for these things to match the type change.\n\nReported-by: Andrew Morton \u003cakpm@linux-foundation.org\u003e\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "f6cec0ae58c17522a7bc4e2f39dae19f199ab534", "tree": "496cf6f53b0c75d9ae57bd0e411c5d2f6cea5cbb", "parents": [ "0fcf12d510b6d1b1b090a090c62009310eca4be4", "c4e9b56e24422e71424b24eee27c2b134a191d7b" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Mon Aug 09 21:05:52 2010 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Mon Aug 09 21:05:52 2010 -0700" }, "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: (59 commits)\n igbvf.txt: Add igbvf Documentation\n igb.txt: Add igb documentation\n e100/e1000*/igb*/ixgb*: Add missing read memory barrier\n ixgbe: fix build error with FCOE_CONFIG without DCB_CONFIG\n netxen: protect tx timeout recovery by rtnl lock\n isdn: gigaset: use after free\n isdn: gigaset: add missing unlock\n solos-pci: Fix race condition in tasklet RX handling\n pkt_sched: Fix sch_sfq vs tcf_bind_filter oops\n net: disable preemption before call smp_processor_id()\n tcp: no md5sig option size check bug\n iwlwifi: fix locking assertions\n iwlwifi: fix TX tracer\n isdn: fix information leak\n net: Fix napi_gro_frags vs netpoll path\n usbnet: remove noisy and hardly useful printk\n rtl8180: avoid potential NULL deref in rtl8180_beacon_work\n ath9k: Remove myself from the MAINTAINERS list\n libertas: scan before assocation if no BSSID was given\n libertas: fix association with some APs by using extended rates\n ...\n" }, { "commit": "94597ab23ea10b3bdcba534be00a9f7b35791c07", "tree": "f896a856c542b5f4f5623670bcf112a3b83f65a9", "parents": [ "fe100acddf438591ecf3582cb57241e560da70b7" ], "author": { "name": "Johannes Berg", "email": "johannes.berg@intel.com", "time": "Mon Aug 09 10:57:02 2010 -0700" }, "committer": { "name": "John W. Linville", "email": "linville@tuxdriver.com", "time": "Mon Aug 09 15:18:57 2010 -0400" }, "message": "iwlagn: fix rts cts protection\n\nCurrently the driver will try to protect all frames,\nwhich leads to a lot of odd things like sending an\nRTS with a zeroed RA before multicast frames, which\nis clearly bogus.\n\nIn order to fix all of this, we need to take a step\nback and see what we need to achieve:\n * we need RTS/CTS protection if requested by\n the AP for the BSS, mac80211 tells us this\n * in that case, CTS-to-self should only be\n enabled when mac80211 tells us\n * additionally, as a hardware workaround, on\n some devices we have to protect aggregated\n frames with RTS\n\nTo achieve the first two items, set up the RXON\naccordingly and set the protection required flag\nin the transmit command when mac80211 requests\nprotection for the frame.\n\nTo achieve the last item, set the rate-control\nRTS-requested flag for all stations that we have\naggregation sessions with, and set the protection\nrequired flag when sending aggregated frames (on\nthose devices where this is required).\n\nSince otherwise bugs can occur, do not allow the\nuser to override the RTS-for-aggregation setting\nfrom sysfs any more.\n\nFinally, also clean up the way all these flags get\nset in the driver and move everything into the\ndevice-specific functions.\n\nCc: stable@kernel.org [2.6.35]\nSigned-off-by: Johannes Berg \u003cjohannes.berg@intel.com\u003e\nSigned-off-by: Wey-Yi Guy \u003cwey-yi.w.guy@intel.com\u003e\nSigned-off-by: John W. Linville \u003clinville@tuxdriver.com\u003e\n" }, { "commit": "a9fda88b27e71d727b6c85b3792b34a8a4bebf13", "tree": "dea45b638f01e6317a4fd77388311a547701dbd9", "parents": [ "2f2f8f2a35d5c009eb3f8941c0dbeca46ae13994" ], "author": { "name": "John W. Linville", "email": "linville@tuxdriver.com", "time": "Mon Aug 09 15:14:21 2010 -0400" }, "committer": { "name": "John W. Linville", "email": "linville@tuxdriver.com", "time": "Mon Aug 09 15:14:21 2010 -0400" }, "message": "libertas: fix build break by including linux/sched.h\n\n CC [M] drivers/net/wireless/libertas/cfg.o\n/home/greearb/git/wireless-testing/drivers/net/wireless/libertas/cfg.c: In function ‘lbs_scan_worker’:\n/home/greearb/git/wireless-testing/drivers/net/wireless/libertas/cfg.c:722: error: ‘TASK_NORMAL’ undeclared (first use in this function)\n/home/greearb/git/wireless-testing/drivers/net/wireless/libertas/cfg.c:722: error: (Each undeclared identifier is reported only once\n/home/greearb/git/wireless-testing/drivers/net/wireless/libertas/cfg.c:722: error: for each function it appears in.)\n/home/greearb/git/wireless-testing/drivers/net/wireless/libertas/cfg.c: In function ‘lbs_cfg_connect’:\n/home/greearb/git/wireless-testing/drivers/net/wireless/libertas/cfg.c:1267: error: ‘TASK_INTERRUPTIBLE’ undeclared (first use in this function)\n/home/greearb/git/wireless-testing/drivers/net/wireless/libertas/cfg.c:1267: error: implicit declaration of function ‘signal_pending’\n/home/greearb/git/wireless-testing/drivers/net/wireless/libertas/cfg.c:1267: error: implicit declaration of function ‘schedule_timeout’\n\nReported-by: Ben Greear \u003cgreearb@candelatech.com\u003e\nReported-by: Randy Dunlap \u003crandy.dunlap@oracle.com\u003e\nSigned-off-by: John W. Linville \u003clinville@tuxdriver.com\u003e\n" }, { "commit": "2f2f8f2a35d5c009eb3f8941c0dbeca46ae13994", "tree": "a76b6cc889724d2f9f6723fe80aa9bd4cbd40721", "parents": [ "c4e9b56e24422e71424b24eee27c2b134a191d7b" ], "author": { "name": "John W. Linville", "email": "linville@tuxdriver.com", "time": "Mon Aug 09 12:04:56 2010 -0400" }, "committer": { "name": "John W. Linville", "email": "linville@tuxdriver.com", "time": "Mon Aug 09 12:04:56 2010 -0400" }, "message": "Revert \"p54pci: Add PCI ID for SMC2802W\"\n\nThis reverts commit 5f7aebd845a9d2ed42f36b7333579ec3534b4713.\n\nApparently, that PCI ID data was incorrectly taken from the subsystem\ninformation. The actual ID matches another already known ID.\n\nSigned-off-by: John W. Linville \u003clinville@tuxdriver.com\u003e\n" }, { "commit": "2d0bb1c1f4524befe9f0fcf0d0cd3081a451223f", "tree": "16abb34e4f852ac6c4101ef9e46940c3bcd5937f", "parents": [ "4bc091d85f979a1a18ef2d710b819b3c5b397707" ], "author": { "name": "Jeff Kirsher", "email": "jeffrey.t.kirsher@intel.com", "time": "Sun Aug 08 16:02:31 2010 +0000" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Sun Aug 08 20:02:45 2010 -0700" }, "message": "e100/e1000*/igb*/ixgb*: Add missing read memory barrier\n\nBased on patches from Sonny Rao and Milton Miller...\n\nCombined the patches to fix up clean_tx_irq and clean_rx_irq.\n\nThe PowerPC architecture does not require loads to independent bytes\nto be ordered without adding an explicit barrier.\n\nIn ixgbe_clean_rx_irq we load the status bit then load the packet data.\nWith packet split disabled if these loads go out of order we get a\nstale packet, but we will notice the bad sequence numbers and drop it.\n\nThe problem occurs with packet split enabled where the TCP/IP header\nand data are in different descriptors. If the reads go out of order\nwe may have data that doesn\u0027t match the TCP/IP header. Since we use\nhardware checksumming this bad data is never verified and it makes it\nall the way to the application.\n\nThis bug was found during stress testing and adding this barrier has\nbeen shown to fix it. The bug can manifest as a data integrity issue\n(bad payload data) or as a BUG in skb_pull().\n\nThis was a nasty bug to hunt down, if people agree with the fix I think\nit\u0027s a candidate for stable.\n\nPreviously Submitted to e1000-devel only for ixgbe\n\nhttp://marc.info/?l\u003de1000-devel\u0026m\u003d126593062701537\u0026w\u003d3\n\nWe\u0027ve now seen this problem hit with other device drivers (e1000e mostly)\nSo I\u0027m resubmitting with fixes for other Intel Device Drivers with\nsimilar issues.\n\nCC: Milton Miller \u003cmiltonm@bga.com\u003e\nCC: Anton Blanchard \u003canton@samba.org\u003e\nCC: Sonny Rao \u003csonnyrao@us.ibm.com\u003e\nCC: stable \u003cstable@kernel.org\u003e\nSigned-off-by: Jeff Kirsher \u003cjeffrey.t.kirsher@intel.com\u003e\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "4bc091d85f979a1a18ef2d710b819b3c5b397707", "tree": "01a5155e8966d53514648b211aaea13843c655b9", "parents": [ "16d884bd901288fb5cde876489f7093740b66a30" ], "author": { "name": "John Fastabend", "email": "john.r.fastabend@intel.com", "time": "Sun Aug 08 15:46:15 2010 +0000" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Sun Aug 08 20:02:44 2010 -0700" }, "message": "ixgbe: fix build error with FCOE_CONFIG without DCB_CONFIG\n\nBuilding ixgbe without DCB_CONFIG and FCOE_CONFIG will cause\na build error. This resolves the build error by wrapping\nthe fcoe.up in CONFIG_IXGBE_DCB ifdefs.\n\nAlso frames were being priority VLAN tagged even without DCB\nenabled. This fixes this so that 8021Q priority tags are\nonly added with DCB actually enabled.\n\nReported-by: divya \u003cdipraksh@linux.vnet.ibm.com\u003e\nReported-by: Jon Mason \u003cjon.mason@exar.com\u003e\nSigned-off-by: John Fastabend \u003cjohn.r.fastabend@intel.com\u003e\nTested-by: Stephen Ko \u003cstephen.s.ko@intel.com\u003e\nTested-by: Ross Brattain \u003cross.b.brattain@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": "19e4875fb21a69fbf620e84769a74d189c69c58d", "tree": "c9a80978f68b5f60bd6ec2bfb44fbbab27d43c71", "parents": [ "2dc11581376829303b98eadb2de253bee065a56a" ], "author": { "name": "Grant Likely", "email": "grant.likely@secretlab.ca", "time": "Sun Aug 08 00:23:26 2010 -0600" }, "committer": { "name": "Grant Likely", "email": "grant.likely@secretlab.ca", "time": "Sun Aug 08 01:20:06 2010 -0600" }, "message": "of/sparc: fix build regression from of_device changes\n\nCommit id 1636f8ac2b08410df4766449f7c86b912443cd99 (sparc/of: Move\nof_device fields into struct pdev_archdata) missed fixing up the\nn2_core.c and greth.c drivers. This patch makes the required changes.\n\nReported-by: David S. Miller \u003cdavem@davemloft.net\u003e\nSigned-off-by: Grant Likely \u003cgrant.likely@secretlab.ca\u003e\n" }, { "commit": "16d884bd901288fb5cde876489f7093740b66a30", "tree": "3aafc6a072a1b8091cf60536ce440e0605413975", "parents": [ "8bcfbd0af0f8ee50033091e75ab3d6b6e7fa8867" ], "author": { "name": "Amit Kumar Salecha", "email": "amit.salecha@qlogic.com", "time": "Sat Aug 07 23:05:23 2010 -0700" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Sat Aug 07 23:05:23 2010 -0700" }, "message": "netxen: protect tx timeout recovery by rtnl lock\n\nSigned-off-by: Amit Kumar Salecha \u003camit.salecha@qlogic.com\u003e\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "e225567960db50e9810a152c8621c7a6ed94de71", "tree": "d0129e2988f8aea56d4f00f04c4818c2e8cc07a2", "parents": [ "4b030d4288a569d6bdeca884d7f102d951f097f2", "a24d52f390a77ce90dc8cf0cd75d27ec0a6ea3f8" ], "author": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Fri Aug 06 13:30:43 2010 -0700" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Fri Aug 06 13:30:43 2010 -0700" }, "message": "Merge branch \u0027master\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless-2.6\n" }, { "commit": "1685e633b396b0f3dabbc9fa5d65dfefe6435250", "tree": "ee83e26e2468ca1518a1b065c690159e12c8def9", "parents": [ "1cfd2bda8c486ae0e7a8005354758ebb68172bca", "127c03cdbad9bd5af5d7f33bd31a1015a90cb77f" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Fri Aug 06 12:25:06 2010 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Fri Aug 06 12:25:06 2010 -0700" }, "message": "Merge git://git.kernel.org/pub/scm/linux/kernel/git/brodo/pcmcia-2.6\n\n* git://git.kernel.org/pub/scm/linux/kernel/git/brodo/pcmcia-2.6:\n pcmcia: avoid buffer overflow in pcmcia_setup_isa_irq\n pcmcia: do not request windows if you don\u0027t need to\n pcmcia: insert PCMCIA device resources into resource tree\n pcmcia: export resource information to sysfs\n pcmcia: use struct resource for PCMCIA devices, part 2\n pcmcia: remove memreq_t\n pcmcia: move local definitions out of include/pcmcia/cs.h\n pcmcia: do not use io_req_t when calling pcmcia_request_io()\n pcmcia: do not use io_req_t after call to pcmcia_request_io()\n pcmcia: use struct resource for PCMCIA devices\n pcmcia: clean up cs.h\n pcmcia: use pcmica_{read,write}_config_byte\n pcmcia: remove cs_types.h\n pcmcia: remove unused flag, simplify headers\n pcmcia: remove obsolete CS_EVENT_ definitions\n pcmcia: split up central event handler\n pcmcia: simplify event callback\n pcmcia: remove obsolete ioctl\n\nConflicts in:\n - drivers/staging/comedi/drivers/*\n - drivers/staging/wlags49_h2/wl_cs.c\ndue to dev_info_t and whitespace changes\n" }, { "commit": "1cfd2bda8c486ae0e7a8005354758ebb68172bca", "tree": "76ce15f377d8d6eb3ae4aa8b8b0b415457e38d36", "parents": [ "b57bdda58cda0aaf6def042d101dd85977a286ed", "763e9db9994e27a7d2cb3701c8a097a867d0e0b4" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Fri Aug 06 11:44:36 2010 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Fri Aug 06 11:44:36 2010 -0700" }, "message": "Merge branch \u0027linux-next\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/jbarnes/pci-2.6\n\n* \u0027linux-next\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/jbarnes/pci-2.6: (30 commits)\n PCI: update for owner removal from struct device_attribute\n PCI: Fix warnings when CONFIG_DMI unset\n PCI: Do not run NVidia quirks related to MSI with MSI disabled\n x86/PCI: use for_each_pci_dev()\n PCI: use for_each_pci_dev()\n PCI: MSI: Restore read_msi_msg_desc(); add get_cached_msi_msg_desc()\n PCI: export SMBIOS provided firmware instance and label to sysfs\n PCI: Allow read/write access to sysfs I/O port resources\n x86/PCI: use host bridge _CRS info on ASRock ALiveSATA2-GLAN\n PCI: remove unused HAVE_ARCH_PCI_SET_DMA_MAX_SEGMENT_{SIZE|BOUNDARY}\n PCI: disable mmio during bar sizing\n PCI: MSI: Remove unsafe and unnecessary hardware access\n PCI: Default PCIe ASPM control to on and require !EMBEDDED to disable\n PCI: kernel oops on access to pci proc file while hot-removal\n PCI: pci-sysfs: remove casts from void*\n ACPI: Disable ASPM if the platform won\u0027t provide _OSC control for PCIe\n PCI hotplug: make sure child bridges are enabled at hotplug time\n PCI hotplug: shpchp: Removed check for hotplug of display devices\n PCI hotplug: pciehp: Fixed return value sign for pciehp_unconfigure_device\n PCI: Don\u0027t enable aspm before drivers have had a chance to veto it\n ...\n" }, { "commit": "a24d52f390a77ce90dc8cf0cd75d27ec0a6ea3f8", "tree": "22bd26711179036d5c417ec5fc0c56de82fe0a07", "parents": [ "e95b743536937a72e1560c85696b425c5d1a1c18" ], "author": { "name": "Johannes Berg", "email": "johannes.berg@intel.com", "time": "Fri Aug 06 16:17:53 2010 +0200" }, "committer": { "name": "John W. Linville", "email": "linville@tuxdriver.com", "time": "Fri Aug 06 13:53:58 2010 -0400" }, "message": "iwlwifi: fix locking assertions\n\nspin_is_locked() can return zero on some (UP?)\nconfigurations because locks don\u0027t exist, and\nthat causes an endless amount of warnings. Use\nlockdep_assert_held() instead, which has two\nadvantages:\n 1) it verifies the current task is holding\n the lock or mutex\n 2) it compiles away completely when lockdep\n is not enabled\n\nCc: stable@kernel.org [2.6.34+, maybe only parts of patch]\nReported-by: Thomas Meyer \u003cthomas@m3y3r.de\u003e\nSigned-off-by: Johannes Berg \u003cjohannes.berg@intel.com\u003e\nSigned-off-by: John W. Linville \u003clinville@tuxdriver.com\u003e\n" }, { "commit": "e95b743536937a72e1560c85696b425c5d1a1c18", "tree": "af92b1b6e04d7aef3696c56cd8e41ac8330bcc71", "parents": [ "8f1d2d2be73a98c21e68fe2a26f633892d4abdd1" ], "author": { "name": "Johannes Berg", "email": "johannes.berg@intel.com", "time": "Fri Aug 06 16:00:48 2010 +0200" }, "committer": { "name": "John W. Linville", "email": "linville@tuxdriver.com", "time": "Fri Aug 06 13:53:58 2010 -0400" }, "message": "iwlwifi: fix TX tracer\n\nThe TX tracing code copies with the wrong length,\nwhich will typically copy too little data. Fix\nthis by using the correct length variable.\n\nCc: stable@kernel.org [2.6.32+]\nSigned-off-by: Johannes Berg \u003cjohannes.berg@intel.com\u003e\nSigned-off-by: John W. Linville \u003clinville@tuxdriver.com\u003e\n" }, { "commit": "500b9fc922cbec572f4fd1436533bfaed5011262", "tree": "aac4b7de0871e66740aeaf3510f7a59280026592", "parents": [ "f165eb77f49cb6f6e86e2f2f09183904b2965d19", "beccb12f6fbcc73339f127ff1f00638f076c933f" ], "author": { "name": "Russell King", "email": "rmk+kernel@arm.linux.org.uk", "time": "Fri Aug 06 18:13:19 2010 +0100" }, "committer": { "name": "Russell King", "email": "rmk+kernel@arm.linux.org.uk", "time": "Fri Aug 06 18:13:19 2010 +0100" }, "message": "Merge master.kernel.org:/pub/scm/linux/kernel/git/lethal/genesis-2.6 into devel-stable\n\nConflicts:\n\tdrivers/net/irda/sh_irda.c\n" }, { "commit": "2dc11581376829303b98eadb2de253bee065a56a", "tree": "dbce62559c822cd720d1819a50c488bfecdfa945", "parents": [ "fc1caf6eafb30ea185720e29f7f5eccca61ecd60" ], "author": { "name": "Grant Likely", "email": "grant.likely@secretlab.ca", "time": "Fri Aug 06 09:25:50 2010 -0600" }, "committer": { "name": "Grant Likely", "email": "grant.likely@secretlab.ca", "time": "Fri Aug 06 09:25:50 2010 -0600" }, "message": "of/device: Replace struct of_device with struct platform_device\n\nof_device is just an alias for platform_device, so remove it entirely. Also\nreplace to_of_device() with to_platform_device() and update comment blocks.\n\nThis patch was initially generated from the following semantic patch, and then\nedited by hand to pick up the bits that coccinelle didn\u0027t catch.\n\n@@\n@@\n-struct of_device\n+struct platform_device\n\nSigned-off-by: Grant Likely \u003cgrant.likely@secretlab.ca\u003e\nReviewed-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "03c0c29aff7e56b722eb6c47eace222b140d0377", "tree": "47267a19b523159cf36a050ef3c35f4dbdb33016", "parents": [ "c60c6a96b7bb0f1f8bb635fdfcf5b592aaf062b4", "7fb8f881c54beb05dd4d2c947dada1c636581d87" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Thu Aug 05 15:57:35 2010 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Thu Aug 05 15:57:35 2010 -0700" }, "message": "Merge branch \u0027next-devicetree\u0027 of git://git.secretlab.ca/git/linux-2.6\n\n* \u0027next-devicetree\u0027 of git://git.secretlab.ca/git/linux-2.6: (63 commits)\n of/platform: Register of_platform_drivers with an \"of:\" prefix\n of/address: Clean up function declarations\n of/spi: call of_register_spi_devices() from spi core code\n of: Provide default of_node_to_nid() implementation.\n of/device: Make of_device_make_bus_id() usable by other code.\n of/irq: Fix endian issues in parsing interrupt specifiers\n of: Fix phandle endian issues\n of/flattree: fix of_flat_dt_is_compatible() to match the full compatible string\n of: remove of_default_bus_ids\n of: make of_find_device_by_node generic\n microblaze: remove references to of_device and to_of_device\n sparc: remove references to of_device and to_of_device\n powerpc: remove references to of_device and to_of_device\n of/device: Replace of_device with platform_device in includes and core code\n of/device: Protect against binding of_platform_drivers to non-OF devices\n of: remove asm/of_device.h\n of: remove asm/of_platform.h\n of/platform: remove all of_bus_type and of_platform_bus_type references\n of: Merge of_platform_bus_type with platform_bus_type\n drivercore/of: Add OF style matching to platform bus\n ...\n\nFix up trivial conflicts in arch/microblaze/kernel/Makefile due to just\nsome obj-y removals by the devicetree branch, while the microblaze\nupdates added a new file.\n" }, { "commit": "23d23e409a51a3eaad17a8045d30fd9cf8fb8a03", "tree": "e8487724356612818ebf68bc693f0401ea4a5273", "parents": [ "a767bde4d484b60dab0abac740a7151b624a30bf" ], "author": { "name": "Christian Samsel", "email": "Christian.Samsel@rwth-aachen.de", "time": "Wed Aug 04 22:14:36 2010 +0000" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Thu Aug 05 13:21:24 2010 -0700" }, "message": "usbnet: remove noisy and hardly useful printk\n\nWith turned on hspa modem (Dell 5530 internal card) and activated usb auto\nsuspend, my system gets up 100 \"usbnet_resume has delayed data\" per\nminute. I didnt noticed any pathological behaviour, so just drop\nthis message. if any objections, please at least change it to _DEBUG.\n\nSigned-off-by: Christian Samsel \u003cchristian.samsel@rwth-aachen.de\u003e\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "8f1d2d2be73a98c21e68fe2a26f633892d4abdd1", "tree": "347a1a6a0621a151151590fd4baa22dcff1c8c35", "parents": [ "c5d2711cb508ff8bc76d88fe442d1c27fb136245" ], "author": { "name": "John W. Linville", "email": "linville@tuxdriver.com", "time": "Thu Aug 05 13:46:27 2010 -0400" }, "committer": { "name": "John W. Linville", "email": "linville@tuxdriver.com", "time": "Thu Aug 05 16:05:27 2010 -0400" }, "message": "rtl8180: avoid potential NULL deref in rtl8180_beacon_work\n\nieee80211_beacon_get can return NULL...\n\nSigned-off-by: John W. Linville \u003clinville@tuxdriver.com\u003e\nCc: stable@kernel.org\n" }, { "commit": "cc02681923ce09a7c8cfacc6855de259b9d4ef87", "tree": "2275e6f20587b958136b5ee67cb3049f437c726a", "parents": [ "197575393713eba035925e4bfdee407f473e5057" ], "author": { "name": "Dan Williams", "email": "dcbw@redhat.com", "time": "Wed Aug 04 00:43:47 2010 -0500" }, "committer": { "name": "John W. Linville", "email": "linville@tuxdriver.com", "time": "Thu Aug 05 16:05:27 2010 -0400" }, "message": "libertas: scan before assocation if no BSSID was given\n\nFix this leftover TODO from the cfg80211 conversion by doing a scan\nif cfg80211 didn\u0027t pass in the BSSID for us. Since the scan code\nuses so much of the cfg80211_scan_request structure to build up the\nfirmware command, we just fake one when the scan request is triggered\ninternally. But we need to make sure that internal \u0027fake\u0027 cfg82011\nscan request does not get back to cfg82011 via cfg80211_scan_done().\n\nSigned-off-by: Dan Williams \u003cdcbw@redhat.com\u003e\nSigned-off-by: John W. Linville \u003clinville@tuxdriver.com\u003e\n" }, { "commit": "197575393713eba035925e4bfdee407f473e5057", "tree": "7328fc8f629dcaa0b3c638ad6b01854b70938799", "parents": [ "aebb628f39ccf67fe9ed888c7f80926fc1070ce5" ], "author": { "name": "Dan Williams", "email": "dcbw@redhat.com", "time": "Thu Jul 29 23:16:01 2010 -0700" }, "committer": { "name": "John W. Linville", "email": "linville@tuxdriver.com", "time": "Thu Aug 05 16:05:26 2010 -0400" }, "message": "libertas: fix association with some APs by using extended rates\n\nSome APs get pissy if you don\u0027t send the firmware the extended rates\nin the association request\u0027s rates TLV. Found this on a Linksys\nWRT54G v2; it denies association with status code 18 unless you\nadd the extended rates too. The old driver did this, but it got\nlost in the cfg80211 conversion.\n\nSigned-off-by: Dan Williams \u003cdcbw@redhat.com\u003e\nSigned-off-by: John W. Linville \u003clinville@tuxdriver.com\u003e\n" }, { "commit": "aebb628f39ccf67fe9ed888c7f80926fc1070ce5", "tree": "7857d5b2c207acf31064f61e498279615120e618", "parents": [ "c0068c85897f06205d4c35cf4bf9161be90690e9" ], "author": { "name": "Dan Williams", "email": "dcbw@redhat.com", "time": "Thu Jul 29 23:11:30 2010 -0700" }, "committer": { "name": "John W. Linville", "email": "linville@tuxdriver.com", "time": "Thu Aug 05 16:03:40 2010 -0400" }, "message": "libertas: get the right # of scanned BSSes\n\nLet\u0027s actually check the right field in the command response; and\nif there aren\u0027t any reported BSSes, exit early with success.\n\nSigned-off-by: Dan Williams \u003cdcbw@redhat.com\u003e\nSigned-off-by: John W. Linville \u003clinville@tuxdriver.com\u003e\n" }, { "commit": "cdd854bc42b5e6c79bbbc40c6600d995ffe6e747", "tree": "18c4dcc07bbb8aeb2b23bc812cd60cc293f36cd8", "parents": [ "bbc4fd12a635492ad9d12bb418124fa2d5f0d734", "42a0ae2282b512d1a8f6f020327f5f7b8f31a5ea" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Thu Aug 05 09:03:46 2010 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Thu Aug 05 09:03:46 2010 -0700" }, "message": "Merge branch \u0027next\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/benh/powerpc\n\n* \u0027next\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/benh/powerpc: (79 commits)\n powerpc/8xx: Add support for the MPC8xx based boards from TQC\n powerpc/85xx: Introduce support for the Freescale P1022DS reference board\n powerpc/85xx: Adding DTS for the STx GP3-SSA MPC8555 board\n powerpc/85xx: Change deprecated binding for 85xx-based boards\n powerpc/tqm85xx: add a quirk for ti1520 PCMCIA bridge\n powerpc/tqm85xx: update PCI interrupt-map attribute\n powerpc/mpc8308rdb: support for MPC8308RDB board from Freescale\n powerpc/fsl_pci: add quirk for mpc8308 pcie bridge\n powerpc/85xx: Cleanup QE initialization for MPC85xxMDS boards\n powerpc/85xx: Fix booting for P1021MDS boards\n powerpc/85xx: Fix SWIOTLB initalization for MPC85xxMDS boards\n powerpc/85xx: kexec for SMP 85xx BookE systems\n powerpc/5200/i2c: improve i2c bus error recovery\n of/xilinxfb: update tft compatible versions\n powerpc/fsl-diu-fb: Support setting display mode using EDID\n powerpc/5121: doc/dts-bindings: update doc of FSL DIU bindings\n powerpc/5121: shared DIU framebuffer support\n powerpc/5121: move fsl-diu-fb.h to include/linux\n powerpc/5121: fsl-diu-fb: fix issue with re-enabling DIU area descriptor\n powerpc/512x: add clock structure for Video-IN (VIU) unit\n ...\n" }, { "commit": "c3d1f1746b966907ba5ad2f75ddca24db8b21147", "tree": "548a25e104d8bdb906030b8d3bf78fbfde0e5817", "parents": [ "66eddbfcc1f6610fa7c73c8d20a57eaf8e284e2f", "0d365753d0b7c26043fdfa97790411606fb40112" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Thu Aug 05 08:53:20 2010 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Thu Aug 05 08:53:20 2010 -0700" }, "message": "Merge branch \u0027upstream\u0027 of git://git.linux-mips.org/pub/scm/upstream-linus\n\n* \u0027upstream\u0027 of git://git.linux-mips.org/pub/scm/upstream-linus: (150 commits)\n MIPS: PowerTV: Separate PowerTV USB support from non-USB code\n MIPS: strip the un-needed sections of vmlinuz\n MIPS: Clean up the calculation of VMLINUZ_LOAD_ADDRESS\n MIPS: Clean up arch/mips/boot/compressed/decompress.c\n MIPS: Clean up arch/mips/boot/compressed/ld.script\n MIPS: Unify the suffix of compressed vmlinux.bin\n MIPS: PowerTV: Add Gaia platform definitions.\n MIPS: BCM47xx: Fix nvram_getenv return value.\n MIPS: Octeon: Allow more than 3.75GB of memory with PCIe\n MIPS: Clean up notify_die() usage.\n MIPS: Remove unused task_struct.trap_no field.\n Documentation: Mention that KProbes is supported on MIPS\n SAMPLES: kprobe_example: Make it print something on MIPS.\n MIPS: kprobe: Add support.\n MIPS: Add instrunction format for BREAK and SYSCALL\n MIPS: kprobes: Define regs_return_value()\n MIPS: Ritually kill stupid printk.\n MIPS: Octeon: Disallow MSI-X interrupt and fall back to MSI interrupts.\n MIPS: Octeon: Support 256 MSI on PCIe\n MIPS: Decode core number for R2 CPUs.\n ...\n" }, { "commit": "f66736532a6bc593a2d7cda68835a79c23836f1b", "tree": "fb015e299f7355bce687baa157837608dffe762a", "parents": [ "12bf3f24e07d18ab6c42619be604e269f6738614" ], "author": { "name": "Manuel Lauss", "email": "manuel.lauss@googlemail.com", "time": "Wed Jul 21 14:30:50 2010 +0200" }, "committer": { "name": "Ralf Baechle", "email": "ralf@linux-mips.org", "time": "Thu Aug 05 13:26:09 2010 +0100" }, "message": "MIPS: au1000_eth: Get ethernet address from platform_data\n\nau1000_eth uses firmware calls to get a valid MAC address, and changes\nit depending on platform device id. This patch moves this logic out of\nthe driver into the platform device registration part, where boards with\nsupported chips can use whatever firmware interface they need; the default\nimplementation maintains compatibility with existing, YAMON-based firmware.\n\nTested-by: Wolfgang Grandegger \u003cwg@denx.de\u003e\nAcked-by: Florian Fainelli \u003cflorian@openwrt.org\u003e\nSigned-off-by: Manuel Lauss \u003cmanuel.lauss@googlemail.com\u003e\nTo: Linux-MIPS \u003clinux-mips@linux-mips.org\u003e\nCc: netdev@vger.kernel.org\nPatchwork: https://patchwork.linux-mips.org/patch/1481/\nAcked-by: David S. Miller \u003cdavem@davemloft.net\u003e\nSigned-off-by: Ralf Baechle \u003cralf@linux-mips.org\u003e\n" }, { "commit": "42a4f17dc356689075263d7c2bd68456676fa62e", "tree": "2c66f5be57722cff7bb39eb0b59c3ec6eb24fff6", "parents": [ "745aef5df1e2277ee9e34d86491084c0d6106338" ], "author": { "name": "Manuel Lauss", "email": "manuel.lauss@googlemail.com", "time": "Thu Jul 15 21:45:04 2010 +0200" }, "committer": { "name": "Ralf Baechle", "email": "ralf@linux-mips.org", "time": "Thu Aug 05 13:26:06 2010 +0100" }, "message": "MIPS: Alchemy: remove SOC_AU1X00 in favor of MIPS_ALCHEMY\n\nRemove the CONFIG_SOC_AU1X00 Kconfig symbol since its job can also be done\nby MACH_ALCHEMY, now renamed to MIPS_ALCHEMY.\n\nSigned-off-by: Manuel Lauss \u003cmanuel.lauss@googlemail.com\u003e\nTo: Linux-MIPS \u003clinux-mips@linux-mips.org\u003e\nPatchwork: https://patchwork.linux-mips.org/patch/1461/\nSigned-off-by: Ralf Baechle \u003cralf@linux-mips.org\u003e\n" }, { "commit": "a767bde4d484b60dab0abac740a7151b624a30bf", "tree": "9caf3dcf83afcc332012f0b551144a79955ff3d6", "parents": [ "d7100da026317fcf07411f765fe1cdb044053917" ], "author": { "name": "Rusty Russell", "email": "rusty@rustcorp.com.au", "time": "Wed Aug 04 17:32:05 2010 +0000" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Wed Aug 04 21:53:17 2010 -0700" }, "message": "virtio_net: implements ethtool_ops.get_drvinfo\n\nI often use \"ethtool -i\" command to check what driver controls the\nehternet device. But because current virtio_net driver doesn\u0027t\nsupport \"ethtool -i\", it becomes the following:\n\n # ethtool -i eth3\n Cannot get driver information: Operation not supported\n\nThis patch simply adds the \"ethtool -i\" support. The following is the\nresult when using the virtio_net driver with my patch applied to.\n\n # ethtool -i eth3\n driver: virtio_net\n version: N/A\n firmware-version: N/A\n bus-info: virtio0\n\nPersonally, \"-i\" is one of the most frequently-used option, and most\nnetwork drivers support \"ethtool -i\", so I think virtio_net also\nshould do.\n\nSigned-off-by: Taku Izumi \u003cizumi.taku@jp.fujitsu.com\u003e\nSigned-off-by: Rusty Russell \u003crusty@rustcorp.com.au\u003e (use ARRAY_SIZE)\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "d7100da026317fcf07411f765fe1cdb044053917", "tree": "97e9ecbde1575173684a357ad00960384ec7d1db", "parents": [ "3b5bac2bdea1de832bdd8e2c904ab7c9479ff9ed" ], "author": { "name": "stephen hemminger", "email": "shemminger@vyatta.com", "time": "Wed Aug 04 07:34:36 2010 +0000" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Wed Aug 04 21:53:17 2010 -0700" }, "message": "ppp: make channel_ops const\n\nThe PPP channel ops structure should be const.\nCleanup the declarations to use standard C99 format.\n\nSigned-off-by: Stephen Hemminger \u003cshemminger@vyatta.com\u003e\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "c33788b45f754bd5dd8adc520e37fa38ac1849c7", "tree": "eccf06b81949778b6a30e53f691ef6256a613f0c", "parents": [ "2a1bc0d56b446104a3a728925b3a7afbef64afa7" ], "author": { "name": "Joe Perches", "email": "joe@perches.com", "time": "Tue Aug 03 09:32:24 2010 +0000" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Wed Aug 04 16:18:04 2010 -0700" }, "message": "drivers/net/enic: Use %pUB to format a UUID\n\nSigned-off-by: Joe Perches \u003cjoe@perches.com\u003e\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "2a1bc0d56b446104a3a728925b3a7afbef64afa7", "tree": "2c484fa53420a3c673142551daccc45b0f803d10", "parents": [ "889635fd6b269963f7e68b53c9f0f60c8008a77f" ], "author": { "name": "Stefan Weil", "email": "weil@mail.berlios.de", "time": "Tue Aug 03 08:53:45 2010 +0000" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Wed Aug 04 16:18:03 2010 -0700" }, "message": "davinci_emac: Fix use after free in davinci_emac_remove\n\nfree_netdev finally calls kfree which makes the contents\nof ndev and priv (private data contained in ndev) invalid.\n\nSo iounmap should be called before free_netdev.\n\nCc: David S. Miller \u003cdavem@davemloft.net\u003e\nCc: Chaithrika U S \u003cchaithrika@ti.com\u003e\nCc: Sriramakrishnan \u003csrk@ti.com\u003e\nCc: Kevin Hilman \u003ckhilman@deeprootsystems.com\u003e\nCc: netdev@vger.kernel.org\nCc: linux-kernel@vger.kernel.org\nSigned-off-by: Stefan Weil \u003cweil@mail.berlios.de\u003e\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "889635fd6b269963f7e68b53c9f0f60c8008a77f", "tree": "cc8c3c459a82d71c1c15a056961b23f81e540e6e", "parents": [ "7a0c2029d655e03499b1e2a3daeeab6a56d72b87" ], "author": { "name": "Kulikov Vasiliy", "email": "segooon@gmail.com", "time": "Tue Aug 03 05:43:18 2010 +0000" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Wed Aug 04 16:18:03 2010 -0700" }, "message": "via-velocity: do not use PCI resources before pci_enable_device()\n\nIRQ and resource[] may not have correct values until\nafter PCI hotplug setup occurs at pci_enable_device() time.\n\nThe semantic match that finds this problem is as follows:\n\n// \u003csmpl\u003e\n@@\nidentifier x;\nidentifier request ~\u003d \"pci_request.*|pci_resource.*\";\n@@\n\n(\n* x-\u003eirq\n|\n* x-\u003eresource\n|\n* request(x, ...)\n)\n ...\n*pci_enable_device(x)\n// \u003c/smpl\u003e\n\nSigned-off-by: Kulikov Vasiliy \u003csegooon@gmail.com\u003e\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "7a0c2029d655e03499b1e2a3daeeab6a56d72b87", "tree": "2de949a524222b5391483ddeba9e9e3b154584ff", "parents": [ "7aaaaa1e44b2a4047dfe05f304a5090eb995cf44" ], "author": { "name": "Kulikov Vasiliy", "email": "segooon@gmail.com", "time": "Tue Aug 03 05:43:15 2010 +0000" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Wed Aug 04 16:18:02 2010 -0700" }, "message": "cxgb4vf: do not use PCI resources before pci_enable_device()\n\nIRQ and resource[] may not have correct values until\nafter PCI hotplug setup occurs at pci_enable_device() time.\n\nThe semantic match that finds this problem is as follows:\n\n// \u003csmpl\u003e\n@@\nidentifier x;\nidentifier request ~\u003d \"pci_request.*|pci_resource.*\";\n@@\n\n(\n* x-\u003eirq\n|\n* x-\u003eresource\n|\n* request(x, ...)\n)\n ...\n*pci_enable_device(x)\n// \u003c/smpl\u003e\n\nSigned-off-by: Kulikov Vasiliy \u003csegooon@gmail.com\u003e\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "7aaaaa1e44b2a4047dfe05f304a5090eb995cf44", "tree": "e8acddbddcfefd6b698c9061343b82baf0205d84", "parents": [ "3cfc2c42c1cbc8e238bb9c0612c0df4565e3a8b4" ], "author": { "name": "Kulikov Vasiliy", "email": "segooon@gmail.com", "time": "Tue Aug 03 05:43:11 2010 +0000" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Wed Aug 04 16:18:02 2010 -0700" }, "message": "cxgb3: do not use PCI resources before pci_enable_device()\n\nIRQ and resource[] may not have correct values until\nafter PCI hotplug setup occurs at pci_enable_device() time.\n\nThe semantic match that finds this problem is as follows:\n\n// \u003csmpl\u003e\n@@\nidentifier x;\nidentifier request ~\u003d \"pci_request.*|pci_resource.*\";\n@@\n\n(\n* x-\u003eirq\n|\n* x-\u003eresource\n|\n* request(x, ...)\n)\n ...\n*pci_enable_device(x)\n// \u003c/smpl\u003e\n\nSigned-off-by: Kulikov Vasiliy \u003csegooon@gmail.com\u003e\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "3cfc2c42c1cbc8e238bb9c0612c0df4565e3a8b4", "tree": "5adc1ff2eaf64d450bf28bb6b2ce890db2567288", "parents": [ "5cf65713f87775c548e3eb48dbafa32e12f28000", "0ea6e61122196509af82cc4f36cbdaacbefb8227" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Wed Aug 04 15:31:02 2010 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Wed Aug 04 15:31:02 2010 -0700" }, "message": "Merge branch \u0027for-next\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/trivial\n\n* \u0027for-next\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/trivial: (48 commits)\n Documentation: update broken web addresses.\n fix comment typo \"choosed\" -\u003e \"chosen\"\n hostap:hostap_hw.c Fix typo in comment\n Fix spelling contorller -\u003e controller in comments\n Kconfig.debug: FAIL_IO_TIMEOUT: typo Faul -\u003e Fault\n fs/Kconfig: Fix typo Userpace -\u003e Userspace\n Removing dead MACH_U300_BS26\n drivers/infiniband: Remove unnecessary casts of private_data\n fs/ocfs2: Remove unnecessary casts of private_data\n libfc: use ARRAY_SIZE\n scsi: bfa: use ARRAY_SIZE\n drm: i915: use ARRAY_SIZE\n drm: drm_edid: use ARRAY_SIZE\n synclink: use ARRAY_SIZE\n block: cciss: use ARRAY_SIZE\n comment typo fixes: charater \u003d\u003e character\n fix comment typos concerning \"challenge\"\n arm: plat-spear: fix typo in kerneldoc\n reiserfs: typo comment fix\n update email address\n ...\n" }, { "commit": "2411054ae9eb7e7ef488a39912abfc4ebadbe3ad", "tree": "b90db55a546c0dad43900c7e7c82ff0dd4494c4f", "parents": [ "47cb905d6b1f46bf403998f4838baa3f3b597391" ], "author": { "name": "Andy Lutomirski", "email": "luto@MIT.EDU", "time": "Sun Jul 25 13:14:29 2010 -0400" }, "committer": { "name": "John W. Linville", "email": "linville@tuxdriver.com", "time": "Wed Aug 04 15:30:55 2010 -0400" }, "message": "iwlagn: Improve aggregation failure error messages\n\n82ca9341763107615a15da6e59b9535d49eb91c3 added scary looking\nbut harmless error messages. Make them clearer and make the\nactual failure message show up with the same severity as the\nharmless one.\n\nSigned-off-by: Andy Lutomirski \u003cluto@mit.edu\u003e\nSigned-off-by: John W. Linville \u003clinville@tuxdriver.com\u003e\n" }, { "commit": "47cb905d6b1f46bf403998f4838baa3f3b597391", "tree": "08de40b5141e70b434d5f77bbc44898c83a2c67c", "parents": [ "93c08c32914264f539baf7f04cce310a0dd30a7a" ], "author": { "name": "Kulikov Vasiliy", "email": "segooon@gmail.com", "time": "Tue Aug 03 19:43:22 2010 +0400" }, "committer": { "name": "John W. Linville", "email": "linville@tuxdriver.com", "time": "Wed Aug 04 15:28:37 2010 -0400" }, "message": "rt2x00: do not use PCI resources before pci_enable_device()\n\nIRQ and resource[] may not have correct values until\nafter PCI hotplug setup occurs at pci_enable_device() time.\n\nThe semantic match that finds this problem is as follows:\n\n// \u003csmpl\u003e\n@@\nidentifier x;\nidentifier request ~\u003d \"pci_request.*|pci_resource.*\";\n@@\n\n(\n* x-\u003eirq\n|\n* x-\u003eresource\n|\n* request(x, ...)\n)\n ...\n*pci_enable_device(x)\n// \u003c/smpl\u003e\n\nSigned-off-by: Kulikov Vasiliy \u003csegooon@gmail.com\u003e\nAcked-by: Gertjan van Wingerde \u003cgwingerde@gmail.com\u003e\nAcked-by: Ivo van Doorn \u003cIvDoorn@gmail.com\u003e\nSigned-off-by: John W. Linville \u003clinville@tuxdriver.com\u003e\n" }, { "commit": "93c0584ca92a76bd458c7fd505b1747901315156", "tree": "478cf17692d48d846a1046e8260f04d75967475b", "parents": [ "c8f3b7213342d905cbb75d6c8820d9141205f3a0" ], "author": { "name": "Christoph Fritz", "email": "chf.fritz@googlemail.com", "time": "Tue Aug 03 12:54:20 2010 +0200" }, "committer": { "name": "John W. Linville", "email": "linville@tuxdriver.com", "time": "Wed Aug 04 15:28:37 2010 -0400" }, "message": "wireless: ipw2100: check result of kzalloc()\n\nIf kzalloc() fails return with -ENOMEM from ipw2100_net_init() which is\ncalled by register_netdev.\n\nCC: Dan Carpenter \u003cerror27@gmail.com\u003e\nSigned-off-by: Christoph Fritz \u003cchf.fritz@googlemail.com\u003e\nSigned-off-by: John W. Linville \u003clinville@tuxdriver.com\u003e\n" }, { "commit": "c8f3b7213342d905cbb75d6c8820d9141205f3a0", "tree": "9ce37980157138280c19ea2de739c876af68d880", "parents": [ "5f7aebd845a9d2ed42f36b7333579ec3534b4713" ], "author": { "name": "Jan Friedrich", "email": "jft@dev2day.de", "time": "Mon Aug 02 23:55:50 2010 +0200" }, "committer": { "name": "John W. Linville", "email": "linville@tuxdriver.com", "time": "Wed Aug 04 15:28:37 2010 -0400" }, "message": "ath9k: fix erased ieee80211_rx_status.mactime\n\nath9k_rx_skb_preprocess nulls rxs and the mactime is never set again -\nmactime is always 0. This causes problems in IBSS mode.\n\nieee80211_rx_bss_info uses mactime to decide if an IBSS merge is needed.\nWithout this patch the merge is triggered by each beacon received.\n\nThis can be recognized by the \"beacon TSF higher than local TSF - IBSS\nmerge with BSSID\" log message accompanying each beacon.\n\nThis problem was not completely fixed in commit\na6d2055b02dde1067075795274672720baadd3ca and is not a stable kernel fix.\nIt is solely intended for wireless-testing.\n\nSigned-off-by: Jan Friedrich \u003cjft@dev2day.de\u003e\nSigned-off-by: John W. Linville \u003clinville@tuxdriver.com\u003e\n" }, { "commit": "5f7aebd845a9d2ed42f36b7333579ec3534b4713", "tree": "d2dc77ac7c1df04ec6a034be0eeb77ad2807d080", "parents": [ "754018494216e07f43c611d342d7d8bd25b22140" ], "author": { "name": "Larry Finger", "email": "Larry.Finger@lwfinger.net", "time": "Sun Aug 01 15:40:04 2010 -0500" }, "committer": { "name": "John W. Linville", "email": "linville@tuxdriver.com", "time": "Wed Aug 04 15:27:38 2010 -0400" }, "message": "p54pci: Add PCI ID for SMC2802W\n\nThe SMC2802W appears to work with p54pci.\n\nSigned-off-by: Larry Finger \u003cLarry.Finger@lwfinger.net\u003e\nTested-by: David Cozatt \u003colbrannon@gmail.com\u003e\nSigned-off-by: John W. Linville \u003clinville@tuxdriver.com\u003e\n" }, { "commit": "754018494216e07f43c611d342d7d8bd25b22140", "tree": "c8918b551fe0a793a3f98ae54415f45f9062e831", "parents": [ "824b185adf86163e57892f22a878f97bc4bc69ab" ], "author": { "name": "Lorenzo Bianconi", "email": "lorenzo.bianconi83@gmail.com", "time": "Sun Aug 01 15:47:32 2010 +0200" }, "committer": { "name": "John W. Linville", "email": "linville@tuxdriver.com", "time": "Wed Aug 04 15:27:38 2010 -0400" }, "message": "ath9k: fix an issue in ath_atx_tid paused flag management\n\nI noticed a possible issue in the paused flag management of the\nath_atx_tid data structure. In particular, in a noisy environment and\nunder heavy load, I observed that the AGGR session establishment could\nfail several times consecutively causing values of the paused flag\ngreater than one for this TID (ath_tx_pause_tid is called more than\nonce from ath_tx_aggr_start).\n\nConsidering that the session for this TID can not be established also\nafter the mac80211 stack calls the ieee80211_agg_tx_operational() since\nthe ath_tx_aggr_resume() lowers the paused flag only by one.\n\nThis patch also replaces some BUG_ON calls with WARN_ON, as even if\nthese unlikely conditions happen, it\u0027s not fatal enough to justify a\nBUG_ON.\n\nSigned-off-by: Lorenzo Bianconi \u003clorenzo.bianconi83@gmail.com\u003e\nSigned-off-by: Felix Fietkau \u003cnbd@openwrt.org\u003e\nSigned-off-by: John W. Linville \u003clinville@tuxdriver.com\u003e\n" }, { "commit": "824b185adf86163e57892f22a878f97bc4bc69ab", "tree": "eb55ec49284f3a1114affa6e8883ec9ac9e198c1", "parents": [ "bb1236115eb6fd9ab7563b6a8cfbcc6980eb3ff1" ], "author": { "name": "Luis R. Rodriguez", "email": "lrodriguez@atheros.com", "time": "Sun Aug 01 02:25:16 2010 -0400" }, "committer": { "name": "John W. Linville", "email": "linville@tuxdriver.com", "time": "Wed Aug 04 15:27:38 2010 -0400" }, "message": "ath9k_hw: Fix regulatory CTL index usage for AR9003\n\nAR9003 was not relying on the CTL indexes from the EEPROM for capping the\nmax output power. The CTL indexes from the EEPROM provide calibrated\nlimits for output power for each tested and supported frequency. Without\nthis the device operates at a power level which only conforms to the\ntransmit spectrum mask as specified by IEEE Annex I.2.3.\n\nThe regulatory limit by CRDA is always used but does not provide\ncalibrated values for optimal performance, specially on band edges.\nUsing the calibrated data from the EEPROM ensures the device\noperates at optimal output power while still ensuring proper\nregulatory compliance. The device uses the minimum of these tree\nvalues, the value from CRDA, the calibrated value from CTL indexex,\nand the value to conform to the IEEE transmit spectrum mask.\n\nSigned-off-by: Luis R. Rodriguez \u003clrodriguez@atheros.com\u003e\nSigned-off-by: John W. Linville \u003clinville@tuxdriver.com\u003e\n" }, { "commit": "bb1236115eb6fd9ab7563b6a8cfbcc6980eb3ff1", "tree": "3ce264c3ec056c4432ef304625e0f05542670bd6", "parents": [ "74dee2c3e1a3dc5cd6100f110f7935dece7a3505" ], "author": { "name": "Kulikov Vasiliy", "email": "segooon@gmail.com", "time": "Sat Jul 31 20:33:59 2010 +0400" }, "committer": { "name": "John W. Linville", "email": "linville@tuxdriver.com", "time": "Wed Aug 04 15:27:38 2010 -0400" }, "message": "net: wl12xx: do not use kfree\u0027d memory\n\nwl1271_dump() uses cmd after kfree(cmd). Move kfree() just after\nwl1271_dump().\n\nSigned-off-by: Kulikov Vasiliy \u003csegooon@gmail.com\u003e\nAcked-by: Juuso Oikarinen \u003cjuuso.oikarinen@nokia.com\u003e\nSigned-off-by: John W. Linville \u003clinville@tuxdriver.com\u003e\n" }, { "commit": "74dee2c3e1a3dc5cd6100f110f7935dece7a3505", "tree": "c85b97c1ee7548a6b8d061751eeacd3fb055e0e5", "parents": [ "735df29a0641d9d8d65117c48ee460284ffcfc05" ], "author": { "name": "Wey-Yi Guy", "email": "wey-yi.w.guy@intel.com", "time": "Sat Jul 31 08:34:12 2010 -0700" }, "committer": { "name": "John W. Linville", "email": "linville@tuxdriver.com", "time": "Wed Aug 04 15:27:38 2010 -0400" }, "message": "iwlagn: fix typo in ucode_bt_stats_read debugfs\n\nsmall typo fix in ucode_bt_stats_read debugfs file\n\nSigned-off-by: Wey-Yi Guy \u003cwey-yi.w.guy@intel.com\u003e\nSigned-off-by: John W. Linville \u003clinville@tuxdriver.com\u003e\n" }, { "commit": "735df29a0641d9d8d65117c48ee460284ffcfc05", "tree": "b8943ca9a11276c78ad8fcd4143f166924c6147a", "parents": [ "5fc97f7789e6ff3d1698a544f863b55dba9d9cd9" ], "author": { "name": "Wey-Yi Guy", "email": "wey-yi.w.guy@intel.com", "time": "Sat Jul 31 08:34:11 2010 -0700" }, "committer": { "name": "John W. Linville", "email": "linville@tuxdriver.com", "time": "Wed Aug 04 15:27:37 2010 -0400" }, "message": "iwlwifi: BA scd_flow not match condition detected\n\nIt is a uCode bug which cause the tx queue id not match scd_flow\nin compressed block ack frame, and it need to be addressed in uCode.\nCurrently, driver will log the information when it happen.\n\nSince it is possible happen very often and we do not want to fill the syslog,\nso don\u0027t enable the logging by default.\n\nSigned-off-by: Wey-Yi Guy \u003cwey-yi.w.guy@intel.com\u003e\nSigned-off-by: John W. Linville \u003clinville@tuxdriver.com\u003e\n" }, { "commit": "5fc97f7789e6ff3d1698a544f863b55dba9d9cd9", "tree": "489442529a59f8e782616e15afa55d0ec6852594", "parents": [ "4254bc1c4d7b53ac10e558dfe015725fdd693da4" ], "author": { "name": "Johannes Berg", "email": "johannes.berg@intel.com", "time": "Sat Jul 31 08:34:09 2010 -0700" }, "committer": { "name": "John W. Linville", "email": "linville@tuxdriver.com", "time": "Wed Aug 04 15:27:37 2010 -0400" }, "message": "iwlwifi: fix compile warning\n\nWhen iwlwifi is compiled w/o debug, we get\nthis warning:\niwl-agn.c: In function ‘iwlagn_load_firmware’:\niwl-agn.c:2014: warning: passing argument 3 of ‘iwl_print_hex_dump’ discards qualifiers from pointer target type\niwl-debug.h:73: note: expected ‘void *’ but argument is of type ‘const u8 *’\n\nbecause the const qualifier is missing in the\ninline stub. Fix this.\n\nSigned-off-by: Johannes Berg \u003cjohannes.berg@intel.com\u003e\nSigned-off-by: Wey-Yi Guy \u003cwey-yi.w.guy@intel.com\u003e\nSigned-off-by: John W. Linville \u003clinville@tuxdriver.com\u003e\n" }, { "commit": "4254bc1c4d7b53ac10e558dfe015725fdd693da4", "tree": "51c95b3f0f24ff8e1fabf698524c9ddd9f069879", "parents": [ "20bd2a0952d01ba82a99b3f22d46e3832c255529" ], "author": { "name": "Felix Fietkau", "email": "nbd@openwrt.org", "time": "Sat Jul 31 00:12:01 2010 +0200" }, "committer": { "name": "John W. Linville", "email": "linville@tuxdriver.com", "time": "Wed Aug 04 15:27:37 2010 -0400" }, "message": "ath9k_hw: fix a noise floor calibration related race condition\n\nOn AR5008-AR9002, other forms of calibration must not be started while\nthe noise floor calibration is running, as this can create invalid\nreadings which were sometimes not even recoverable by any further\ncalibration attempts.\n\nThis patch also ensures that the result of noise floor measurements\nare processed faster and also allows the result of the initial\ncalibration on reset to make it into the NF history buffer\n\nSigned-off-by: Felix Fietkau \u003cnbd@openwrt.org\u003e\nSigned-off-by: John W. Linville \u003clinville@tuxdriver.com\u003e\n" }, { "commit": "20bd2a0952d01ba82a99b3f22d46e3832c255529", "tree": "d875681269e087e6a148593bb1d436849e642b7f", "parents": [ "5ee0865615f65f84e6ee9174771a6716c29e08e1" ], "author": { "name": "Felix Fietkau", "email": "nbd@openwrt.org", "time": "Sat Jul 31 00:12:00 2010 +0200" }, "committer": { "name": "John W. Linville", "email": "linville@tuxdriver.com", "time": "Wed Aug 04 15:27:37 2010 -0400" }, "message": "ath9k_hw: clean up per-channel calibration data\n\nThe noise floor history buffer is currently not kept per channel, which\ncan lead to problems when changing channels from a clean channel to a\nnoisy one. Also when switching from HT20 to HT40, the noise floor\nhistory buffer is full of measurements, but none of them contain data\nfor the extension channel, which it needs quite a bit of time to recover\nfrom.\n\nThis patch puts all the per-channel calibration data into a single data\nstructure, and gives the the driver control over whether that is used\nper-channel or even not used for some channels.\n\nFor ath9k_htc, I decided to keep this per-channel in order to avoid\ncreating regressions.\n\nFor ath9k, the data is kept only for the operating channel, which saves\nsome space. ath9k_hw takes care of wiping old data when the operating\nchannel or its channel flags change.\n\nSigned-off-by: Felix Fietkau \u003cnbd@openwrt.org\u003e\nSigned-off-by: John W. Linville \u003clinville@tuxdriver.com\u003e\n" }, { "commit": "5ee0865615f65f84e6ee9174771a6716c29e08e1", "tree": "8afd490ee1b69dc1399500971428c92db680c42f", "parents": [ "b2ccc507b70be2815a25e3c5dc23c636e128222c" ], "author": { "name": "Felix Fietkau", "email": "nbd@openwrt.org", "time": "Sat Jul 31 00:11:59 2010 +0200" }, "committer": { "name": "John W. Linville", "email": "linville@tuxdriver.com", "time": "Wed Aug 04 15:27:37 2010 -0400" }, "message": "ath9k: prevent calibration during off-channel activity\n\nPreviously the software scan callback was used to indicate to the hardware,\nwhen it was safe to calibrate. This didn\u0027t really work properly, because it\ndepends on a specific order of software scan callbacks vs. channel changes.\nAlso, software scans are not the only thing that triggers off-channel\nactivity, so it\u0027s better to use the newly added indication from mac80211 for\nthis and not use the software scan callback for anything calibration related.\n\nThis fixes at least some of the invalid noise floor readings that I\u0027ve seen\nin AP mode on AR9160\n\nSigned-off-by: Felix Fietkau \u003cnbd@openwrt.org\u003e\nSigned-off-by: John W. Linville \u003clinville@tuxdriver.com\u003e\n" }, { "commit": "b2ccc507b70be2815a25e3c5dc23c636e128222c", "tree": "c69297a3009c5576716f735d73b86c4f645b0339", "parents": [ "ddfef79257648e165ac49e6088d459819a02a882" ], "author": { "name": "Felix Fietkau", "email": "nbd@openwrt.org", "time": "Fri Jul 30 21:02:12 2010 +0200" }, "committer": { "name": "John W. Linville", "email": "linville@tuxdriver.com", "time": "Wed Aug 04 15:27:37 2010 -0400" }, "message": "ath9k_hw: fix analog shift register writes on AR9003\n\nWrites to the analog shift registers, which are issues by the initval\nprogramming function, require a 100 usec delay (similar to AR9002,\nbut in a different register range).\n\nSigned-off-by: Felix Fietkau \u003cnbd@openwrt.org\u003e\nAcked-by: Luis R. Rodriguez \u003clrodriguez@atheros.com\u003e\nSigned-off-by: John W. Linville \u003clinville@tuxdriver.com\u003e\n" }, { "commit": "ddfef79257648e165ac49e6088d459819a02a882", "tree": "790266af15b6d03e419f5defda7a6b0b4b8e2967", "parents": [ "9369746050e838c57e357f0caa552386ad65a82d" ], "author": { "name": "Felix Fietkau", "email": "nbd@openwrt.org", "time": "Fri Jul 30 21:02:11 2010 +0200" }, "committer": { "name": "John W. Linville", "email": "linville@tuxdriver.com", "time": "Wed Aug 04 15:27:36 2010 -0400" }, "message": "ath9k: fix a crash in the PA predistortion apply function\n\nWhen updating the PAPRD table in hardware, PAPRD itself needs to be\ndisabled first, otherwise the hardware can throw a data bus error,\nwhich upsets at least some platforms.\n\nSigned-off-by: Felix Fietkau \u003cnbd@openwrt.org\u003e\nAcked-by: Luis R. Rodriguez \u003clrodriguez@atheros.com\u003e\nSigned-off-by: John W. Linville \u003clinville@tuxdriver.com\u003e\n" }, { "commit": "9369746050e838c57e357f0caa552386ad65a82d", "tree": "adc9cf40f40f6d08490be81dd4343d667af59a56", "parents": [ "00c86590e36bd42574821b43b5124d75f30df9dd" ], "author": { "name": "Felix Fietkau", "email": "nbd@openwrt.org", "time": "Fri Jul 30 21:02:10 2010 +0200" }, "committer": { "name": "John W. Linville", "email": "linville@tuxdriver.com", "time": "Wed Aug 04 15:27:36 2010 -0400" }, "message": "ath9k_hw: fix periodic noise floor calibration on AR9003\n\nThe periodic noise floor calibration is broken on this chip family, because\nit keeps triggering a software-filtered noise floor calibration, but never\nreads the result before uploading the history buffer value to the hardware.\n\nFix this with a call to ath9k_hw_getnf(), just like on AR9002.\n\nSigned-off-by: Felix Fietkau \u003cnbd@openwrt.org\u003e\nAcked-by: Luis R. Rodriguez \u003clrodriguez@atheros.com\u003e\nSigned-off-by: John W. Linville \u003clinville@tuxdriver.com\u003e\n" }, { "commit": "00c86590e36bd42574821b43b5124d75f30df9dd", "tree": "ddf43562d2f1a26237c32764c46630a07c7d9dd5", "parents": [ "1601b1e56e1093d6deb8f475fafc30cc30143357" ], "author": { "name": "Felix Fietkau", "email": "nbd@openwrt.org", "time": "Fri Jul 30 21:02:09 2010 +0200" }, "committer": { "name": "John W. Linville", "email": "linville@tuxdriver.com", "time": "Wed Aug 04 15:27:36 2010 -0400" }, "message": "ath9k_hw: clean up and fix initial noise floor calibration\n\nOn AR9003 the initial noise floor calibration is currently triggered\nat the end of the reset without allowing the hardware to update the\nbaseband settings. This could potentially make scans in noisy\nenvironments a bit more unreliable, so use the same calibration\nsequence that is used on AR9002.\n\nSigned-off-by: Felix Fietkau \u003cnbd@openwrt.org\u003e\nAcked-by: Luis R. Rodriguez \u003clrodriguez@atheros.com\u003e\nSigned-off-by: John W. Linville \u003clinville@tuxdriver.com\u003e\n" }, { "commit": "02f5ba5bac8b374bc2126920c7204c63019f28ce", "tree": "47f498455ce5b765ca7253dc3e78b60cd47de394", "parents": [ "3ff1c25927e3af61c6bf0e4ed959504058ae4565" ], "author": { "name": "Johannes Berg", "email": "johannes.berg@intel.com", "time": "Fri Jul 30 13:30:46 2010 +0200" }, "committer": { "name": "John W. Linville", "email": "linville@tuxdriver.com", "time": "Wed Aug 04 15:27:36 2010 -0400" }, "message": "iwlwifi: fix possible recursive locking deadlock\n\ncommit f84b29ec0a1ab767679d3f2428877b65f94bc3ff\nAuthor: Johannes Berg \u003cjohannes.berg@intel.com\u003e\nDate: Tue May 18 02:29:13 2010 -0700\n\n iwlwifi: queue user-initiated scan when doing internal scan\n\nintroduced a potential deadlock because it calls\nieee80211_scan_completed() with the priv-\u003emutex\nheld, but mac80211 may call back into iwlwifi\nwhich would lead to recursive locking. Move this\nout from under the mutex.\n\nCc: stable@kernel.org\nSigned-off-by: Johannes Berg \u003cjohannes.berg@intel.com\u003e\nSigned-off-by: John W. Linville \u003clinville@tuxdriver.com\u003e\n" }, { "commit": "6ba74014c1ab0e37af7de6f64b4eccbbae3cb9e7", "tree": "8f3892fc44f1e403675a6d7e88fda5c70e56ee4c", "parents": [ "5abd9ccced7a726c817dd6b5b96bc933859138d1", "3ff1c25927e3af61c6bf0e4ed959504058ae4565" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Wed Aug 04 11:47:58 2010 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Wed Aug 04 11:47:58 2010 -0700" }, "message": "Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-next-2.6\n\n* git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-next-2.6: (1443 commits)\n phy/marvell: add 88ec048 support\n igb: Program MDICNFG register prior to PHY init\n e1000e: correct MAC-PHY interconnect register offset for 82579\n hso: Add new product ID\n can: Add driver for esd CAN-USB/2 device\n l2tp: fix export of header file for userspace\n can-raw: Fix skb_orphan_try handling\n Revert \"net: remove zap_completion_queue\"\n net: cleanup inclusion\n phy/marvell: add 88e1121 interface mode support\n u32: negative offset fix\n net: Fix a typo from \"dev\" to \"ndev\"\n igb: Use irq_synchronize per vector when using MSI-X\n ixgbevf: fix null pointer dereference due to filter being set for VLAN 0\n e1000e: Fix irq_synchronize in MSI-X case\n e1000e: register pm_qos request on hardware activation\n ip_fragment: fix subtracting PPPOE_SES_HLEN from mtu twice\n net: Add getsockopt support for TCP thin-streams\n cxgb4: update driver version\n cxgb4: add new PCI IDs\n ...\n\nManually fix up conflicts in:\n - drivers/net/e1000e/netdev.c: due to pm_qos registration\n infrastructure changes\n - drivers/net/phy/marvell.c: conflict between adding 88ec048 support\n and cleaning up the IDs\n - drivers/net/wireless/ipw2x00/ipw2100.c: trivial ipw2100_pm_qos_req\n conflict (registration change vs marking it static)\n" }, { "commit": "f46e9913faeebcb6bd29edf795f12b60acbff171", "tree": "1ed8871d0ebd638094d27317de1d8a53712ae15a", "parents": [ "8d91530c5fd7f0b1e8c4ddfea2905e55a178569b", "8d4b9d1bfef117862a2889dec4dac227068544c9" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Wed Aug 04 11:14:36 2010 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Wed Aug 04 11:14:36 2010 -0700" }, "message": "Merge branch \u0027for-linus\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/rafael/suspend-2.6\n\n* \u0027for-linus\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/rafael/suspend-2.6:\n PM / Runtime: Add runtime PM statistics (v3)\n PM / Runtime: Make runtime_status attribute not debug-only (v. 2)\n PM: Do not use dynamically allocated objects in pm_wakeup_event()\n PM / Suspend: Fix ordering of calls in suspend error paths\n PM / Hibernate: Fix snapshot error code path\n PM / Hibernate: Fix hibernation_platform_enter()\n pm_qos: Get rid of the allocation in pm_qos_add_request()\n pm_qos: Reimplement using plists\n plist: Add plist_last\n PM: Make it possible to avoid races between wakeup and system sleep\n PNPACPI: Add support for remote wakeup\n PM: describe kernel policy regarding wakeup defaults (v. 2)\n PM / Hibernate: Fix typos in comments in kernel/power/swap.c\n" }, { "commit": "d790d4d583aeaed9fc6f8a9f4d9f8ce6b1c15c7f", "tree": "854ab394486288d40fa8179cbfaf66e8bdc44b0f", "parents": [ "73b2c7165b76b20eb1290e7efebc33cfd21db1ca", "3a09b1be53d23df780a0cd0e4087a05e2ca4a00c" ], "author": { "name": "Jiri Kosina", "email": "jkosina@suse.cz", "time": "Wed Aug 04 15:14:38 2010 +0200" }, "committer": { "name": "Jiri Kosina", "email": "jkosina@suse.cz", "time": "Wed Aug 04 15:14:38 2010 +0200" }, "message": "Merge branch \u0027master\u0027 into for-next\n" }, { "commit": "17964e9d086cd4cb15b54a71ccddd8bbacb4c00c", "tree": "eb7a7a50543c327fc5cf677e700bd8fa6f6f84a2", "parents": [ "c2e07b3a9ced33dd92597201be3931be8ea57ed6" ], "author": { "name": "Justin P. Mattock", "email": "justinmattock@gmail.com", "time": "Mon Aug 02 13:50:43 2010 -0700" }, "committer": { "name": "Jiri Kosina", "email": "jkosina@suse.cz", "time": "Wed Aug 04 15:06:54 2010 +0200" }, "message": "hostap:hostap_hw.c Fix typo in comment\n\nThe patch below fixes a typo in a comment.\n\nSigned-off-by: Justin P. Mattock \u003cjustinmattock@gmail.com\u003e\nSigned-off-by: Jiri Kosina \u003cjkosina@suse.cz\u003e\n" }, { "commit": "c2e07b3a9ced33dd92597201be3931be8ea57ed6", "tree": "636de2e08a4ebbe7136d9ae16625f0297562ece9", "parents": [ "f4d01439515acd5d9a09de1d1e02ca40403dda49" ], "author": { "name": "Stefan Weil", "email": "weil@mail.berlios.de", "time": "Tue Aug 03 19:44:52 2010 +0200" }, "committer": { "name": "Jiri Kosina", "email": "jkosina@suse.cz", "time": "Wed Aug 04 15:05:43 2010 +0200" }, "message": "Fix spelling contorller -\u003e controller in comments\n\nCc: Jiri Kosina \u003ctrivial@kernel.org\u003e\nCc: linux-kernel@vger.kernel.org\nSigned-off-by: Stefan Weil \u003cweil@mail.berlios.de\u003e\nSigned-off-by: Jiri Kosina \u003cjkosina@suse.cz\u003e\n" }, { "commit": "8a2b6beffc88b83089845d72eed2ed74eb5c9b1e", "tree": "502780ddd8d8013b035ca83bcaec6b2e4032edd9", "parents": [ "6e86ccad15c01e2239da9a76cfbfbf41bbe332ba" ], "author": { "name": "Kuninori Morimoto", "email": "kuninori.morimoto.gx@renesas.com", "time": "Tue Jun 08 06:25:17 2010 +0000" }, "committer": { "name": "Paul Mundt", "email": "lethal@linux-sh.org", "time": "Wed Aug 04 15:51:35 2010 +0900" }, "message": "net/irda/sh_irda: Modify clk_get lookups\n\nSigned-off-by: Kuninori Morimoto \u003ckuninori.morimoto.gx@renesas.com\u003e\nSigned-off-by: Paul Mundt \u003clethal@linux-sh.org\u003e\n" }, { "commit": "3ff1c25927e3af61c6bf0e4ed959504058ae4565", "tree": "67b0f116b1dff0dde7533c422ab2f2badd3a10a3", "parents": [ "99870a73d406e5bd235bc8e5aca6893a68184881" ], "author": { "name": "Cyril Chemparathy", "email": "cyril@ti.com", "time": "Tue Aug 03 19:36:06 2010 -0700" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Tue Aug 03 19:36:06 2010 -0700" }, "message": "phy/marvell: add 88ec048 support\n\nMarvell 88ec048 is a derivative of its 88e1121r device. From the programmer\u0027s\nperspective, the one major difference is the addition of an additional control\nbit in Page 2 Register 16 - used to control the padding of odd nibble\npreambles.\n\nThis patch adds support for this new device, while inheriting as much code as\npossible from the existing 88e1121r implementation.\n\nSigned-off-by: Cyril Chemparathy \u003ccyril@ti.com\u003e\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "412a4ac5e9cf7fdeb6af562c25547a9b9da7674f", "tree": "a8ce13cbc9c47c99799e5e3e3ad26ba78274ee73", "parents": [ "e8e5c2155b0035b6e04f29be67f6444bc914005b", "0c2daaafcdec726e89cbccca61d576de8429c537" ], "author": { "name": "Benjamin Herrenschmidt", "email": "benh@kernel.crashing.org", "time": "Wed Aug 04 10:26:03 2010 +1000" }, "committer": { "name": "Benjamin Herrenschmidt", "email": "benh@kernel.crashing.org", "time": "Wed Aug 04 10:26:03 2010 +1000" }, "message": "Merge commit \u0027gcl/next\u0027 into next\n" } ], "next": "99870a73d406e5bd235bc8e5aca6893a68184881" }