)]}' { "log": [ { "commit": "ae6e86b7fb15520ac64513ad643de63e0b077aa5", "tree": "6de775cb23016792e18428f0266b0e5b662f02a3", "parents": [ "2331038a96ecdad76c50ab223fd48d656d8a1184" ], "author": { "name": "Richard Cochran", "email": "richardcochran@gmail.com", "time": "Tue Jun 14 23:55:20 2011 +0000" }, "committer": { "name": "David S. Miller", "email": "davem@conan.davemloft.net", "time": "Thu Jun 16 23:48:12 2011 -0400" }, "message": "dp83640: drop PHY status frames in the driver.\n\nThe dp83640 PHY provides time stamp and other information via special\nPHY status frames. Previously, the driver decoded the frames and then\nlet the network stack drop them. This works fine when the PTP messages\ncome over UDP.\n\nHowever, when receiving PTP messages via L2 packets, this creates a\nproblem. The status frames use the official PTP destination MAC address,\nand so they are delivered to user space along with the \"real\" frames,\ncausing confusion for applications.\n\nThis commit fixes the issue by simply dropping the PHY status frames\nin the driver.\n\nSigned-off-by: Richard Cochran \u003crichard.cochran@omicron.at\u003e\nSigned-off-by: David S. Miller \u003cdavem@conan.davemloft.net\u003e\n" }, { "commit": "2331038a96ecdad76c50ab223fd48d656d8a1184", "tree": "43f58b2082b28e5ff56fbfb94fb6eee5db63fccf", "parents": [ "f1dc045e685ea5424b3445c1ccaa0a25b3d661ec" ], "author": { "name": "Richard Cochran", "email": "richardcochran@gmail.com", "time": "Tue Jun 14 23:55:19 2011 +0000" }, "committer": { "name": "David S. Miller", "email": "davem@conan.davemloft.net", "time": "Thu Jun 16 23:48:12 2011 -0400" }, "message": "dp83640: fix phy status frame event parsing\n\nIf two eternal time stamp events occur at nearly the same time, the\nphyter will add an extra word into the status frame. This commit fixes\nthe parsing code to recognize and skip over the extra word.\n\nSigned-off-by: Richard Cochran \u003crichard.cochran@omicron.at\u003e\nSigned-off-by: David S. Miller \u003cdavem@conan.davemloft.net\u003e\n" }, { "commit": "f1dc045e685ea5424b3445c1ccaa0a25b3d661ec", "tree": "93227e223149aa646784e28d6145171ed6588c98", "parents": [ "e6539e2b7aee117619153daaf61566dba1e04205" ], "author": { "name": "Ralf Baechle", "email": "ralf@linux-mips.org", "time": "Tue Jun 14 22:07:58 2011 +0000" }, "committer": { "name": "David S. Miller", "email": "davem@conan.davemloft.net", "time": "Thu Jun 16 23:45:01 2011 -0400" }, "message": "phylib: Allow BCM63XX PHY to be selected only on BCM63XX.\n\nThis PHY is available integrated into BCM63xx series SOCs only.\n\nSigned-off-by: Ralf Baechle \u003cralf@linux-mips.org\u003e\n\n drivers/net/phy/Kconfig | 1 +\n 1 files changed, 1 insertions(+), 0 deletions(-)\nAcked-by: Florian Fainelli \u003cffainelli@freebox.fr\u003e\nSigned-off-by: David S. Miller \u003cdavem@conan.davemloft.net\u003e\n" }, { "commit": "86ff9baadf16c8a1b452d72f5585be63457d9b15", "tree": "24e79b267dba9b906323614e30af12838e9525a2", "parents": [ "cb646e2b02b27a33a1d1eabd016749606254071c" ], "author": { "name": "John Stultz", "email": "john.stultz@linaro.org", "time": "Mon May 23 13:32:11 2011 -0700" }, "committer": { "name": "John Stultz", "email": "john.stultz@linaro.org", "time": "Mon May 23 13:32:11 2011 -0700" }, "message": "ptp: Fix dp83640 build warning when building statically\n\nIf the dp83640 driver is not built as a module, the\nMODULE_DEVICE_TABLE reference to dp83640_tbl nops out.\n\nSince the table isn\u0027t referenced elsewhere, it it causes\nthe following warning:\ndrivers/net/phy/dp83640.c:1095: warning: ‘dp83640_tbl’ defined but not used\n\nThis apparently is common with mdio_device_id table structures,\nand is avoided by using __maybe_unused annotation.\n\nSigned-off-by: John Stultz \u003cjohn.stultz@linaro.org\u003e\n" }, { "commit": "cb646e2b02b27a33a1d1eabd016749606254071c", "tree": "28961fc0c9c26ef2d7b8c3e3e5ecc471f31b3d48", "parents": [ "32bd93e8f924c23b8cc2e2a12fef0d8cc9cda0c5" ], "author": { "name": "Richard Cochran", "email": "richardcochran@gmail.com", "time": "Fri Apr 22 12:04:55 2011 +0200" }, "committer": { "name": "John Stultz", "email": "john.stultz@linaro.org", "time": "Mon May 23 13:10:23 2011 -0700" }, "message": "ptp: Added a clock driver for the National Semiconductor PHYTER.\n\nThis patch adds support for the PTP clock found on the DP83640.\nThe basic clock operations and one external time stamp have\nbeen implemented.\n\nSigned-off-by: Richard Cochran \u003crichard.cochran@omicron.at\u003e\nSigned-off-by: John Stultz \u003cjohn.stultz@linaro.org\u003e\n" }, { "commit": "707394972093e2056e1e8cc39be19cf9bcb3e7b3", "tree": "f6dc95219bca6895adf304b79241e9d60561f8f5", "parents": [ "25db0338813a8915457636b1f6abe6a28fa73f8d" ], "author": { "name": "David Decotigny", "email": "decot@google.com", "time": "Wed Apr 27 18:32:40 2011 +0000" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Fri Apr 29 14:03:01 2011 -0700" }, "message": "ethtool: cosmetic: Use ethtool ethtool_cmd_speed API\n\nThis updates the network drivers so that they don\u0027t access the\nethtool_cmd::speed field directly, but use ethtool_cmd_speed()\ninstead.\n\nFor most of the drivers, these changes are purely cosmetic and don\u0027t\nfix any problem, such as for those 1GbE/10GbE drivers that indirectly\ncall their own ethtool get_settings()/mii_ethtool_gset(). The changes\nare meant to enforce code consistency and provide robustness with\nfuture larger throughputs, at the expense of a few CPU cycles for each\nethtool operation.\n\nAll drivers compiled with make allyesconfig ion x86_64 have been\nupdated.\n\nTested: make allyesconfig on x86_64 + e1000e/bnx2x work\nSigned-off-by: David Decotigny \u003cdecot@google.com\u003e\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "25db0338813a8915457636b1f6abe6a28fa73f8d", "tree": "29ea39e45de1342beb4e3c58da0cfbc9915b617e", "parents": [ "8ae6daca85c8bbd6a32c382db5e2a2a989f8bed2" ], "author": { "name": "David Decotigny", "email": "decot@google.com", "time": "Wed Apr 27 18:32:39 2011 +0000" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Fri Apr 29 14:03:00 2011 -0700" }, "message": "ethtool: Use full 32 bit speed range in ethtool\u0027s set_settings\n\nThis makes sure the ethtool\u0027s set_settings() callback of network\ndrivers don\u0027t ignore the 16 most significant bits when ethtool calls\ntheir set_settings().\n\nAll drivers compiled with make allyesconfig on x86_64 have been\nupdated.\n\nSigned-off-by: David Decotigny \u003cdecot@google.com\u003e\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "42933bac11e811f02200c944d8562a15f8ec4ff0", "tree": "fcdd9afe56eb0e746565ddd1f92f22d36678b843", "parents": [ "2b9accbee563f535046ff2cd382d0acaa92e130c", "25985edcedea6396277003854657b5f3cb31a628" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Thu Apr 07 11:14:49 2011 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Thu Apr 07 11:14:49 2011 -0700" }, "message": "Merge branch \u0027for-linus2\u0027 of git://git.profusion.mobi/users/lucas/linux-2.6\n\n* \u0027for-linus2\u0027 of git://git.profusion.mobi/users/lucas/linux-2.6:\n Fix common misspellings\n" }, { "commit": "25985edcedea6396277003854657b5f3cb31a628", "tree": "f026e810210a2ee7290caeb737c23cb6472b7c38", "parents": [ "6aba74f2791287ec407e0f92487a725a25908067" ], "author": { "name": "Lucas De Marchi", "email": "lucas.demarchi@profusion.mobi", "time": "Wed Mar 30 22:57:33 2011 -0300" }, "committer": { "name": "Lucas De Marchi", "email": "lucas.demarchi@profusion.mobi", "time": "Thu Mar 31 11:26:23 2011 -0300" }, "message": "Fix common misspellings\n\nFixes generated by \u0027codespell\u0027 and manually reviewed.\n\nSigned-off-by: Lucas De Marchi \u003clucas.demarchi@profusion.mobi\u003e\n" }, { "commit": "d005a09edf8b12dd1bec651b2cf94caa0e7bb1be", "tree": "7be85d432af96505426104e2a4e47d85ceebe73b", "parents": [ "ff9a57a62afbbe2d0f3a09af321f1fd7645f38a5" ], "author": { "name": "Marc Kleine-Budde", "email": "mkl@pengutronix.de", "time": "Mon Mar 28 14:54:08 2011 +0000" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Wed Mar 30 02:31:36 2011 -0700" }, "message": "phylib: phy_attach_direct: phy_init_hw can fail, add cleanup\n\nThe function phy_attach_direct attaches the phy and calls phy_init_hw.\nphy_init_hw can fail, but the phy is still marked as attached. Successive\ncalls to phy_attach_direct will fail because the phy is busy.\n\n[ 1.020000] eth0: Freescale FEC PHY driver [Generic PHY] (mii_bus:phy_addr\u003d1:00, irq\u003d-1)\n[ 1.030000] eth1: Freescale FEC PHY driver [Generic PHY] (mii_bus:phy_addr\u003d1:01, irq\u003d-1)\n[ 2.050000] Sending DHCP requests .\n[ 3.020000] PHY: 1:00 - Link is Up - 100/Full\n[ 5.110000] ..... timed out!\n[ 87.660000] IP-Config: Reopening network devices...\n[ 88.190000] FEC: MDIO read timeout\n[ 88.190000] eth0: could not attach to PHY\n[ 88.190000] IP-Config: Failed to open eth0\n[ 88.210000] FEC: MDIO read timeout\n[ 88.210000] eth1: could not attach to PHY\n[ 88.210000] IP-Config: Failed to open eth1\n[ 88.220000] IP-Config: No network devices available.\n[ 88.220000] Freeing init memory: 6968K\n\n[...]\n\nstarting network interfaces...\nip: RTNETLINK answers: File exists\n[ 94.000000] net eth0: PHY already attached\n[ 94.010000] eth0: could not attach to PHY\nip: SIOCSIFFLAGS: Device or resource busy\n\nThis patch adds phy_detach to clean up if phy_init_hw fails.\n\nSigned-off-by: Marc Kleine-Budde \u003cmkl@pengutronix.de\u003e\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "4c5811bf463b0ef82fabbd1708f8bb2d753aeb18", "tree": "ff37d31217c3804ca05de21a55a9b5ca1ca818b2", "parents": [ "f74b9444192c60603020c61d7915b72893137edc", "9f15444fefdb33509132ff5c9be60cb315c44cb2" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Wed Mar 16 17:28:10 2011 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Wed Mar 16 17:28:10 2011 -0700" }, "message": "Merge branch \u0027devicetree/next\u0027 of git://git.secretlab.ca/git/linux-2.6\n\n* \u0027devicetree/next\u0027 of git://git.secretlab.ca/git/linux-2.6: (21 commits)\n tty: serial: altera_jtaguart: Add device tree support\n tty: serial: altera_uart: Add devicetree support\n dt: eliminate of_platform_driver shim code\n dt: Eliminate of_platform_{,un}register_driver\n dt/serial: Eliminate users of of_platform_{,un}register_driver\n dt/usb: Eliminate users of of_platform_{,un}register_driver\n dt/video: Eliminate users of of_platform_{,un}register_driver\n dt/net: Eliminate users of of_platform_{,un}register_driver\n dt/sound: Eliminate users of of_platform_{,un}register_driver\n dt/spi: Eliminate users of of_platform_{,un}register_driver\n dt: uartlite: merge platform and of_platform driver bindings\n dt: xilinx_hwicap: merge platform and of_platform driver bindings\n ipmi: convert OF driver to platform driver\n leds/leds-gpio: merge platform_driver with of_platform_driver\n dt/sparc: Eliminate users of of_platform_{,un}register_driver\n dt/powerpc: Eliminate users of of_platform_{,un}register_driver\n dt/powerpc: move of_bus_type infrastructure to ibmebus\n drivercore/dt: add a match table pointer to struct device\n dt: Typo fix.\n altera_ps2: Add devicetree support\n ...\n" }, { "commit": "af1dc13e607c1d1a909e21ee87aafbe7b9d4ae81", "tree": "f1651a8643c90b238b259c01dd91fa56fb9d632c", "parents": [ "dc187cb381f1bceb30498861ece510245c43ed9f" ], "author": { "name": "Peter Korsgaard", "email": "jacmet@sunsite.dk", "time": "Thu Mar 10 06:52:13 2011 +0000" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Mon Mar 14 15:02:14 2011 -0700" }, "message": "phylib: SIOCGMIIREG/SIOCSMIIREG: allow access to all mdio addresses\n\nphylib would silently ignore the phy_id argument to these ioctls and\nperform the read/write with the active phydev address, whereas most\nnon-phylib drivers seem to allow access to all mdio addresses\n(E.G. pcnet_cs).\n\nSigned-off-by: Peter Korsgaard \u003cjacmet@sunsite.dk\u003e\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "74888760d40b3ac9054f9c5fa07b566c0676ba2d", "tree": "ede65e8b5ad746ce6c04cbe77ceb5bbf6a6dc6fd", "parents": [ "f07eb223a081b278be02a58394cb5fd66f1a1bbd" ], "author": { "name": "Grant Likely", "email": "grant.likely@secretlab.ca", "time": "Tue Feb 22 21:05:51 2011 -0700" }, "committer": { "name": "Grant Likely", "email": "grant.likely@secretlab.ca", "time": "Mon Feb 28 13:22:44 2011 -0700" }, "message": "dt/net: Eliminate users of of_platform_{,un}register_driver\n\nGet rid of users of of_platform_driver in drivers/net. The\nof_platform_{,un}register_driver functions are going away, so the\nusers need to be converted to using the platform_bus_type directly.\n\nSigned-off-by: Grant Likely \u003cgrant.likely@secretlab.ca\u003e\n\n" }, { "commit": "d606ef3fe0c57504b8e534c58498f73a6abc049a", "tree": "00aa6e80fedbe8cd866fe19db8b077afd32db068", "parents": [ "68aa3fd551e9d54d98794852714dc1edbb21df77" ], "author": { "name": "Baruch Siach", "email": "baruch@tkos.co.il", "time": "Mon Feb 14 02:05:33 2011 +0000" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Mon Feb 14 17:38:30 2011 -0800" }, "message": "phy/micrel: add ability to support 50MHz RMII clock on KZS8051RNL\n\nPlatform code can now set the MICREL_PHY_50MHZ_CLK bit of dev_flags in a fixup\nroutine (registered with phy_register_fixup_for_uid()), to make the KZS8051RNL\nPHY work with 50MHz RMII reference clock.\n\nCc: David J. Choi \u003cdavid.choi@micrel.com\u003e\nSigned-off-by: Baruch Siach \u003cbaruch@tkos.co.il\u003e\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "d5e219c3a2389f31b18e4ca55c33a12adaadf565", "tree": "63d0461540a502ba17e93b6bbb33af25b6c83910", "parents": [ "57f89bfa21403d902ee176ef988136b75d9ab30b" ], "author": { "name": "hartleys", "email": "hartleys@visionengravers.com", "time": "Fri Feb 11 12:14:06 2011 +0000" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Fri Feb 11 22:01:08 2011 -0800" }, "message": "phy: Remove unneeded depends on PHYLIB\n\nRemove unneeded depends on PHYLIB. The config selection is already in\nan if PHYLIB / endif block.\n\nSigned-off-by: H Hartley Sweeten \u003chsweeten@visionengravers.com\u003e\nCc: \"David S. Miller\" \u003cdavem@davemloft.net\u003e\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "b4aa9e05a61b845541fa6f5b1d246976922601f0", "tree": "ca94478c3df281ab76a3399f5ba6341ade3f5791", "parents": [ "1dc0f3c54ce1df957f99c17b145488fd03eb1a59", "4b8fe66300acb2fba8b16d62606e0d30204022fc" ], "author": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Fri Dec 17 12:27:22 2010 -0800" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Fri Dec 17 12:27:22 2010 -0800" }, "message": "Merge branch \u0027master\u0027 of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6\n\nConflicts:\n\tdrivers/net/bnx2x/bnx2x.h\n\tdrivers/net/wireless/iwlwifi/iwl-1000.c\n\tdrivers/net/wireless/iwlwifi/iwl-6000.c\n\tdrivers/net/wireless/iwlwifi/iwl-core.h\n\tdrivers/vhost/vhost.c\n" }, { "commit": "377ecca9ba6d98f31517e2322075e94d1be94561", "tree": "f29578587457734c1579395740ee7034779d3b51", "parents": [ "d9ca676bcb26e1fdff9265a3e70f697cd381c889" ], "author": { "name": "Giuseppe CAVALLARO", "email": "peppe.cavallaro@st.com", "time": "Wed Dec 08 23:05:13 2010 +0000" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Fri Dec 10 15:48:43 2010 -0800" }, "message": "phy: add the IC+ IP1001 driver\n\nThis patch adds the IC+ IP1001 (Gigabit Ethernet Transceiver) driver.\nI\u0027ve had to add an additional delay (2ns) to adjust RX clock phase at\nGMII/ RGMII interface (according to the PHY data-sheet). This helps to\nhave the RGMII working on some ST platforms.\n\nSigned-off-by: Giuseppe Cavallaro \u003cpeppe.cavallaro@st.com\u003e\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "fe6c791570efe717946ea7b7dd50aec96b70d551", "tree": "1becb5e8aea7a9c9a7d78f987bd73b0a5d8ee434", "parents": [ "f8bf5681cf15f77692c8ad8cb95d059ff7c622c9", "f19872575ff7819a3723154657a497d9bca66b33" ], "author": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Wed Dec 08 13:15:38 2010 -0800" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Wed Dec 08 13:47:38 2010 -0800" }, "message": "Merge branch \u0027master\u0027 of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6\n\nConflicts:\n\tdrivers/net/wireless/ath/ath9k/ar9003_eeprom.c\n\tnet/llc/af_llc.c\n" }, { "commit": "a40c9f88b5e3da500ddab9440e5ddac170c12281", "tree": "e9c64e33f4bf65bd1e71fbd6845cebaf7b2c8524", "parents": [ "5a6f95e653adf52ee1ff09cd5e66c2640c65ff66" ], "author": { "name": "Uwe Kleine-König", "email": "u.kleine-koenig@pengutronix.de", "time": "Tue Nov 23 22:57:47 2010 +0000" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Sun Nov 28 10:47:17 2010 -0800" }, "message": "net: add some KERN_CONT markers to continuation lines\n\nCc: netdev@vger.kernel.org\nSigned-off-by: Uwe Kleine-König \u003cu.kleine-koenig@pengutronix.de\u003e\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "cf41a51db89850033efc11c18a5257de810b5417", "tree": "c6db1cf0b3bb293245dae7bf2930b4913b117eac", "parents": [ "90600732d8b2fbc422bc9c57bdc73513d909367f" ], "author": { "name": "David Daney", "email": "ddaney@caviumnetworks.com", "time": "Fri Nov 19 12:13:18 2010 +0000" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Mon Nov 22 08:34:23 2010 -0800" }, "message": "of/phylib: Use device tree properties to initialize Marvell PHYs.\n\nSome aspects of PHY initialization are board dependent, things like\nindicator LED connections and some clocking modes cannot be determined\nby probing. The dev_flags element of struct phy_device can be used to\ncontrol these things if an appropriate value can be passed from the\nEthernet driver. We run into problems however if the PHY connections\nare specified by the device tree. There is no way for the Ethernet\ndriver to know what flags it should pass.\n\nIf we are using the device tree, the struct phy_device will be\npopulated with the device tree node corresponding to the PHY, and we\ncan extract extra configuration information from there.\n\nThe next question is what should the format of that information be?\nIt is highly device specific, and the device tree representation\nshould not be tied to any arbitrary kernel defined constants. A\nstraight forward representation is just to specify the exact bits that\nshould be set using the \"marvell,reg-init\" property:\n\n phy5: ethernet-phy@5 {\n reg \u003d \u003c5\u003e;\n compatible \u003d \"marvell,88e1149r\";\n marvell,reg-init \u003d\n /* led[0]:1000, led[1]:100, led[2]:10, led[3]:tx */\n \u003c3 0x10 0 0x5777\u003e, /* Reg 3,16 \u003c- 0x5777 */\n /* mix %:0, led[0123]:drive low off hiZ */\n \u003c3 0x11 0 0x00aa\u003e, /* Reg 3,17 \u003c- 0x00aa */\n /* default blink periods. */\n \u003c3 0x12 0 0x4105\u003e, /* Reg 3,18 \u003c- 0x4105 */\n /* led[4]:rx, led[5]:dplx, led[45]:drive low off hiZ */\n \u003c3 0x13 0 0x0a60\u003e; /* Reg 3,19 \u003c- 0x0a60 */\n };\n\n phy6: ethernet-phy@6 {\n reg \u003d \u003c6\u003e;\n compatible \u003d \"marvell,88e1118\";\n marvell,reg-init \u003d\n /* Fix rx and tx clock transition timing */\n \u003c2 0x15 0xffcf 0\u003e, /* Reg 2,21 Clear bits 4, 5 */\n /* Adjust LED drive. */\n \u003c3 0x11 0 0x442a\u003e, /* Reg 3,17 \u003c- 0442a */\n /* irq, blink-activity, blink-link */\n \u003c3 0x10 0 0x0242\u003e; /* Reg 3,16 \u003c- 0x0242 */\n };\n\nThe Marvell PHYs have a page select register at register 22 (0x16), we\ncan specify any register by its page and register number. These are\nthe first and second word. The third word contains a mask to be ANDed\nwith the existing register value, and the fourth word is ORed with the\nresult to yield the new register value. The new marvell_of_reg_init\nfunction leaves the page select register unchanged, so a call to it\ncan be dropped into the .config_init functions without unduly\naffecting the state of the PHY.\n\nIf CONFIG_OF_MDIO is not set, there is no of_node, or no\n\"marvell,reg-init\" property, the PHY initialization is unchanged.\n\nSigned-off-by: David Daney \u003cddaney@caviumnetworks.com\u003e\nCc: Grant Likely \u003cgrant.likely@secretlab.ca\u003e\nCc: Cyril Chemparathy \u003ccyril@ti.com\u003e\nCc: David Daney \u003cddaney@caviumnetworks.com\u003e\nCc: Arnaud Patard \u003carnaud.patard@rtp-net.org\u003e\nCc: Benjamin Herrenschmidt \u003cbenh@kernel.crashing.org\u003e\nReviewed-by: Grant Likely \u003cgrant.likely@secretlab.ca\u003e\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "90600732d8b2fbc422bc9c57bdc73513d909367f", "tree": "f1c4e7aa32b5a50e64a618a4c0f5310ff26c762c", "parents": [ "27d916d680e7b324087a75d080f215e7c34a4e8f" ], "author": { "name": "David Daney", "email": "ddaney@caviumnetworks.com", "time": "Fri Nov 19 11:58:53 2010 +0000" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Mon Nov 22 08:34:23 2010 -0800" }, "message": "phylib: Add support for Marvell 88E1149R devices.\n\nThe 88E1149R is 10/100/1000 quad-gigabit Ethernet PHY. The\n.config_aneg function can be shared with 88E1118, but it needs its own\n.config_init.\n\nSigned-off-by: David Daney \u003cddaney@caviumnetworks.com\u003e\nCc: Cyril Chemparathy \u003ccyril@ti.com\u003e\nCc: Arnaud Patard \u003carnaud.patard@rtp-net.org\u003e\nCc: Benjamin Herrenschmidt \u003cbenh@kernel.crashing.org\u003e\nCc: Wolfram Sang \u003cw.sang@pengutronix.de\u003e\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "27d916d680e7b324087a75d080f215e7c34a4e8f", "tree": "fd8d18ea66aff66afd600f83bb3d2217002d2b32", "parents": [ "84cf7029b63ca3eef823438a29ceb5ba139b883a" ], "author": { "name": "David Daney", "email": "ddaney@caviumnetworks.com", "time": "Fri Nov 19 11:58:52 2010 +0000" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Mon Nov 22 08:34:22 2010 -0800" }, "message": "phylib: Use common page register definition for Marvell PHYs.\n\nThe definition of the Marvell PHY page register is not specific to\n88E1121, so rename the macro to MII_MARVELL_PHY_PAGE, and use it\nthroughout.\n\nSuggested-by: Cyril Chemparathy \u003ccyril@ti.com\u003e\nSigned-off-by: David Daney \u003cddaney@caviumnetworks.com\u003e\nCc: Cyril Chemparathy \u003ccyril@ti.com\u003e\nCc: Arnaud Patard \u003carnaud.patard@rtp-net.org\u003e\nCc: Benjamin Herrenschmidt \u003cbenh@kernel.crashing.org\u003e\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "337ac9d5218cc19f40fca13fa4deb3c658c4241b", "tree": "0a63c0bb554c7cceec778d22f11ca5e1efb39c7a", "parents": [ "a4765fa7bfb92d5b9de19a503674b6624f95a7ae" ], "author": { "name": "Cyril Chemparathy", "email": "cyril@ti.com", "time": "Fri Oct 29 13:50:25 2010 -0700" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Fri Oct 29 13:50:25 2010 -0700" }, "message": "phy/marvell: rename 88ec048 to 88e1318s and fix mscr1 addr\n\nThe marvell 88ec048\u0027s official part number is 88e1318s. This patch renames\ndefinitions in the driver to reflect this.\n\nIn addition, a minor bug fix has been added to write back the MSCR1 register\nvalue properly.\n\nSigned-off-by: Cyril Chemparathy \u003ccyril@ti.com\u003e\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "89ff05ec553f3e70b8773c501da01bf7ad952cab", "tree": "d0c32c8095015aa92b047d27460d24cfcfd34421", "parents": [ "ff2d8d6c1921242cd119395173ef46e2629bcdb2" ], "author": { "name": "stephen hemminger", "email": "shemminger@vyatta.com", "time": "Thu Oct 21 08:37:41 2010 +0000" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Sun Oct 24 15:07:11 2010 -0700" }, "message": "phylib: make local function static\n\nThe following functions are not used directly by any drivers:\n phy_attach_direct\n phy_device_create\n phy_prepare_link\n genphy_config_advert\n genphy_setup_forced\n phy_config_interrupt\n phy_clear_interrypt\n phy_sanitize_settings\n phy_enable_interrupts\n phy_disable_interrupts\n\nSigned-off-by: Stephen Hemminger \u003cshemminger@vyatta.com\u003e\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "be8c648051048bc66fbca590d00f3e8543ec32af", "tree": "4b57610d1e849d0011decb98cf6d39c525bd4475", "parents": [ "27ab76065c0c6734ea98ccc7080046a72d98455b" ], "author": { "name": "Arnaud Patard", "email": "arnaud.patard@rtp-net.org", "time": "Thu Oct 21 03:59:57 2010 -0700" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Thu Oct 21 03:59:57 2010 -0700" }, "message": "phy/marvell: fix 88e1121 support\n\nCommit c477d0447db08068a497e7beb892b2b2a7bff64b added support for RGMII\nrx/tx delays except that it ends up clearing rx/tx delays bit for modes\ndifferents that RGMII*ID. Due to this, ethernet is not working anymore\non my guruplug server +. This patch is fixing that.\n\nSigned-off-by: Arnaud Patard \u003carnaud.patard@rtp-net.org\u003e\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "10ff4c682972bf714c03ea71e169472cdc329a1e", "tree": "1e1017a6d5eaa3eb34a0610a44380a1186edae11", "parents": [ "cf93c94581bab447a5634c6d737c1cf38c080261" ], "author": { "name": "Uwe Kleine-König", "email": "u.kleine-koenig@pengutronix.de", "time": "Sun Oct 03 23:43:33 2010 +0000" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Tue Oct 05 00:34:30 2010 -0700" }, "message": "don\u0027t let BCM63XX_PHY depend on non-existant symbol\n\nThe kernel doesn\u0027t have a symbol called BCM63XX. There is a symbol\nBCM63XX_ENET (introduced in 9b1fc55a0500, 6 weeks after 09bb9aa0ed that\nintroduced BCM63XX_PHY), but the driver compiles without that, too.\n\nCc: Maxime Bizon \u003cmbizon@freebox.fr\u003e\nCc: Florian Fainelli \u003cflorian@openwrt.org\u003e\nCc: David S. Miller \u003cdavem@davemloft.net\u003e\nCc: Ralf Baechle \u003cralf@linux-mips.org\u003e\nSigned-off-by: Uwe Kleine-König \u003cu.kleine-koenig@pengutronix.de\u003e\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "cf93c94581bab447a5634c6d737c1cf38c080261", "tree": "71fc11564683485173025eaac74513d163ade236", "parents": [ "29fa060eab3f524d338566d34c1d9e704579ae5e" ], "author": { "name": "Uwe Kleine-König", "email": "u.kleine-koenig@pengutronix.de", "time": "Sun Oct 03 23:43:32 2010 +0000" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Tue Oct 05 00:34:29 2010 -0700" }, "message": "net/phy: fix many \"defined but unused\" warnings\n\nMODULE_DEVICE_TABLE only expands to something if it\u0027s compiled\nfor a module. So when building-in support for the phys, the\nmdio_device_id tables are unused. Marking them with __maybe_unused\nfixes the following warnings:\n\n\tdrivers/net/phy/bcm63xx.c:134: warning: \u0027bcm63xx_tbl\u0027 defined but not used\n\tdrivers/net/phy/broadcom.c:933: warning: \u0027broadcom_tbl\u0027 defined but not used\n\tdrivers/net/phy/cicada.c:162: warning: \u0027cicada_tbl\u0027 defined but not used\n\tdrivers/net/phy/davicom.c:222: warning: \u0027davicom_tbl\u0027 defined but not used\n\tdrivers/net/phy/et1011c.c:114: warning: \u0027et1011c_tbl\u0027 defined but not used\n\tdrivers/net/phy/icplus.c:137: warning: \u0027icplus_tbl\u0027 defined but not used\n\tdrivers/net/phy/lxt.c:226: warning: \u0027lxt_tbl\u0027 defined but not used\n\tdrivers/net/phy/marvell.c:724: warning: \u0027marvell_tbl\u0027 defined but not used\n\tdrivers/net/phy/micrel.c:234: warning: \u0027micrel_tbl\u0027 defined but not used\n\tdrivers/net/phy/national.c:154: warning: \u0027ns_tbl\u0027 defined but not used\n\tdrivers/net/phy/qsemi.c:141: warning: \u0027qs6612_tbl\u0027 defined but not used\n\tdrivers/net/phy/realtek.c:82: warning: \u0027realtek_tbl\u0027 defined but not used\n\tdrivers/net/phy/smsc.c:257: warning: \u0027smsc_tbl\u0027 defined but not used\n\tdrivers/net/phy/ste10Xp.c:135: warning: \u0027ste10Xp_tbl\u0027 defined but not used\n\tdrivers/net/phy/vitesse.c:195: warning: \u0027vitesse_tbl\u0027 defined but not used\n\nSigned-off-by: Uwe Kleine-König \u003cu.kleine-koenig@pengutronix.de\u003e\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "fddd91016d16277a32727ad272cf2edd3d309c90", "tree": "de26d726a987469aabe804d4b32733c559b9291c", "parents": [ "ef885afbf8a37689afc1d9d545e2f3e7a8276c17" ], "author": { "name": "Simon Guinot", "email": "sguinot@lacie.com", "time": "Mon Sep 13 22:12:01 2010 +0000" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Tue Sep 14 14:31:03 2010 -0700" }, "message": "phylib: fix PAL state machine restart on resume\n\nOn resume, before starting the PAL state machine, check if the\nadjust_link() method is well supplied. If not, this would lead to a\nNULL pointer dereference in the phy_state_machine() function.\n\nThis scenario can happen if the Ethernet driver call manually the PHY\nfunctions instead of using the PAL state machine. The mv643xx_eth driver\nis a such example.\n\nSigned-off-by: Simon Guinot \u003csguinot@lacie.com\u003e\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "29cfcddc0e745b515ec360ffe2ee4e7a4015efd8", "tree": "1682b6caaf84d4863e65b2e4e387afa6a972146f", "parents": [ "303fd2c2ce5addef1aacac962a5b099cc0af71ea", "c34186ed008229e7f7e3f1de8e6acf6374995358" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Sat Aug 28 15:42:44 2010 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Sat Aug 28 15:42:44 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:\n net/ipv4: Eliminate kstrdup memory leak\n net/caif/cfrfml.c: use asm/unaligned.h\n ax25: missplaced sock_put(sk)\n qlge: reset the chip before freeing the buffers\n l2tp: test for ethernet header in l2tp_eth_dev_recv()\n tcp: select(writefds) don\u0027t hang up when a peer close connection\n tcp: fix three tcp sysctls tuning\n tcp: Combat per-cpu skew in orphan tests.\n pxa168_eth: silence gcc warnings\n pxa168_eth: update call to phy_mii_ioctl()\n pxa168_eth: fix error handling in prope\n pxa168_eth: remove unneeded null check\n phylib: Fix race between returning phydev and calling adjust_link\n caif-driver: add HAS_DMA dependency\n 3c59x: Fix deadlock between boomerang_interrupt and boomerang_start_tx\n qlcnic: fix poll implementation\n netxen: fix poll implementation\n bridge: netfilter: fix a memory leak\n" }, { "commit": "ef24b16b5d67c815874ed2d0e2581db629661ba3", "tree": "552332dff8d2079695ba0b4b608bc2ad8bf1c3e3", "parents": [ "9dc002d8d9c2af837e789b5bb88c61a8b32c1be8" ], "author": { "name": "Anton Vorontsov", "email": "avorontsov@mvista.com", "time": "Tue Aug 24 14:46:12 2010 -0700" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Tue Aug 24 14:46:12 2010 -0700" }, "message": "phylib: Fix race between returning phydev and calling adjust_link\n\nIt is possible that phylib will call adjust_link before returning\nfrom {,of_}phy_connect(), which may cause the following [very rare,\nthough] oops upon reopening the device:\n\n Unable to handle kernel paging request for data at address 0x0000024c\n Oops: Kernel access of bad area, sig: 11 [#1]\n PREEMPT SMP NR_CPUS\u003d2 LTT NESTING LEVEL : 0\n P1021 RDB\n Modules linked in:\n NIP: c0345dac LR: c0345dac CTR: c0345d84\n TASK \u003d dffab6b0[30] \u0027events/0\u0027 THREAD: c0d24000 CPU: 0\n [...]\n NIP [c0345dac] adjust_link+0x28/0x19c\n LR [c0345dac] adjust_link+0x28/0x19c\n Call Trace:\n [c0d25f00] [000045e1] 0x45e1 (unreliable)\n [c0d25f30] [c036c158] phy_state_machine+0x3ac/0x554\n [...]\n\nHere is why. Drivers store phydev in their private structures, e.g.\ngianfar driver:\n\nstatic int init_phy(struct net_device *dev)\n{\n\t...\n\tpriv-\u003ephydev \u003d of_phy_connect(...);\n\t...\n}\n\nSo that adjust_link could retrieve it back:\n\nstatic void adjust_link(struct net_device *dev)\n{\n\t...\n\tstruct phy_device *phydev \u003d priv-\u003ephydev;\n\t...\n}\n\nIf the device has been opened before, then phydev-\u003estate is set to\nPHY_HALTED (or undefined if the driver didn\u0027t call phy_stop()).\n\nNow, phy_connect starts the PHY state machine before returning phydev to\nthe driver:\n\n\tphy_start_machine(phydev, NULL);\n\n\tif (phydev-\u003eirq \u003e 0)\n\t\tphy_start_interrupts(phydev);\n\n\treturn phydev;\n\nThe time between \u0027phy_start_machine()\u0027 and \u0027return phydev\u0027 is undefined.\nThe start machine routine delays execution for 1 second, which is enough\nfor most cases. But under heavy load, or if you\u0027re unlucky, it is quite\npossible that PHY state machine will execute before phy_connect()\nreturns, and so adjust_link callback will try to dereference phydev,\nwhich is not yet ready.\n\nTo fix the issue, simply initialize the PHY\u0027s state to PHY_READY during\nphy_attach(). This will ensure that phylib won\u0027t call adjust_link before\nphy_start().\n\nSigned-off-by: Anton Vorontsov \u003cavorontsov@mvista.com\u003e\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\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": "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": "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": "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": "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": "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": "c477d0447db08068a497e7beb892b2b2a7bff64b", "tree": "bee8b5f66ec1c8e55ced27d1836c63c0cf9d7f84", "parents": [ "66d50d25502cd9b7d6e3ebbf4e241259c1283eaf" ], "author": { "name": "Cyril Chemparathy", "email": "cyril@ti.com", "time": "Mon Aug 02 09:44:53 2010 +0000" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Mon Aug 02 22:07:45 2010 -0700" }, "message": "phy/marvell: add 88e1121 interface mode support\n\nThis patch adds support for RGMII RX/TX delay configuration on marvell 88e1121\nand derivatives. With this patch, PHY_INTERFACE_MODE_RGMII_*ID modes are now\nsupported on these devices.\n\nSigned-off-by: Cyril Chemparathy \u003ccyril@ti.com\u003e\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "dab1086362f0a357e74f45bba48d664a48c294ec", "tree": "e15dce1534924214f6b5f9f53f388a1e6137eb4b", "parents": [ "5c20a5c7105bd7d5aa8af146598bdb6bc59bb2b8" ], "author": { "name": "Giuseppe Cavallaro", "email": "peppe.cavallaro@st.com", "time": "Tue Jul 20 13:24:25 2010 -0700" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Tue Jul 20 13:24:25 2010 -0700" }, "message": "phy: add suspend/resume in the ic+\n\nSigned-off-by: Giuseppe Cavallaro \u003cpeppe.cavallaro@st.com\u003e\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "c1f19b51d1d87f3e3bb7e6648f43f7d57ed2da6b", "tree": "d9525359409e3493b48e8676717cc11ed69b640a", "parents": [ "15f0127d1d189fda3294b7823e3e654afca54055" ], "author": { "name": "Richard Cochran", "email": "richardcochran@gmail.com", "time": "Sat Jul 17 08:49:36 2010 +0000" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Sun Jul 18 19:15:26 2010 -0700" }, "message": "net: support time stamping in phy devices.\n\nThis patch adds a new networking option to allow hardware time stamps\nfrom PHY devices. When enabled, likely candidates among incoming and\noutgoing network packets are offered to the PHY driver for possible\ntime stamping. When accepted by the PHY driver, incoming packets are\ndeferred for later delivery by the driver.\n\nThe patch also adds phylib driver methods for the SIOCSHWTSTAMP ioctl\nand callbacks for transmit and receive time stamping. Drivers may\noptionally implement these functions.\n\nSigned-off-by: Richard Cochran \u003crichard.cochran@omicron.at\u003e\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "28b041139e344ecd0f144d6205b004ae354cfa1e", "tree": "7fc0e05d01717da0410a7b3252b0cac3fc8db81d", "parents": [ "4507a71507d4ff37e9a499c4241b7701ed1feab4" ], "author": { "name": "Richard Cochran", "email": "richardcochran@gmail.com", "time": "Sat Jul 17 08:48:55 2010 +0000" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Sun Jul 18 19:15:25 2010 -0700" }, "message": "net: preserve ifreq parameter when calling generic phy_mii_ioctl().\n\nThe phy_mii_ioctl() function unnecessarily throws away the original ifreq.\nWe need access to the ifreq in order to support PHYs that can perform\nhardware time stamping.\n\nTwo maverick drivers filter the ioctl commands passed to phy_mii_ioctl().\nThis is unnecessary since phylib will check the command in any case.\n\nSigned-off-by: Richard Cochran \u003crichard.cochran@omicron.at\u003e\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "2f495c398edca50ac251c134f1995a2fb3c06cb7", "tree": "85551c64ef485373807a2733287aafc458881a10", "parents": [ "43b56074b69f3b6d0296e7986e792c7adb1d89c6" ], "author": { "name": "Benjamin Herrenschmidt", "email": "benh@kernel.crashing.org", "time": "Mon Jun 21 13:20:46 2010 +1000" }, "committer": { "name": "Nicolas Pitre", "email": "nico@fluxnic.net", "time": "Fri Jul 16 22:01:58 2010 -0400" }, "message": "net/phy/marvell: Expose IDs and flags in a .h and add dns323 LEDs setup flag\n\nThis moves the various known Marvell PHY IDs to include/linux/marvell_phy.h\nalong with dev_flags definitions for use by the driver.\n\nI then added a flag that changes the PHY init code to setup the LEDs\nconfig to the values needed to operate a dns323 rev C1 NAS.\n\nI moved the existing \"resistance\" flag to the .h as well, though I\u0027ve\nbeen unable to find whoever sets this to convert it to use that constant.\n\nSigned-off-by: Benjamin Herrenschmidt \u003cbenh@kernel.crashing.org\u003e\nReviewed-by: Wolfram Sang \u003cw.sang@pengutronix.de\u003e\nAcked-by: David S. Miller \u003cdavem@davemloft.net\u003e\nSigned-off-by: Nicolas Pitre \u003cnico@fluxnic.net\u003e\n" }, { "commit": "597e608a8492d662736c9bc6aa507dbf1cadc17d", "tree": "6c330cdd0a4809f67dd191b37e34f5b4318cef78", "parents": [ "acbc0f039ff4b93da737c91937b7c70018ded39f", "33b665eeeb85956ccbdf31c4c31a4e2a31133c44" ], "author": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Wed Jul 07 15:59:38 2010 -0700" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Wed Jul 07 15:59:38 2010 -0700" }, "message": "Merge branch \u0027master\u0027 of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6\n" }, { "commit": "51f932c4870f785d73d5fd5fed33306e63cf4efc", "tree": "fe827902e1feccc037fcc76b1f6fcbbd35f09537", "parents": [ "deaec0f65b9a9b536bc5951f4908ab1408421ffb" ], "author": { "name": "Choi, David", "email": "David.Choi@Micrel.Com", "time": "Mon Jun 28 15:23:41 2010 +0000" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Tue Jun 29 00:58:32 2010 -0700" }, "message": "micrel phy driver - updated(1)\n\nHello all:\n\nThis patch fixes what Ben mentioned, namely duplicated ids.\n\nFrom: David J. Choi \u003cdavid.choi@micrel.com\u003e\n\nBody of the explanation: This patch has changes as followings;\n -support the interrupt from phy devices from Micrel Inc.\n -support more phy devices, ks8737, ks8721, ks8041, ks8051 from Micrel.\n -remove vsc8201 because this device was used only internal test at Micrel.\n\nSigned-off-by: David J. Choi \u003cdavid.choi@micrel.com\u003e\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "a71e8329170ece5f684aa363dfa69828cbfd5184", "tree": "eab1a607bd713c5045cc47873696780af112cb63", "parents": [ "d30b181bd6d047b39235a0d8e26de422d9d05b25" ], "author": { "name": "David Daney", "email": "ddaney@caviumnetworks.com", "time": "Thu Jun 24 09:14:48 2010 +0000" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Mon Jun 28 23:58:54 2010 -0700" }, "message": "netdev: mdio-octeon: Fix section mismatch errors.\n\nWe started getting:\n\nWARNING: vmlinux.o(.data+0x20bd0): Section mismatch in reference from\nthe variable octeon_mdiobus_driver to the function\n.init.text:octeon_mdiobus_probe()\n\nThis fixes it.\n\nSigned-off-by: David Daney \u003cddaney@caviumnetworks.com\u003e\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "e2f5b04563786d4b7d7648868de7e941a0649372", "tree": "6d57659d3d89ddca1f8fd5609973385c711ee929", "parents": [ "d41de3c10047d5f0b661593a8f4610a19f87621f" ], "author": { "name": "David Woodhouse", "email": "dwmw2@infradead.org", "time": "Tue Jun 22 02:38:13 2010 +0000" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Sat Jun 26 22:12:03 2010 -0700" }, "message": "phylib: Add autoload support for the LXT973 phy.\n\nCommit e13647c1 (phylib: Add support for the LXT973 phy.) added a new ID\nbut neglected to also add it to the MODULE_DEVICE_TABLE.\n\nSigned-off-by: David Woodhouse \u003cDavid.Woodhouse@intel.com\u003e\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "7a938f80264f2cbfb0c0841b450eab42a8093281", "tree": "ae883f1c9a1170efc64b7f33db96f7989ad422a3", "parents": [ "fcb26ec5b18d88bb22366799d056dc3630d0e895" ], "author": { "name": "Dmitry Baryshkov", "email": "dbaryshkov@gmail.com", "time": "Wed Jun 16 23:02:24 2010 +0000" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Thu Jun 24 21:30:09 2010 -0700" }, "message": "broadcom: Add 5241 support\n\nThis patch adds the 5241 PHY ID to the broadcom module.\n\nSigned-off-by: Dmitry Eremin-Solenikov \u003cdbaryshkov@gmail.com\u003e\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "fcb26ec5b18d88bb22366799d056dc3630d0e895", "tree": "ba164d38c89938e4f39d4d41dacddd1f2fd144c2", "parents": [ "deb0d7c740a008a4e26806317497549b0e8907eb" ], "author": { "name": "Dmitry Baryshkov", "email": "dbaryshkov@gmail.com", "time": "Wed Jun 16 23:02:23 2010 +0000" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Thu Jun 24 21:30:09 2010 -0700" }, "message": "broadcom: move all PHY_ID\u0027s to header\n\nMove all PHY IDs to brcmphy.h header for completeness and unification of code.\n\nSigned-off-by: Dmitry Eremin-Solenikov \u003cdbaryshkov@gmail.com\u003e\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "e13647c158307f0e7ff5fc5bec34731f28917595", "tree": "157e393bed93f540a93e96fcafaac8f6f541f92c", "parents": [ "327723edebbbd621ed35b0d63073685eb225563e" ], "author": { "name": "Richard Cochran", "email": "richardcochran@gmail.com", "time": "Mon Jun 07 05:39:32 2010 +0000" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Wed Jun 09 16:17:02 2010 -0700" }, "message": "phylib: Add support for the LXT973 phy.\n\nThis patch implements a work around for Erratum 5, \"3.3 V Fiber Speed\nSelection.\" If the hardware wiring does not respect this erratum, then\nfiber optic mode will not work properly.\n\nSigned-off-by: Richard Cochran \u003crichard.cochran@omicron.at\u003e\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "cf9b59e9d3e008591d1f54830f570982bb307a0d", "tree": "113478ce8fd8c832ba726ffdf59b82cb46356476", "parents": [ "44504b2bebf8b5823c59484e73096a7d6574471d", "f4b87dee923342505e1ddba8d34ce9de33e75050" ], "author": { "name": "Grant Likely", "email": "grant.likely@secretlab.ca", "time": "Sat May 22 00:36:56 2010 -0600" }, "committer": { "name": "Grant Likely", "email": "grant.likely@secretlab.ca", "time": "Sat May 22 00:36:56 2010 -0600" }, "message": "Merge remote branch \u0027origin\u0027 into secretlab/next-devicetree\n\nMerging in current state of Linus\u0027 tree to deal with merge conflicts and\nbuild failures in vio.c after merge.\n\nConflicts:\n\tdrivers/i2c/busses/i2c-cpm.c\n\tdrivers/i2c/busses/i2c-mpc.c\n\tdrivers/net/gianfar.c\n\nAlso fixed up one line in arch/powerpc/kernel/vio.c to use the\ncorrect node pointer.\n\nSigned-off-by: Grant Likely \u003cgrant.likely@secretlab.ca\u003e\n" }, { "commit": "4018294b53d1dae026880e45f174c1cc63b5d435", "tree": "6db3538eaf91b653381720a6d92f4f15634a93d0", "parents": [ "597b9d1e44e9ba69f2454a5318bbe7a6d5e6930a" ], "author": { "name": "Grant Likely", "email": "grant.likely@secretlab.ca", "time": "Tue Apr 13 16:13:02 2010 -0700" }, "committer": { "name": "Grant Likely", "email": "grant.likely@secretlab.ca", "time": "Sat May 22 00:10:40 2010 -0600" }, "message": "of: Remove duplicate fields from of_platform_driver\n\n.name, .match_table and .owner are duplicated in both of_platform_driver\nand device_driver. This patch is a removes the extra copies from struct\nof_platform_driver and converts all users to the device_driver members.\n\nThis patch is a pretty mechanical change. The usage model doesn\u0027t change\nand if any drivers have been missed, or if anything has been fixed up\nincorrectly, then it will fail with a compile time error, and the fixup\nwill be trivial. This patch looks big and scary because it touches so\nmany files, but it should be pretty safe.\n\nSigned-off-by: Grant Likely \u003cgrant.likely@secretlab.ca\u003e\nAcked-by: Sean MacLennan \u003csmaclennan@pikatech.com\u003e\n\n" }, { "commit": "61c7a080a5a061c976988fd4b844dfb468dda255", "tree": "8cb492b73f2755c38a6164d770da34d5af6486a0", "parents": [ "d12d42f744f805a9ccc33cd76f04b237cd83ce56" ], "author": { "name": "Grant Likely", "email": "grant.likely@secretlab.ca", "time": "Tue Apr 13 16:12:29 2010 -0700" }, "committer": { "name": "Grant Likely", "email": "grant.likely@secretlab.ca", "time": "Tue May 18 16:10:44 2010 -0600" }, "message": "of: Always use \u0027struct device.of_node\u0027 to get device node pointer.\n\nThe following structure elements duplicate the information in\n\u0027struct device.of_node\u0027 and so are being eliminated. This patch\nmakes all readers of these elements use device.of_node instead.\n\n(struct of_device *)-\u003enode\n(struct dev_archdata *)-\u003eprom_node (sparc)\n(struct dev_archdata *)-\u003eof_node (powerpc \u0026 microblaze)\n\nSigned-off-by: Grant Likely \u003cgrant.likely@secretlab.ca\u003e\n" }, { "commit": "a4b770972b8f819e408d7cc3ae9637e15bff62f6", "tree": "62e3c413b084c106d750cf6cc0701709cde30100", "parents": [ "21ce849ba5cc178740c6532ba3dded852296ad91" ], "author": { "name": "Joe Perches", "email": "joe@perches.com", "time": "Fri May 14 00:19:28 2010 -0700" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Fri May 14 00:19:28 2010 -0700" }, "message": "drivers/net: Remove unnecessary returns from void function()s\n\nThis patch removes from drivers/net/ all the unnecessary\nreturn; statements that precede the last closing brace of\nvoid functions.\n\nIt does not remove the returns that are immediately\npreceded by a label as gcc doesn\u0027t like that.\n\nIt also does not remove null void functions with return.\n\nDone via:\n$ grep -rP --include\u003d*.[ch] -l \"return;\\n}\" net/ | \\\n xargs perl -i -e \u0027local $/ ; while (\u003c\u003e) { s/\\n[ \\t\\n]+return;\\n}/\\n}/g; print; }\u0027\n\nwith some cleanups by hand.\n\nCompile tested x86 allmodconfig only.\n\nSigned-off-by: Joe Perches \u003cjoe@perches.com\u003e\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "278554bd6579206921f5d8a523649a7a57f8850d", "tree": "4e6c527daf0910e455b3aa72e2c96b0479e430be", "parents": [ "5a147e8bf982f9dd414c1dd751fe02c1942506b2", "cea0d767c29669bf89f86e4aee46ef462d2ebae8" ], "author": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Wed May 12 00:05:35 2010 -0700" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Wed May 12 00:05:35 2010 -0700" }, "message": "Merge branch \u0027master\u0027 of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6\n\nConflicts:\n\tDocumentation/feature-removal-schedule.txt\n\tdrivers/net/wireless/ath/ar9170/usb.c\n\tdrivers/scsi/iscsi_tcp.c\n\tnet/ipv4/ipmr.c\n" }, { "commit": "9fc282baa8f743a7049e301d13cf9968ee95a91c", "tree": "d34e827ed35c21b98eb4e3d4c3731d1da54fa03a", "parents": [ "c61ea31dac0319ec64b33725917bda81fc293a25", "de02d72bb3cc5b3d4c873db4ca8291723dd48479" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Tue May 11 10:11:40 2010 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Tue May 11 10:11:40 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:\n net: Fix FDDI and TR config checks in ipv4 arp and LLC.\n IPv4: unresolved multicast route cleanup\n mac80211: remove association work when processing deauth request\n ar9170: wait for asynchronous firmware loading\n ipv4: udp: fix short packet and bad checksum logging\n phy: Fix initialization in micrel driver.\n sctp: Fix a race between ICMP protocol unreachable and connect()\n veth: Dont kfree_skb() after dev_forward_skb()\n IPv6: fix IPV6_RECVERR handling of locally-generated errors\n net/gianfar: drop recycled skbs on MTU change\n iwlwifi: work around passive scan issue\n" }, { "commit": "80ea76bb2575c426154b8d61d324197ee3592baa", "tree": "257713f00d4373d9a41d6d566cd3ac08fb097632", "parents": [ "50b5d6ad63821cea324a5a7a19854d4de1a0a819" ], "author": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Thu May 06 03:15:59 2010 -0700" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Thu May 06 04:02:01 2010 -0700" }, "message": "phy: Fix initialization in micrel driver.\n\nMissing name string in ks8001_driver, so we crash on register.\n\nReported-by: Ingo Molnar \u003cmingo@elte.hu\u003e\nTested-by: Ingo Molnar \u003cmingo@elte.hu\u003e\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "7437e7d3672b6d23c08212c68752c9a9c25f8e9e", "tree": "809507a1d8c1cadce9a7cab87970da95aa772d2d", "parents": [ "38c9e91bc396672e9ea8013bad63ea4f59d9d31c", "7cff0943a1104479fc9fc2d6ced24c02ba81e73e" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Wed May 05 07:55:07 2010 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Wed May 05 07:55:07 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:\n FEC: Fix kernel panic in fec_set_mac_address.\n ipv6: Fix default multicast hops setting.\n net: ep93xx_eth stops receiving packets\n drivers/net/phy: micrel phy driver\n dm9601: fix phy/eeprom write routine\n ppp_generic: handle non-linear skbs when passing them to pppd\n ppp_generic: pull 2 bytes so that PPP_PROTO(skb) is valid\n net: fix compile error due to double return type in SOCK_DEBUG\n net/usb: initiate sync sequence in sierra_net.c driver\n net/usb: remove default in Kconfig for sierra_net driver\n r8169: Fix rtl8169_rx_interrupt()\n e1000e: Fix oops caused by ASPM patch.\n net/sb1250: register mdio bus in probe\n sctp: Fix skb_over_panic resulting from multiple invalid parameter errors (CVE-2010-1173) (v4)\n p54pci: fix bugs in p54p_check_tx_ring\n" }, { "commit": "52a60ed2da716105de5f906a3630c475264b87d5", "tree": "36d1b3c476780501173ac14be4c9536d64c65d31", "parents": [ "0f7ca5917e989c4f77db3e97f92badaf3266d4dc" ], "author": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Mon May 03 15:48:29 2010 -0700" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Mon May 03 15:48:29 2010 -0700" }, "message": "phy/micrel: Add module device ID table for autoloading.\n\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "0f7ca5917e989c4f77db3e97f92badaf3266d4dc", "tree": "0f29c4d45870c7d6317ff768c751aebf0948098a", "parents": [ "a2f3be17c07ad9bd45ab300f79642ecb39cfb553", "d05070091849015f8c5b7d55cd75b86ebb61b3ec" ], "author": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Mon May 03 15:45:52 2010 -0700" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Mon May 03 15:45:52 2010 -0700" }, "message": "Merge branch \u0027master\u0027 of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6\n" }, { "commit": "d05070091849015f8c5b7d55cd75b86ebb61b3ec", "tree": "eb7a8f558a184f8a7ea86084dd4f3f1f8fed3f1a", "parents": [ "e9162ab1610531d6ea6c1833daeb2613e44275e8" ], "author": { "name": "David J. Choi", "email": "david.choi@micrel.com", "time": "Thu Apr 29 06:12:41 2010 +0000" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Mon May 03 15:43:26 2010 -0700" }, "message": "drivers/net/phy: micrel phy driver\n\nThis is the first version of phy driver from Micrel Inc.\n\nSigned-off-by: David J. Choi \u003cdavid.choi@micrel.com\u003e\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "6c17812d622a74950e2cd65f368f0518491cca61", "tree": "19577e2567bf4886257bd4190de6d77b275d49e6", "parents": [ "20f12160607c09e299a3e93c7bf4d75e8801c9b7" ], "author": { "name": "David Daney", "email": "ddaney@caviumnetworks.com", "time": "Thu Apr 01 18:17:54 2010 -0700" }, "committer": { "name": "Ralf Baechle", "email": "ralf@linux-mips.org", "time": "Fri Apr 30 20:52:52 2010 +0100" }, "message": "NET: mdio-octeon: Enable the hardware before using it.\n\nIn some cases the mdio bus is not enabled at the time of probing.\nThis prevents anything from working, so we will enable it before\ntrying to use it, and disable it when the driver is removed.\n\nSigned-off-by: David Daney \u003cddaney@caviumnetworks.com\u003e\nTo: linux-mips@linux-mips.org\nTo: netdev@vger.kernel.org\nTo: gregkh@suse.de\nPatchwork: http://patchwork.linux-mips.org/patch/1090/\nAcked-by: David S. Miller \u003cdavem@davemloft.net\u003e\nAcked-by: Greg Kroah-Hartman \u003cgregkh@suse.de\u003e\nSigned-off-by: Ralf Baechle \u003cralf@linux-mips.org\u003e\n" }, { "commit": "0de8655ab9181cbaca82aa60402b14118e06d030", "tree": "8f209d1e57487d40f007b41d5d9bfea1a7cd0c24", "parents": [ "18d777a5bcf31491021f527d32b72dd16f911fe0" ], "author": { "name": "Florian Fainelli", "email": "ffainelli@freebox.fr", "time": "Fri Apr 09 01:04:45 2010 +0000" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Tue Apr 13 03:29:36 2010 -0700" }, "message": "PHY: fix typo in bcm63xx PHY driver table\n\nSigned-off-by: Florian Fainelli \u003cffainelli@freebox.fr\u003e\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "871039f02f8ec4ab2e5e9010718caa8e085786f1", "tree": "f0d2b3127fc48c862967d68c46c2d46668137515", "parents": [ "e4077e018b5ead3de9951fc01d8bf12eeeeeefed", "4a1032faac94ebbf647460ae3e06fc21146eb280" ], "author": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Sun Apr 11 14:53:53 2010 -0700" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Sun Apr 11 14:53:53 2010 -0700" }, "message": "Merge branch \u0027master\u0027 of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6\n\nConflicts:\n\tdrivers/net/stmmac/stmmac_main.c\n\tdrivers/net/wireless/wl12xx/wl1271_cmd.c\n\tdrivers/net/wireless/wl12xx/wl1271_main.c\n\tdrivers/net/wireless/wl12xx/wl1271_spi.c\n\tnet/core/ethtool.c\n\tnet/mac80211/scan.c\n" }, { "commit": "4e4f10f6498bc5038c0a110b5f21682fcb5578d7", "tree": "2f7e91e9a35fd1e6ac63b55e3c08bdb1c701268d", "parents": [ "8626d3b4328061f5b82b11ae1d6918a0c3602f42" ], "author": { "name": "David Woodhouse", "email": "dwmw2@infradead.org", "time": "Fri Apr 02 01:05:56 2010 +0000" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Fri Apr 02 14:30:40 2010 -0700" }, "message": "phylib: Add module table to all existing phy drivers\n\nSigned-off-by: David Woodhouse \u003cDavid.Woodhouse@intel.com\u003e\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "8626d3b4328061f5b82b11ae1d6918a0c3602f42", "tree": "be2b509a0d47903ff2ac1d10255a760ade82daca", "parents": [ "9092c658bab215b2752fa59d2a36c05b74d1e9e9" ], "author": { "name": "David Woodhouse", "email": "dwmw2@infradead.org", "time": "Fri Apr 02 01:05:27 2010 +0000" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Fri Apr 02 14:30:39 2010 -0700" }, "message": "phylib: Support phy module autoloading\n\nWe don\u0027t use the normal hotplug mechanism because it doesn\u0027t work. It will\nload the module some time after the device appears, but that\u0027s not good\nenough for us -- we need the driver loaded _immediately_ because otherwise\nthe NIC driver may just abort and then the phy \u0027device\u0027 goes away.\n\n[bwh: s/phy/mdio/ in module alias, kerneldoc for struct mdio_device_id]\n\nSigned-off-by: David Woodhouse \u003cDavid.Woodhouse@intel.com\u003e\nSigned-off-by: Ben Hutchings \u003cben@decadent.org.uk\u003e\nAcked-by: Andy Fleming \u003cafleming@freescale.com\u003e\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "5a0e3ad6af8660be21ca98a971cd00f331318c05", "tree": "5bfb7be11a03176a87296a43ac6647975c00a1d1", "parents": [ "ed391f4ebf8f701d3566423ce8f17e614cde9806" ], "author": { "name": "Tejun Heo", "email": "tj@kernel.org", "time": "Wed Mar 24 17:04:11 2010 +0900" }, "committer": { "name": "Tejun Heo", "email": "tj@kernel.org", "time": "Tue Mar 30 22:02:32 2010 +0900" }, "message": "include cleanup: Update gfp.h and slab.h includes to prepare for breaking implicit slab.h inclusion from percpu.h\n\npercpu.h is included by sched.h and module.h and thus ends up being\nincluded when building most .c files. percpu.h includes slab.h which\nin turn includes gfp.h making everything defined by the two files\nuniversally available and complicating inclusion dependencies.\n\npercpu.h -\u003e slab.h dependency is about to be removed. Prepare for\nthis change by updating users of gfp and slab facilities include those\nheaders directly instead of assuming availability. As this conversion\nneeds to touch large number of source files, the following script is\nused as the basis of conversion.\n\n http://userweb.kernel.org/~tj/misc/slabh-sweep.py\n\nThe script does the followings.\n\n* Scan files for gfp and slab usages and update includes such that\n only the necessary includes are there. ie. if only gfp is used,\n gfp.h, if slab is used, slab.h.\n\n* When the script inserts a new include, it looks at the include\n blocks and try to put the new include such that its order conforms\n to its surrounding. It\u0027s put in the include block which contains\n core kernel includes, in the same order that the rest are ordered -\n alphabetical, Christmas tree, rev-Xmas-tree or at the end if there\n doesn\u0027t seem to be any matching order.\n\n* If the script can\u0027t find a place to put a new include (mostly\n because the file doesn\u0027t have fitting include block), it prints out\n an error message indicating which .h file needs to be added to the\n file.\n\nThe conversion was done in the following steps.\n\n1. The initial automatic conversion of all .c files updated slightly\n over 4000 files, deleting around 700 includes and adding ~480 gfp.h\n and ~3000 slab.h inclusions. The script emitted errors for ~400\n files.\n\n2. Each error was manually checked. Some didn\u0027t need the inclusion,\n some needed manual addition while adding it to implementation .h or\n embedding .c file was more appropriate for others. This step added\n inclusions to around 150 files.\n\n3. The script was run again and the output was compared to the edits\n from #2 to make sure no file was left behind.\n\n4. Several build tests were done and a couple of problems were fixed.\n e.g. lib/decompress_*.c used malloc/free() wrappers around slab\n APIs requiring slab.h to be added manually.\n\n5. The script was run on all .h files but without automatically\n editing them as sprinkling gfp.h and slab.h inclusions around .h\n files could easily lead to inclusion dependency hell. Most gfp.h\n inclusion directives were ignored as stuff from gfp.h was usually\n wildly available and often used in preprocessor macros. Each\n slab.h inclusion directive was examined and added manually as\n necessary.\n\n6. percpu.h was updated not to include slab.h.\n\n7. Build test were done on the following configurations and failures\n were fixed. CONFIG_GCOV_KERNEL was turned off for all tests (as my\n distributed build env didn\u0027t work with gcov compiles) and a few\n more options had to be turned off depending on archs to make things\n build (like ipr on powerpc/64 which failed due to missing writeq).\n\n * x86 and x86_64 UP and SMP allmodconfig and a custom test config.\n * powerpc and powerpc64 SMP allmodconfig\n * sparc and sparc64 SMP allmodconfig\n * ia64 SMP allmodconfig\n * s390 SMP allmodconfig\n * alpha SMP allmodconfig\n * um on x86_64 SMP allmodconfig\n\n8. percpu.h modifications were reverted so that it could be applied as\n a separate patch and serve as bisection point.\n\nGiven the fact that I had only a couple of failures from tests on step\n6, I\u0027m fairly confident about the coverage of this conversion patch.\nIf there is a breakage, it\u0027s likely to be something in one of the arch\nheaders which should be easily discoverable easily on most builds of\nthe specific arch.\n\nSigned-off-by: Tejun Heo \u003ctj@kernel.org\u003e\nGuess-its-ok-by: Christoph Lameter \u003ccl@linux-foundation.org\u003e\nCc: Ingo Molnar \u003cmingo@redhat.com\u003e\nCc: Lee Schermerhorn \u003cLee.Schermerhorn@hp.com\u003e\n" }, { "commit": "abf35df21513c51d7761c41fa6d3b819cdf4103e", "tree": "3152b04190035149aba67936ef0cff81cc6af3a0", "parents": [ "23606cf5d1192c2b17912cb2ef6e62f9b11de133" ], "author": { "name": "Jason Gunthorpe", "email": "jgunthorpe@obsidianresearch.com", "time": "Tue Mar 09 09:17:42 2010 +0000" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Tue Mar 16 21:23:42 2010 -0700" }, "message": "NET: Support clause 45 MDIO commands at the MDIO bus level\n\nIEEE 802.3ae clause 45 specifies a somewhat modified MDIO protocol\nfor use by 10GIGE phys. The main change is a 21 bit address split into\na 5 bit device ID and a 16 bit register offset. The definition is designed\nso that normal and extended devices can run on the same MDIO bus.\n\nExtend mdio-bitbang to do the new protocol. At the MDIO bus level the\nprotocol is requested by or\u0027ing MII_ADDR_C45 into the register offset.\n\nMake phy_read/phy_write/etc pass a full 32 bit register offset.\n\nThis does not attempt to make the phy layer support C45 style PHYs, just\nto provide the MDIO bus support.\n\nTested against a Broadcom 10GE phy with ID 0x206034, and several\nBroadcom 10/100/1000 Phys in normal mode.\n\nSigned-off-by: Jason Gunthorpe \u003cjgunthorpe@obsidianresearch.com\u003e\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "6a443a0f72ad7706345412dbd2e4d4981fdfce39", "tree": "e0e9724789c0bf2e232bae18080147834e58da50", "parents": [ "79eb6904361fe4e54e589919a9b62c5e036c42c3" ], "author": { "name": "Matt Carlson", "email": "mcarlson@broadcom.com", "time": "Wed Feb 17 15:17:04 2010 +0000" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Wed Feb 17 17:27:40 2010 -0800" }, "message": "tg3: Push phylib definitions to phylib\n\nThis patch pushes phylib definitions out to phylib headers. For phy\nIDs, this removes some code duplication.\n\nSigned-off-by: Matt Carlson \u003cmcarlson@broadcom.com\u003e\nReviewed-by: Michael Chan \u003cmchan@broadcom.com\u003e\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "f8f76db1db369f3a130ac3fd33e2eee5f1610d9c", "tree": "808ba0be71bc55335afca100fc857d7f4e937b46", "parents": [ "6683ece36e3531fc8c75f69e7165c5f20930be88" ], "author": { "name": "Jiri Pirko", "email": "jpirko@redhat.com", "time": "Thu Feb 04 10:23:02 2010 -0800" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Thu Feb 04 10:23:02 2010 -0800" }, "message": "libphy: add phy_find_first function\n\nMany drivers do this in them manually. Now they can use this function.\n\nSigned-off-by: Jiri Pirko \u003cjpirko@redhat.com\u003e\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "51c24aaacaea90c8e87f1dec75a2ac7622b593f8", "tree": "9f54936c87764bef75e97395cb56b7d1e0df24c6", "parents": [ "4276e47e2d1c85a2477caf0d22b91c4f2377fba8", "6be325719b3e54624397e413efd4b33a997e55a3" ], "author": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Sat Jan 23 00:31:06 2010 -0800" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Sat Jan 23 00:31:06 2010 -0800" }, "message": "Merge branch \u0027master\u0027 of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6\n" }, { "commit": "6be325719b3e54624397e413efd4b33a997e55a3", "tree": "57f321a56794cab2222e179b16731e0d76a4a68a", "parents": [ "26d92f9276a56d55511a427fb70bd70886af647a", "92dcffb916d309aa01778bf8963a6932e4014d07" ], "author": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Fri Jan 22 22:45:46 2010 -0800" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Fri Jan 22 22:45:46 2010 -0800" }, "message": "Merge branch \u0027master\u0027 of /home/davem/src/GIT/linux-2.6/\n" }, { "commit": "5f8cbc13225eadd981c817f7d14b8deab61ebfaa", "tree": "5fc6ca51afd9996fe55858735d1478371b02ddd2", "parents": [ "81abb43a243b6d74b6f7201a7a22aa5355cd3a8a" ], "author": { "name": "Liu Yu-B13201", "email": "Yu.Liu@freescale.com", "time": "Wed Jan 13 22:13:19 2010 +0000" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Thu Jan 21 01:17:56 2010 -0800" }, "message": "phy: add RTBI mode for m88e1111\n\nSigned-off-by: Liu Yu \u003cyu.liu@freescale.com\u003e\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "4f9c85a1b03bfa5c0a0d8488a3a7766f3c9fb756", "tree": "33e56a2d442274aeb0baa2f2b61f7bb5759dd17b", "parents": [ "de4ef86cfce60d2250111f34f8a084e769f23b16" ], "author": { "name": "Anton Vorontsov", "email": "avorontsov@ru.mvista.com", "time": "Mon Jan 18 05:37:16 2010 +0000" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Tue Jan 19 01:59:02 2010 -0800" }, "message": "phylib: Move workqueue initialization to a proper place\n\ncommit 541cd3ee00a4fe975b22fac6a3bc846bacef37f7 (\"phylib: Fix deadlock\non resume\") caused TI DaVinci EMAC ethernet driver to oops upon resume:\n\n PM: resume of devices complete after 237.098 msecs\n Restarting tasks ... done.\n kernel BUG at kernel/workqueue.c:354!\n Unable to handle kernel NULL pointer dereference at virtual address 00000000\n [...]\n Backtrace:\n [\u003cc002c598\u003e] (__bug+0x0/0x2c) from [\u003cc0052a54\u003e] (queue_delayed_work_on+0x74/0xf8)\n [\u003cc00529e0\u003e] (queue_delayed_work_on+0x0/0xf8) from [\u003cc0052b30\u003e] (queue_delayed_work+0x2c/0x30)\n\nThe oops pops up because TI DaVinci EMAC driver detaches PHY on\nsuspend and attaches it back on resume. Attaching makes phylib call\nphy_start_machine() that initializes a workqueue. On the other hand,\nPHY\u0027s resume routine will call phy_start_machine() again, and that\nwill cause the oops since we just destroyed the already scheduled\nworkqueue.\n\nThis patch fixes the issue by moving workqueue initialization to\nphy_device_create().\n\np.s. We don\u0027t see this oops with ucc_geth and gianfar drivers because\nthey perform a fine-grained suspend, i.e. they just stop the PHYs\nwithout detaching.\n\nReported-by: Sekhar Nori \u003cnsekhar@ti.com\u003e\nSigned-off-by: Anton Vorontsov \u003cavorontsov@ru.mvista.com\u003e\nTested-by: Sekhar Nori \u003cnsekhar@ti.com\u003e\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "597d8c717856f6094837850f3eb4850820b36451", "tree": "44c1b1115df6a80f6cee3684a01cdbc18b034134", "parents": [ "682137f7e6bc78e3c324874c0c213123ddc5e261", "9db2f1bec36805e57a003f7bb90e003815d96de8" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Tue Jan 12 20:53:29 2010 -0800" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Tue Jan 12 20:53:29 2010 -0800" }, "message": "Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-2.6\n\n* git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-2.6: (56 commits)\n sky2: Fix oops in sky2_xmit_frame() after TX timeout\n Documentation/3c509: document ethtool support\n af_packet: Don\u0027t use skb after dev_queue_xmit()\n vxge: use pci_dma_mapping_error to test return value\n netfilter: ebtables: enforce CAP_NET_ADMIN\n e1000e: fix and commonize code for setting the receive address registers\n e1000e: e1000e_enable_tx_pkt_filtering() returns wrong value\n e1000e: perform 10/100 adaptive IFS only on parts that support it\n e1000e: don\u0027t accumulate PHY statistics on PHY read failure\n e1000e: call pci_save_state() after pci_restore_state()\n netxen: update version to 4.0.72\n netxen: fix set mac addr\n netxen: fix smatch warning\n netxen: fix tx ring memory leak\n tcp: update the netstamp_needed counter when cloning sockets\n TI DaVinci EMAC: Handle emac module clock correctly.\n dmfe/tulip: Let dmfe handle DM910x except for SPARC on-board chips\n ixgbe: Fix compiler warning about variable being used uninitialized\n netfilter: nf_ct_ftp: fix out of bounds read in update_nl_seq()\n mv643xx_eth: don\u0027t include cache padding in rx desc buffer size\n ...\n\nFix trivial conflict in drivers/scsi/cxgb3i/cxgb3i_offload.c\n" }, { "commit": "d4a66e752d0b19934dd208884f8605fe385aaaa9", "tree": "72fb727be1d7636aae9cddfe9aa93ac9dec75daf", "parents": [ "bdbec4b86ee99b020e159f9bd604003a3ae3b0ab", "fa15e99b6bb44aa86b241a43ca8c509e91f80153" ], "author": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Sun Jan 10 22:55:03 2010 -0800" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Sun Jan 10 22:55:03 2010 -0800" }, "message": "Merge branch \u0027master\u0027 of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6\n\nConflicts:\n\tdrivers/net/benet/be_cmds.h\n\tinclude/linux/sysctl.h\n" }, { "commit": "698244ace8b63896565022143ab19f141bc48993", "tree": "34996baa2d5b64c75f7508211a04f4642b095baa", "parents": [ "635267130855e91f4681df5e4d26ca9ce908447f" ], "author": { "name": "Giuseppe Cavallaro", "email": "peppe.cavallaro@st.com", "time": "Wed Jan 06 20:35:14 2010 -0800" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Wed Jan 06 20:35:14 2010 -0800" }, "message": "phy: SMSC device Energy Detect power-down mode\n\nSMSC Ethernet Transceivers (LAN88710, LAN8710, LAN8720, LAN8187,\nLAN8700, LAN83C185) provide a mechanism to conserve power when\nthe device is not connected to an active link partner\n(Energy Detect Mode).\nSo this patch enables the Energy Detect power-down mode\nfor these Transceivers.\n\nSigned-off-by: Giuseppe Cavallaro \u003cpeppe.cavallaro@st.com\u003e\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "7ec4e7d3cfee9d7846dbd02ad442c40cb58512e8", "tree": "39dc8d5ecad037ab3e1b88382deedd46837c1304", "parents": [ "890c8c18986eb975a76aa8359a712596bc70e61c" ], "author": { "name": "roel kluin", "email": "roel.kluin@gmail.com", "time": "Wed Dec 30 06:43:06 2009 +0000" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Sun Jan 03 22:01:32 2010 -0800" }, "message": "broadcom: Fix \u0026\u0026/|| confusion in bcm54xx_adjust_rxrefclk()\n\nThis always evaluates to true.\n\nSigned-off-by: Roel Kluin \u003croel.kluin@gmail.com\u003e\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "2f5cb43406d0b29b96248f5328a14a6f6abf8ae6", "tree": "f43e017599e590a9fbff22e2973dd77e2bc4fb41", "parents": [ "541cd3ee00a4fe975b22fac6a3bc846bacef37f7" ], "author": { "name": "Anton Vorontsov", "email": "avorontsov@ru.mvista.com", "time": "Wed Dec 30 08:23:30 2009 +0000" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Wed Dec 30 22:03:42 2009 -0800" }, "message": "phylib: Properly reinitialize PHYs after hibernation\n\nSince hibernation assumes power loss, we should fully reinitialize\nPHYs (including platform fixups), as if PHYs were just attached.\n\nThis patch factors phy_init_hw() out of phy_attach_direct(), then\nconverts mdio_bus to dev_pm_ops and adds an appropriate restore()\ncallback.\n\nSigned-off-by: Anton Vorontsov \u003cavorontsov@ru.mvista.com\u003e\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "541cd3ee00a4fe975b22fac6a3bc846bacef37f7", "tree": "238becb3dab2920caea760356c13351a2e964872", "parents": [ "7f9d3577e2603ca279c3176b696eba392f21cbe2" ], "author": { "name": "Anton Vorontsov", "email": "avorontsov@ru.mvista.com", "time": "Wed Dec 30 08:23:28 2009 +0000" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Wed Dec 30 22:03:41 2009 -0800" }, "message": "phylib: Fix deadlock on resume\n\nSometimes kernel hangs on resume with the following trace:\n\n ucc_geth e0102000.ucc: resume\n INFO: task bash:1764 blocked for more than 120 seconds.\n \"echo 0 \u003e /proc/sys/kernel/hung_task_timeout_secs\" disables this message.\n bash D 0fecf43c 0 1764 1763 0x00000000\n Call Trace:\n [cf9a7c10] [c0012868] ret_from_except+0x0/0x14 (unreliable)\n --- Exception: cf9a7ce0 at __switch_to+0x4c/0x6c\n LR \u003d 0xcf9a7cc0\n [cf9a7cd0] [c0008c14] __switch_to+0x4c/0x6c (unreliable)\n [cf9a7ce0] [c028bcfc] schedule+0x158/0x260\n [cf9a7d10] [c028c720] __mutex_lock_slowpath+0x80/0xd8\n [cf9a7d40] [c01cf388] phy_stop+0x20/0x70\n [cf9a7d50] [c01d514c] ugeth_resume+0x6c/0x13c\n [...]\n\nHere is why.\n\nOn suspend:\n\n- PM core starts suspending devices, ucc_geth_suspend gets called;\n\n- ucc_geth calls phy_stop() on suspend. Note that phy_stop() is\n mostly asynchronous so it doesn\u0027t block ucc_geth\u0027s suspend routine,\n it just sets PHY_HALTED state and disables PHY\u0027s interrupts;\n\n- Suddenly the state machine gets scheduled, it grabs the phydev-\u003elock\n mutex and tries to process the PHY_HALTED state, so it calls\n phydev-\u003eadjust_link(phydev-\u003eattached_dev). In ucc_geth case\n adjust_link() calls msleep(), which reschedules the code flow back to\n PM core, which now finishes suspend and so we end up sleeping with\n phydev-\u003elock mutex held.\n\nOn resume:\n\n- PM core starts resuming devices (notice that nobody rescheduled\n the state machine yet, so the mutex is still held), the core calls\n ucc_geth\u0027s resume routine;\n\n- ucc_geth_resume restarts the PHY with phy_stop()/phy_start()\n sequence, and the phy_*() calls are trying to grab the phydev-\u003elock\n mutex. Here comes the deadlock.\n\nThis patch fixes the issue by stopping the state machine on suspend\nand starting it again on resume.\n\nSigned-off-by: Anton Vorontsov \u003cavorontsov@ru.mvista.com\u003e\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "292be57e152ef6881089a62298c6ec885ed46f0e", "tree": "2f6d79a372be4d6659c7eb393cd7f57ecb1ee869", "parents": [ "1814f2da5ebd7a516805e0a62047cb45eee10bdc", "b74665606962456af7f92b1e448cee30ce70967b" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Mon Dec 21 10:12:25 2009 -0800" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Mon Dec 21 10:12:25 2009 -0800" }, "message": "Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-2.6\n\n* git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-2.6:\n bnx2: Fix bnx2_netif_stop() merge error.\n gianfar: Fix bit definitions of IMASK_GRSC and IMASK_GTSC\n gianfar: Fix stats support\n gianfar: Fix a filer bug\n bnx2: fixing a timout error due not refreshing TX timers correctly\n can/at91: don\u0027t check platform_get_irq\u0027s return value against zero\n mISDN: use DECLARE_COMPLETION_ONSTACK for non-constant completion\n bnx2: reset_task is crashing the kernel. Fixing it.\n ipv6: fix an oops when force unload ipv6 module\n TI DaVinci EMAC: Fix MDIO bus frequency configuration\n e100: Fix broken cbs accounting due to missing memset.\n broadcom: bcm54xx_shadow_read() errors ignored in bcm54xx_adjust_rxrefclk()\n e1000e: LED settings in EEPROM ignored on 82571 and 82572\n netxen: use module parameter correctly\n netns: fix net.ipv6.route.gc_min_interval_ms in netns\n Bluetooth: Prevent ill-timed autosuspend in USB driver\n Bluetooth: Fix L2CAP locking scheme regression\n Bluetooth: Ack L2CAP I-frames before retransmit missing packet\n Bluetooth: Fix unset of RemoteBusy flag for L2CAP\n Bluetooth: Fix PTR_ERR return of wrong pointer in hidp_setup_hid()\n" }, { "commit": "5ee6f6a17cfde9c3141e4d57cf88b5cdf638b463", "tree": "65a6fc290098b6e6b06f9f721ed7e52d62c53575", "parents": [ "db94ce90d3d571c11637a912cc39cfb80df3879c" ], "author": { "name": "Roel Kluin", "email": "roel.kluin@gmail.com", "time": "Fri Dec 18 20:16:10 2009 -0800" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Fri Dec 18 20:16:10 2009 -0800" }, "message": "broadcom: bcm54xx_shadow_read() errors ignored in bcm54xx_adjust_rxrefclk()\n\nIf not signed read errors are ignored.\n\nSigned-off-by: Roel Kluin \u003croel.kluin@gmail.com\u003e\nAcked-by: Matt Carlson \u003cmcarlson@broadcom.com\u003e\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "25d967b72a92d72b6e0263a0337dfc940bd6c044", "tree": "97900b2e687d8d868bd61ba7bc9d3acd3ce8b11a", "parents": [ "0f7e64a3941fef0a5735da5184f3ccc0d234b580" ], "author": { "name": "David Daney", "email": "ddaney@caviumnetworks.com", "time": "Wed Oct 14 12:04:38 2009 -0700" }, "committer": { "name": "Ralf Baechle", "email": "ralf@linux-mips.org", "time": "Thu Dec 17 01:56:58 2009 +0000" }, "message": "NET: Add driver for Octeon MDIO buses.\n\nThe Octeon SOC has two types of Ethernet ports, each type with its own\ndriver. However, the PHYs for all the ports are controlled by a\ncommon MDIO bus. Because the mdio driver is not associated with a\nparticular driver, but is instead a system level resource, we create s\nstand-alone driver for it.\n\nAs for the driver, we put the register definitions in\narch/mips/include/asm/octeon where most of the other Octeon register\ndefinitions live. This is a platform driver with the platform device\nfor \"mdio-octeon\" being registered in the platform startup code.\n\nSigned-off-by: David Daney \u003cddaney@caviumnetworks.com\u003e\nAcked-by: David S. Miller \u003cdavem@davemloft.net\u003e\nSigned-off-by: Ralf Baechle \u003cralf@linux-mips.org\u003e\n" }, { "commit": "8e95a2026f3b43f7c3d676adaccd2de9532e8dcc", "tree": "3733318168cd512480b6db58c5c16d1c8847f0b7", "parents": [ "3454f835837609d60b29a266e3bd9d701073b060" ], "author": { "name": "Joe Perches", "email": "joe@perches.com", "time": "Thu Dec 03 07:58:21 2009 +0000" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Thu Dec 03 13:18:01 2009 -0800" }, "message": "drivers/net: Move \u0026\u0026 and || to end of previous line\n\nOnly files where David Miller is the primary git-signer.\nwireless, wimax, ixgbe, etc are not modified.\n\nCompile tested x86 allyesconfig only\nNot all files compiled (not x86 compatible)\n\nAdded a few \u003e 80 column lines, which I ignored.\nExisting checkpatch complaints ignored.\n\nSigned-off-by: Joe Perches \u003cjoe@perches.com\u003e\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "3505d1a9fd65e2d3e00827857b6795d9d8983658", "tree": "941cfafdb57c427bb6b7ebf6354ee93b2a3693b5", "parents": [ "dfef948ed2ba69cf041840b5e860d6b4e16fa0b1", "66b00a7c93ec782d118d2c03bd599cfd041e80a1" ], "author": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Wed Nov 18 22:19:03 2009 -0800" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Wed Nov 18 22:19:03 2009 -0800" }, "message": "Merge branch \u0027master\u0027 of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6\n\nConflicts:\n\tdrivers/net/sfc/sfe4001.c\n\tdrivers/net/wireless/libertas/cmd.c\n\tdrivers/staging/Kconfig\n\tdrivers/staging/Makefile\n\tdrivers/staging/rtl8187se/Kconfig\n\tdrivers/staging/rtl8192e/Kconfig\n" }, { "commit": "f99b4a02848afe7fae960884dfa6e7a88f545f09", "tree": "e58f3930b3356ae5e56ea5bd3db555e63bc4fb70", "parents": [ "82b3cc1a2f5e46300a9dec4a8cc8106dc20a4c23" ], "author": { "name": "Stephen Rothwell", "email": "sfr@canb.auug.org.au", "time": "Mon Nov 16 22:47:33 2009 +0000" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Tue Nov 17 04:04:40 2009 -0800" }, "message": "net: fix mdio section mismatch warning\n\nThis fixes the following warning:\n\nWARNING: drivers/net/phy/built-in.o(.devexit.text+0x70): Section mismatch in reference from the function .mdio_gpio_bus_destroy() to the function .devinit.text:.mdio_gpio_bus_deinit()\nThe function __devexit .mdio_gpio_bus_destroy() references\na function __devinit .mdio_gpio_bus_deinit().\nThis is often seen when error handling in the exit function\nuses functionality in the init path.\nThe fix is often to remove the __devinit annotation of\n.mdio_gpio_bus_deinit() so it may be used outside an init section.\n\nSigned-off-by: Stephen Rothwell \u003csfr@canb.auug.org.au\u003e\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "52fae0837153e86e4dabaf5df517a0b8b7a20bd7", "tree": "72259bf0230f7facdbf6d928f8f1f662a133e10b", "parents": [ "c704dc23cac0e433796bfe0a1fe2f1a64da11ac7" ], "author": { "name": "Matt Carlson", "email": "mcarlson@broadcom.com", "time": "Mon Nov 02 14:32:38 2009 +0000" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Mon Nov 02 23:39:15 2009 -0800" }, "message": "tg3 / broadcom: Optionally disable TXC if no link\n\nThis patch adds code to disable the TXC and RXC reference clocks if link\nis not available.\n\nSigned-off-by: Matt Carlson \u003cmcarlson@broadcom.com\u003e\nReviewed-by: Michael Chan \u003cmchan@broadcom.com\u003e\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "c704dc23cac0e433796bfe0a1fe2f1a64da11ac7", "tree": "8fad42adbda6d2911dcb3907b20d440625d292b7", "parents": [ "32e5a8d651c0dbb02bf82ca954206282e44c4b11" ], "author": { "name": "Matt Carlson", "email": "mcarlson@broadcom.com", "time": "Mon Nov 02 14:32:12 2009 +0000" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Mon Nov 02 23:39:13 2009 -0800" }, "message": "tg3 / broadcom: Add APD support for GPHYs\n\nThis patch adds an RXC auto power-down feature to the code that supports\nthe gphys.\n\nSigned-off-by: Matt Carlson \u003cmcarlson@broadcom.com\u003e\nReviewed-by: Michael Chan \u003cmchan@broadcom.com\u003e\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "32e5a8d651c0dbb02bf82ca954206282e44c4b11", "tree": "7d8508afb30951c46e3e1edab56f9e664e833275", "parents": [ "cdd4e09d692bd4f3457b3789279005e112b7696d" ], "author": { "name": "Matt Carlson", "email": "mcarlson@broadcom.com", "time": "Mon Nov 02 14:31:39 2009 +0000" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Mon Nov 02 23:39:13 2009 -0800" }, "message": "tg3 / broadcom: Add code to disable rxc refclk\n\nThe 5785 does not use the RXC reference clock. Turning it off is\ndesirable as it saves power.\n\nBy default, the 50610 enables the RXC reference clock and the 50610M\ndisables it. Presumably this is one of the reasons why the hardware\narchitect chose one over the other.\n\nAdding a \"rx reference clock disable\" flag is not the ideal way to\ndescribe the option, as it would force the MAC using a 50610M to set\nthe flag. Ideally we want the flags to represent opt-in behavior that\ndeviates from hardware defaults. Furthermore, the lack of a\n\"disable\" flag implies that the requester wants the rx reference clock\nenabled, which doesn\u0027t necessarily follow.\n\nBy presenting the option as a passive statement (rx reference clock\nunused) rather than a command, I hope to convey an opt-in option to\ndisable the rx reference clock that falls back to hardware defaults if\nnot set. A secondary benefit of this is that it keeps the\nintelligence about phy defaults in the broadcom module where it belongs\nand allows the broadcom module more latitude should a bug arise.\n\nSigned-off-by: Matt Carlson \u003cmcarlson@broadcom.com\u003e\nReviewed-by: Michael Chan \u003cmchan@broadcom.com\u003e\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "cdd4e09d692bd4f3457b3789279005e112b7696d", "tree": "25a7619a2cd9dc2ab787fd768bda96c8f507243d", "parents": [ "63a14ce449dd6d647de2725809159eb072b2c44f" ], "author": { "name": "Matt Carlson", "email": "mcarlson@broadcom.com", "time": "Mon Nov 02 14:31:11 2009 +0000" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Mon Nov 02 23:39:12 2009 -0800" }, "message": "tg3 / broadcom: Refine AC131 APD support\n\nAuto power-down (APD) support is a power-saving feature. It should be\nselectively enabled since it might expose MAC bugs. This patch changes\nthe code to enable APD only if the PHY_BRCM_AUTO_PWRDWN_ENABLE flag is\nset. The tg3 driver was changed to set this bit.\n\nSigned-off-by: Matt Carlson \u003cmcarlson@broadcom.com\u003e\nReviewed-by: Michael Chan \u003cmchan@broadcom.com\u003e\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "63a14ce449dd6d647de2725809159eb072b2c44f", "tree": "d4db22459a237188aefc2c5bc3ee35374443fe1e", "parents": [ "8649f13d2d810406da444a6101906041b796fbde" ], "author": { "name": "Matt Carlson", "email": "mcarlson@broadcom.com", "time": "Mon Nov 02 14:30:40 2009 +0000" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Mon Nov 02 23:39:11 2009 -0800" }, "message": "tg3 / broadcom: Add PHY_BRCM_CLEAR_RGMII_MODE flag\n\nBroadcom 50610M parts changed the default definitions of the RGMII mode\nshadow register. The 5785 needs the RGMII mode selection bits [4:3]\ncleared.\n\nThe default value of the remaining bits in this register are zero.\nRather than unnecessarily burn an extra bit in the dev_flags member in\nan attempt to enumerate all possible combinations, this patch take a\nmore course grained approach and labels the option as \"clear all bits\".\n\nSigned-off-by: Matt Carlson \u003cmcarlson@broadcom.com\u003e\nReviewed-by: Michael Chan \u003cmchan@broadcom.com\u003e\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "8649f13d2d810406da444a6101906041b796fbde", "tree": "9c1acaf66673c3ffa2b0eaedc6d2508ac176d048", "parents": [ "c73430d04ec75962e20e186d34c40b6d999f0968" ], "author": { "name": "Matt Carlson", "email": "mcarlson@broadcom.com", "time": "Mon Nov 02 14:30:00 2009 +0000" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Mon Nov 02 23:39:11 2009 -0800" }, "message": "broadcom: Consolidate dev_flags definitions\n\nThis patch moves all the dev_flags enumerations outside the broadcom.c\nfile to include/linux/brcmphy.h. The existing flags were not used yet\nand have been re-enumerated to avoid conflicts.\n\nSigned-off-by: Matt Carlson \u003cmcarlson@broadcom.com\u003e\nReviewed-by: Michael Chan \u003cmchan@broadcom.com\u003e\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "219c6efefaa3f5cd05db52cda50402b2e1c9ae21", "tree": "edffeda5c25cbad045e478b2b4080c7d77134def", "parents": [ "47b1b53b41d63f27b308981fde307d415e514431" ], "author": { "name": "Matt Carlson", "email": "mcarlson@broadcom.com", "time": "Mon Nov 02 14:28:33 2009 +0000" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Mon Nov 02 23:39:09 2009 -0800" }, "message": "broadcom: Fix slow link problem\n\nWhen a 50610 or 50610M is paired against particular remote partners,\nlink is slow to come up. This patch works around the problem.\n\nSigned-off-by: Matt Carlson \u003cmcarlson@broadcom.com\u003e\nReviewed-by: Michael Chan \u003cmchan@broadcom.com\u003e\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "47b1b53b41d63f27b308981fde307d415e514431", "tree": "a0e9a1b9ad067f73785325622aaca6322a7f021e", "parents": [ "303fc9218246a748304c005e629d658927cf12d0" ], "author": { "name": "Matt Carlson", "email": "mcarlson@broadcom.com", "time": "Mon Nov 02 14:28:04 2009 +0000" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Mon Nov 02 23:39:09 2009 -0800" }, "message": "broadcom: Isolate phy dsp accesses\n\nThis patch consolidates the code that requires the SMDSP clock to be\nenabled into a single function that (hopefully) makes the dependency\nobvious.\n\nSigned-off-by: Matt Carlson \u003cmcarlson@broadcom.com\u003e\nReviewed-by: Michael Chan \u003cmchan@broadcom.com\u003e\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "e72701acbe0b35e52d3f04d442837c06b4e64f1c", "tree": "2a8edc6952e79c3d2ee3bdf7690ed1a6f2e7bcc6", "parents": [ "0fe7463a35aadfaf22d1ca58325ab3851b8d757c" ], "author": { "name": "Anton Vorontsov", "email": "avorontsov@ru.mvista.com", "time": "Wed Oct 14 14:54:52 2009 -0700" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Wed Oct 14 14:54:52 2009 -0700" }, "message": "net: Fix OF platform drivers coldplug/hotplug when compiled as modules\n\nSome OF platform drivers are missing module device tables, so they won\u0027t\nload automatically on boot. This patch fixes the issue by adding proper\nMODULE_DEVICE_TABLE() macros to the drivers.\n\nSigned-off-by: Anton Vorontsov \u003cavorontsov@ru.mvista.com\u003e\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "8ff44985c761ad6697a3c97e7b14cf5362ff3801", "tree": "3f9903a9573ea74938c8ff66be449e1d0a965dba", "parents": [ "a4b11649618ef5366ee553f4083449d6bee5d8ec" ], "author": { "name": "Anton Vorontsov", "email": "avorontsov@ru.mvista.com", "time": "Wed Sep 09 16:01:30 2009 +0000" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Fri Sep 11 12:54:38 2009 -0700" }, "message": "phy/marvell: Make non-aneg speed/duplex forcing work for 88E1111 PHYs\n\nAccording to specs, when auto-negotiation is disabled, Marvell PHYs need\na software reset after changing speed/duplex forcing bits. Otherwise,\nthe modified bits have no effect.\n\nSigned-off-by: Anton Vorontsov \u003cavorontsov@ru.mvista.com\u003e\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "a4b11649618ef5366ee553f4083449d6bee5d8ec", "tree": "50d7ffad6a9d1ab544e8ef6b7d9e0ec93ba6bb17", "parents": [ "966a5d1b85c45f1b55abbc1b595e0b5ca14b87db" ], "author": { "name": "Julia Lawall", "email": "julia@diku.dk", "time": "Fri Sep 11 06:22:09 2009 +0000" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Fri Sep 11 12:54:34 2009 -0700" }, "message": "drivers/net/phy: introduce missing kfree\n\nError handling code following a kzalloc should free the allocated data.\n\nThe semantic match that finds the problem is as follows:\n(http://www.emn.fr/x-info/coccinelle/)\n\n// \u003csmpl\u003e\n@r exists@\nlocal idexpression x;\nstatement S;\nexpression E;\nidentifier f,f1,l;\nposition p1,p2;\nexpression *ptr !\u003d NULL;\n@@\n\nx@p1 \u003d \\(kmalloc\\|kzalloc\\|kcalloc\\)(...);\n...\nif (x \u003d\u003d NULL) S\n\u003c... when !\u003d x\n when !\u003d if (...) { \u003c+...x...+\u003e }\n(\nx-\u003ef1 \u003d E\n|\n (x-\u003ef1 \u003d\u003d NULL || ...)\n|\n f(...,x-\u003ef1,...)\n)\n...\u003e\n(\n return \\(0\\|\u003c+...x...+\u003e\\|ptr\\);\n|\n return@p2 ...;\n)\n\n@script:python@\np1 \u003c\u003c r.p1;\np2 \u003c\u003c r.p2;\n@@\n\nprint \"* file: %s kmalloc %s return %s\" % (p1[0].file,p1[0].line,p2[0].line)\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": "7ab0f2736bfe137a82a7084bbfb5f809da95cabd", "tree": "e305ec96eceebb285efee4b6fd307822ab257fe6", "parents": [ "aae5e7c30fc660c50dfecbdd745799b05af90f01" ], "author": { "name": "Ben Hutchings", "email": "bhutchings@solarflare.com", "time": "Thu Sep 03 10:39:43 2009 +0000" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Thu Sep 03 20:02:11 2009 -0700" }, "message": "netdev: Remove redundant checks for CAP_NET_ADMIN in MDIO implementations\n\ndev_ioctl() already checks capable(CAP_NET_ADMIN) before calling the\ndriver\u0027s implementation of MDIO ioctls.\n\nSigned-off-by: Ben Hutchings \u003cbhutchings@solarflare.com\u003e\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "d9221e66002a7f24fb71b73132aa46c40079745f", "tree": "88ce75dfe2afa91b853e0cb714b87aeb3b2a5a1f", "parents": [ "d7a2ed9248a3c3ec6afe3be0c351bd1ca9e981f3" ], "author": { "name": "Matt Carlson", "email": "mcarlson@broadcom.com", "time": "Tue Aug 25 10:11:26 2009 +0000" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Wed Aug 26 15:48:06 2009 -0700" }, "message": "broadcom: Make the 57780 IEEE compliant\n\nThis brings the 57780\u0027s phy into IEEE compliance by suppressing the\ncommon mode oscillation.\n\nSigned-off-by: Matt Carlson \u003cmcarlson@broadcom.com\u003e\nReviewed-by: Michael Chan \u003cmchan@broadcom.com\u003e\nReviewed-by: Benjamin Li \u003cbenli@broadcom.com\u003e\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "d7a2ed9248a3c3ec6afe3be0c351bd1ca9e981f3", "tree": "ed0ffe22e8a4651862710f421b61deba96b040c8", "parents": [ "4f4598fd0a87f39955e71bcb7447f403dafc20ba" ], "author": { "name": "Matt Carlson", "email": "mcarlson@broadcom.com", "time": "Tue Aug 25 10:10:58 2009 +0000" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Wed Aug 26 15:48:05 2009 -0700" }, "message": "broadcom: Add AC131 phy support\n\nThis patch adds support for the AC131 fast ethernet transceiver.\n\nSigned-off-by: Matt Carlson \u003cmcarlson@broadcom.com\u003e\nReviewed-by: Michael Chan \u003cmchan@broadcom.com\u003e\nReviewed-by: Benjamin Li \u003cbenli@broadcom.com\u003e\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "4f4598fd0a87f39955e71bcb7447f403dafc20ba", "tree": "fdf3974753e761169f84e5b92dfb12e651b5cd8f", "parents": [ "7f97a4bd47291e4ec9b9eaf63d7275ddfb498cb3" ], "author": { "name": "Matt Carlson", "email": "mcarlson@broadcom.com", "time": "Tue Aug 25 10:10:30 2009 +0000" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Wed Aug 26 15:48:03 2009 -0700" }, "message": "broadcom: Add BCM50610M support\n\nThis patch adds support for the BCM50610M phy ID.\n\nSigned-off-by: Matt Carlson \u003cmcarlson@broadcom.com\u003e\nReviewed-by: Michael Chan \u003cmchan@broadcom.com\u003e\nReviewed-by: Benjamin Li \u003cbenli@broadcom.com\u003e\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "74d154189d597b91da4322996dbf4f5c3d1544ab", "tree": "6f09861b5e2f875d2d8ea2127b16add9103221c6", "parents": [ "5a6338db37885af06760d40cad589316e48431e9", "ffafa60d496f80c250f2ae0340ae94434c0b0b4d" ], "author": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Thu Jul 23 19:03:51 2009 -0700" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Thu Jul 23 19:03:51 2009 -0700" }, "message": "Merge branch \u0027master\u0027 of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6\n\nConflicts:\n\tdrivers/net/wireless/iwmc3200wifi/netdev.c\n\tnet/wireless/scan.c\n" } ], "next": "dacac4da5290ee3f3f413bd6980af2befb813e28" }