)]}' { "log": [ { "commit": "82251de2a2b7b84987dde104d48a765b63170149", "tree": "904a0301adabc84939483373f9bbc496c4209417", "parents": [ "eb71d0d63fdd04b1f63243917a6fad7427827ee7" ], "author": { "name": "David Daney", "email": "david.daney@cavium.com", "time": "Tue May 15 10:46:52 2012 +0000" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Wed May 16 00:59:12 2012 -0400" }, "message": "netdev/phy: Make get_phy_id() static and quit EXPORTing it.\n\nThis function is only referenced from within phy_device.c, so there is\nno reason to export it. In fact, we can make it static.\n\nSigned-off-by: David Daney \u003cdavid.daney@cavium.com\u003e\nAcked-by: Paul Gortmaker \u003cpaul.gortmaker@windriver.com\u003e\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "b943fbb09036bf7ff8e780af511a21576fe60a1e", "tree": "4e7a6468b55b16a3baa471fc644802b9a1b112eb", "parents": [ "16c788dee1934c2cc4e98692a5a63132d6e07d50" ], "author": { "name": "Bjørn Mork", "email": "bjorn@mork.no", "time": "Fri May 11 05:47:01 2012 +0000" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Fri May 11 18:03:03 2012 -0400" }, "message": "net: of/phy: fix build error when phylib is built as a module\n\nCONFIG_OF_MDIO is tristate and will be m if PHYLIB is m. Use\nIS_ENABLED macro to prevent build error:\n\n ERROR: \"of_mdio_find_bus\" [drivers/net/phy/mdio-mux.ko] undefined!\n\nReported-by: Randy Dunlap \u003crdunlap@xenotime.net\u003e\nCc: David Daney \u003cdavid.daney@cavium.com\u003e\nSigned-off-by: Bjørn Mork \u003cbjorn@mork.no\u003e\nAcked-by: David Daney \u003cdavid.daney@cavium.com\u003e\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "416912a129349788372e6ac27ab86bd9b18c8cc0", "tree": "239766992fc6878f89cce3037f65f757fc880dae", "parents": [ "0ca2997d145268e6b4ef000692061849cdab8348" ], "author": { "name": "David Daney", "email": "david.daney@cavium.com", "time": "Wed May 02 15:16:39 2012 +0000" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Mon May 07 22:58:09 2012 -0400" }, "message": "netdev/of/phy: Add MDIO bus multiplexer driven by GPIO lines.\n\nThe GPIO pins select which sub bus is connected to the master.\n\nInitially tested with an sn74cbtlv3253 switch device wired into the\nMDIO bus.\n\nSigned-off-by: David Daney \u003cdavid.daney@cavium.com\u003e\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "0ca2997d145268e6b4ef000692061849cdab8348", "tree": "deeca7985f029cae477945e988816889c986e263", "parents": [ "251060220021283eef3652145a41f5b26db97ce5" ], "author": { "name": "David Daney", "email": "david.daney@cavium.com", "time": "Wed May 02 15:16:38 2012 +0000" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Mon May 07 22:58:09 2012 -0400" }, "message": "netdev/of/phy: Add MDIO bus multiplexer support.\n\nThis patch adds a somewhat generic framework for MDIO bus\nmultiplexers. It is modeled on the I2C multiplexer.\n\nThe multiplexer is needed if there are multiple PHYs with the same\naddress connected to the same MDIO bus adepter, or if there is\ninsufficient electrical drive capability for all the connected PHY\ndevices.\n\nConceptually it could look something like this:\n\n ------------------\n | Control Signal |\n --------+---------\n |\n --------------- --------+------\n | MDIO MASTER |---| Multiplexer |\n --------------- --+-------+----\n | |\n C C\n h h\n i i\n l l\n d d\n | |\n --------- A B ---------\n | | | | | |\n | PHY@1 +-------+ +---+ PHY@1 |\n | | | | | |\n --------- | | ---------\n --------- | | ---------\n | | | | | |\n | PHY@2 +-------+ +---+ PHY@2 |\n | | | |\n --------- ---------\n\nThis framework configures the bus topology from device tree data. The\nmechanics of switching the multiplexer is left to device specific\ndrivers.\n\nThe follow-on patch contains a multiplexer driven by GPIO lines.\n\nSigned-off-by: David Daney \u003cdavid.daney@cavium.com\u003e\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "251060220021283eef3652145a41f5b26db97ce5", "tree": "e04d2a1695e19e959873cf8a6d571a925ca59cc5", "parents": [ "7dc2ce5f12cb5d166140820d5063027dc2449ac1" ], "author": { "name": "David Daney", "email": "david.daney@cavium.com", "time": "Wed May 02 15:16:37 2012 +0000" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Mon May 07 22:58:09 2012 -0400" }, "message": "netdev/of/phy: New function: of_mdio_find_bus().\n\nAdd of_mdio_find_bus() which allows an mii_bus to be located given its\nassociated the device tree node.\n\nThis is needed by the follow-on patch to add a driver for MDIO bus\nmultiplexers.\n\nThe of_mdiobus_register() function is modified so that the device tree\nnode is recorded in the mii_bus. Then we can find it again by\niterating over all mdio_bus_class devices.\n\nBecause the OF device tree has now become an integral part of the\nkernel, this can live in mdio_bus.c (which contains the needed\nmdio_bus_class structure) instead of of_mdio.c.\n\nSigned-off-by: David Daney \u003cdavid.daney@cavium.com\u003e\nCc: Grant Likely \u003cgrant.likely@secretlab.ca\u003e\nCc: \"David S. Miller\" \u003cdavem@davemloft.net\u003e\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "f24001941c99776f41bd3f09c07d91205c2ad9d4", "tree": "0ab31480ccdf343b61db045e195d096068ef7c73", "parents": [ "a108d5f35adc5c5d5cdc882dc0bb920565551bff", "4d634ca35a8b38530b134ae92bc9e3cc9c23c030" ], "author": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Mon Apr 23 23:14:36 2012 -0400" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Mon Apr 23 23:15:17 2012 -0400" }, "message": "Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net\n\nFix merge between commit 3adadc08cc1e (\"net ax25: Reorder ax25_exit to\nremove races\") and commit 0ca7a4c87d27 (\"net ax25: Simplify and\ncleanup the ax25 sysctl handling\")\n\nThe former moved around the sysctl register/unregister calls, the\nlater simply removed them.\n\nWith help from Stephen Rothwell.\n\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "996f73937cd85031da8dbcd3222a710cb762d428", "tree": "c2d2d7cb2473b6f3ffeed07e40aafd0cc0af88c5", "parents": [ "3bc17d10c9f8ac67eb474737d74894ef2e60d27c" ], "author": { "name": "Giuseppe CAVALLARO", "email": "peppe.cavallaro@st.com", "time": "Tue Apr 17 21:16:40 2012 +0000" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Thu Apr 19 15:34:18 2012 -0400" }, "message": "icplus: fix interrupt for IC+ 101A/G and 1001LF\n\nThis patch fixes and adds the irq handler for the\nIC+ 101A/G where we need to read the reg17 to clean\nthe irq.\nAlso remove the flag for the 1001LF where no interrupt\ncan be used for this device.\n\nSigned-off-by: Giuseppe Cavallaro \u003cpeppe.cavallaro@st.com\u003e\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "60dfc629f8f7915e5411812ea0d009f5331577b4", "tree": "7d429192cd910819c7fb854c70486ed499dedcd2", "parents": [ "6f66cdc3e5d3d5ccbb7ee9265b8211cdc24aa401" ], "author": { "name": "Lars-Peter Clausen", "email": "lars@metafoo.de", "time": "Tue Apr 10 10:51:29 2012 +0000" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Fri Apr 13 13:13:38 2012 -0400" }, "message": "net: Remove redundant spi driver bus initialization\n\nIn ancient times it was necessary to manually initialize the bus field of an\nspi_driver to spi_bus_type. These days this is done in spi_driver_register() so\nwe can drop the manual assignment.\n\nThe patch was generated using the following coccinelle semantic patch:\n// \u003csmpl\u003e\n@@\nidentifier _driver;\n@@\nstruct spi_driver _driver \u003d {\n\t.driver \u003d {\n-\t\t.bus \u003d \u0026spi_bus_type,\n\t},\n};\n// \u003c/smpl\u003e\n\nSigned-off-by: Lars-Peter Clausen \u003clars@metafoo.de\u003e\nCc: \"David S. Miller\" \u003cdavem@davemloft.net\u003e\nCc: Gabor Juhos \u003cjuhosg@openwrt.org\u003e\nCc: Frederic Lambert \u003cfrdrc66@gmail.com\u003e\nCc: netdev@vger.kernel.org\nAcked-by: Gabor Juhos \u003cjuhosg@openwrt.org\u003e\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "06eb4eafbdc0796d741d139a44f1253278da8611", "tree": "fbdb44317130c371928154c9e6903e699fe2b995", "parents": [ "32ed53b83ea5ec26a4dba90e18f5e0ff6c71eb48", "f68e556e23d1a4176b563bcb25d8baf2c5313f91" ], "author": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Tue Apr 10 14:30:45 2012 -0400" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Tue Apr 10 14:30:45 2012 -0400" }, "message": "Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net\n" }, { "commit": "7dff34998853dbb37ee705c48eca32d69c8b88aa", "tree": "421e28e2dfc47d1c81038f912318c33f719237af", "parents": [ "c8f3a8c31069137fe0100e6920558f1a7487ef3c" ], "author": { "name": "Richard Cochran", "email": "richardcochran@gmail.com", "time": "Tue Apr 03 22:59:18 2012 +0000" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Wed Apr 04 05:28:45 2012 -0400" }, "message": "dp83640: Support the get_ts_info ethtool method.\n\nSigned-off-by: Richard Cochran \u003crichardcochran@gmail.com\u003e\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "cc90cb3b2429a0f0681331fa5c501f91eee4f633", "tree": "72389fd02882c4fcb2bd1e83273f818b91d89e33", "parents": [ "8bc47ec6efd4d447f3502d9f9d41fe440cd5854d" ], "author": { "name": "Srinivas Kandagatla", "email": "srinivas.kandagatla@st.com", "time": "Mon Apr 02 06:25:24 2012 +0000" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Tue Apr 03 19:02:00 2012 -0400" }, "message": "net:phy:marvell: remove unnecessary code\n\nCompile tested.\nremove unnecessary code that matches this coccinelle pattern\n\n\tret \u003d phy_write(x, y , z)\n\tif (ret \u003c 0)\n\t \treturn ret;\n\treturn 0;\n\nAs phy_write returns error code, we dont need to do not need extra check\nbefore returning.\n\nSigned-off-by: Srinivas Kandagatla \u003csrinivas.kandagatla@st.com\u003e\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "8bc47ec6efd4d447f3502d9f9d41fe440cd5854d", "tree": "dd55998070d2e8b482fb09dd239d392b01016d5c", "parents": [ "a25cc43ebb9cdf1cd9623fcdf5009e0a72288f69" ], "author": { "name": "Srinivas Kandagatla", "email": "srinivas.kandagatla@st.com", "time": "Mon Apr 02 06:25:11 2012 +0000" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Tue Apr 03 19:02:00 2012 -0400" }, "message": "net:phy:davicom: remove unnecessary code\n\nCompile tested.\nremove unnecessary code that matches this coccinelle pattern\n\n\tret \u003d phy_write(x, y , z)\n\tif (ret \u003c 0)\n\t\treturn ret;\n\treturn 0;\n\nAs phy_write returns error code, we dont need to do not need extra check\nbefore returning.\n\nSigned-off-by: Srinivas Kandagatla \u003csrinivas.kandagatla@st.com\u003e\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "a25cc43ebb9cdf1cd9623fcdf5009e0a72288f69", "tree": "c8b51b3e7890a6da78aa72a3114f2e6cf04f935c", "parents": [ "99427747fbd0b29f2bebc74c697acfd435fecc3f" ], "author": { "name": "Srinivas Kandagatla", "email": "srinivas.kandagatla@st.com", "time": "Mon Apr 02 06:24:55 2012 +0000" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Tue Apr 03 19:02:00 2012 -0400" }, "message": "net:phy:bcm63xx: remove unnecessary code\n\nCompile tested.\nremove unnecessary code that matches this coccinelle pattern\n\n\tret \u003d phy_write(x, y , z)\n\tif (ret \u003c 0)\n\t\treturn ret;\n\treturn 0;\n\nAs phy_write returns error code, we dont need to do not need extra check\nbefore returning.\n\nSigned-off-by: Srinivas Kandagatla \u003csrinivas.kandagatla@st.com\u003e\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "b3300146aa8efc5d3937fd33f3cfdc580a3843bc", "tree": "89d0f63b53d8412bec93f4da8c5edf2ea4066dda", "parents": [ "6fc8cc3fd1c8c9cbc2597b4929bf21a814bebd83" ], "author": { "name": "Srinivas Kandagatla", "email": "srinivas.kandagatla@st.com", "time": "Mon Apr 02 00:02:09 2012 +0000" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Tue Apr 03 18:48:58 2012 -0400" }, "message": "phy:icplus:fix Auto Power Saving in ip101a_config_init.\n\nThis patch fixes Auto Power Saving configuration in ip101a_config_init\nwhich was broken as there is no phy register write followed after\nsetting IP101A_APS_ON flag.\n\nThis patch also fixes the return value of ip101a_config_init.\n\nWithout this patch ip101a_config_init returns 2 which is not an error\naccroding to IS_ERR and the mac driver will continue accessing 2 as\nvalid pointer to phy_dev resulting in memory fault.\n\nSigned-off-by: Srinivas Kandagatla \u003csrinivas.kandagatla@st.com\u003e\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "c207f3a43194e108dda43dc9a1ce507335cff6b9", "tree": "55880f8301e8546b1908f69947d0d41aaa044814", "parents": [ "c7c66c0cb0c77b1a8edf09bca57d922312d58030", "e7cc3aca0f6a36b018934264ee20bee45dc13e29" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Wed Mar 21 10:27:19 2012 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Wed Mar 21 10:27:19 2012 -0700" }, "message": "Merge tag \u0027irqdomain-for-linus\u0027 of git://git.secretlab.ca/git/linux-2.6\n\nPull irq_domain support for all architectures from Grant Likely:\n \"Generialize powerpc\u0027s irq_host as irq_domain\n\n This branch takes the PowerPC irq_host infrastructure (reverse mapping\n from Linux IRQ numbers to hardware irq numbering), generalizes it,\n renames it to irq_domain, and makes it available to all architectures.\n\n Originally the plan has been to create an all-new irq_domain\n implementation which addresses some of the powerpc shortcomings such\n as not handling 1:1 mappings well, but doing that proved to be far\n more difficult and invasive than generalizing the working code and\n refactoring it in-place. So, this branch rips out the \u0027new\u0027\n irq_domain and replaces it with the modified powerpc version (in a\n fully bisectable way of course). It converts all users over to the\n new API and makes irq_domain selectable on any architecture.\n\n No architecture is forced to enable irq_domain, but the infrastructure\n is required for doing OpenFirmware style irq translations. It will\n even work on SPARC even though SPARC has it\u0027s own mechanism for\n translating irqs at boot time. MIPS, microblaze, embedded x86 and c6x\n are converted too.\n\n The resulting irq_domain code is probably still too verbose and can be\n optimized more, but that can be done incrementally and is a task for\n follow-on patches.\"\n\n* tag \u0027irqdomain-for-linus\u0027 of git://git.secretlab.ca/git/linux-2.6: (31 commits)\n dt: fix twl4030 for non-dt compile on x86\n mfd: twl-core: Add IRQ_DOMAIN dependency\n devicetree: Add empty of_platform_populate() for !CONFIG_OF_ADDRESS (sparc)\n irq_domain: Centralize definition of irq_dispose_mapping()\n irq_domain/mips: Allow irq_domain on MIPS\n irq_domain/x86: Convert x86 (embedded) to use common irq_domain\n ppc-6xx: fix build failure in flipper-pic.c and hlwd-pic.c\n irq_domain/microblaze: Convert microblaze to use irq_domains\n irq_domain/powerpc: Replace custom xlate functions with library functions\n irq_domain/powerpc: constify irq_domain_ops\n irq_domain/c6x: Use library of xlate functions\n irq_domain/c6x: constify irq_domain structures\n irq_domain/c6x: Convert c6x to use generic irq_domain support.\n irq_domain: constify irq_domain_ops\n irq_domain: Create common xlate functions that device drivers can use\n irq_domain: Remove irq_domain_add_simple()\n irq_domain: Remove \u0027new\u0027 irq_domain in favour of the ppc one\n mfd: twl-core.c: Fix the number of interrupts managed by twl4030\n of/address: add empty static inlines for !CONFIG_OF\n irq_domain: Add support for base irq and hwirq in legacy mappings\n ...\n" }, { "commit": "3b59bf081622b6446db77ad06c93fe23677bc533", "tree": "3f4bb5a27c90cc86994a1f6d3c53fbf9208003cb", "parents": [ "e45836fafe157df137a837093037f741ad8f4c90", "bbdb32cb5b73597386913d052165423b9d736145" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Tue Mar 20 21:04:47 2012 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Tue Mar 20 21:04:47 2012 -0700" }, "message": "Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-next\n\nPull networking merge from David Miller:\n \"1) Move ixgbe driver over to purely page based buffering on receive.\n From Alexander Duyck.\n\n 2) Add receive packet steering support to e1000e, from Bruce Allan.\n\n 3) Convert TCP MD5 support over to RCU, from Eric Dumazet.\n\n 4) Reduce cpu usage in handling out-of-order TCP packets on modern\n systems, also from Eric Dumazet.\n\n 5) Support the IP{,V6}_UNICAST_IF socket options, making the wine\n folks happy, from Erich Hoover.\n\n 6) Support VLAN trunking from guests in hyperv driver, from Haiyang\n Zhang.\n\n 7) Support byte-queue-limtis in r8169, from Igor Maravic.\n\n 8) Outline code intended for IP_RECVTOS in IP_PKTOPTIONS existed but\n was never properly implemented, Jiri Benc fixed that.\n\n 9) 64-bit statistics support in r8169 and 8139too, from Junchang Wang.\n\n 10) Support kernel side dump filtering by ctmark in netfilter\n ctnetlink, from Pablo Neira Ayuso.\n\n 11) Support byte-queue-limits in gianfar driver, from Paul Gortmaker.\n\n 12) Add new peek socket options to assist with socket migration, from\n Pavel Emelyanov.\n\n 13) Add sch_plug packet scheduler whose queue is controlled by\n userland daemons using explicit freeze and release commands. From\n Shriram Rajagopalan.\n\n 14) Fix FCOE checksum offload handling on transmit, from Yi Zou.\"\n\n* git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-next: (1846 commits)\n Fix pppol2tp getsockname()\n Remove printk from rds_sendmsg\n ipv6: fix incorrent ipv6 ipsec packet fragment\n cpsw: Hook up default ndo_change_mtu.\n net: qmi_wwan: fix build error due to cdc-wdm dependecy\n netdev: driver: ethernet: Add TI CPSW driver\n netdev: driver: ethernet: add cpsw address lookup engine support\n phy: add am79c874 PHY support\n mlx4_core: fix race on comm channel\n bonding: send igmp report for its master\n fs_enet: Add MPC5125 FEC support and PHY interface selection\n net: bpf_jit: fix BPF_S_LDX_B_MSH compilation\n net: update the usage of CHECKSUM_UNNECESSARY\n fcoe: use CHECKSUM_UNNECESSARY instead of CHECKSUM_PARTIAL on tx\n net: do not do gso for CHECKSUM_UNNECESSARY in netif_needs_gso\n ixgbe: Fix issues with SR-IOV loopback when flow control is disabled\n net/hyperv: Fix the code handling tx busy\n ixgbe: fix namespace issues when FCoE/DCB is not enabled\n rtlwifi: Remove unused ETH_ADDR_LEN defines\n igbvf: Use ETH_ALEN\n ...\n\nFix up fairly trivial conflicts in drivers/isdn/gigaset/interface.c and\ndrivers/net/usb/{Kconfig,qmi_wwan.c} as per David.\n" }, { "commit": "49099122a403b907dc12a5e66033678a07c68ba3", "tree": "6531b7cca21ea91ca6285bfedff244ce10a07292", "parents": [ "58a3de0592454c216c68427fa3c31a34823f5115" ], "author": { "name": "Heiko Schocher", "email": "hs@denx.de", "time": "Sun Mar 18 11:03:05 2012 +0000" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Mon Mar 19 18:02:05 2012 -0400" }, "message": "phy: add am79c874 PHY support\n\nSigned-off-by: Heiko Schocher \u003chs@denx.de\u003e\nSigned-off-by: Anatolij Gustschin \u003cagust@denx.de\u003e\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "c2ec3ff6b8712f5d951927d7774c805fe3270caa", "tree": "99245281ae8c686cf6ee5b63dd6e387d2748c7a5", "parents": [ "126a3fd251b244eabd9ab9dcb32b8b6f999c1b91" ], "author": { "name": "Richard Cochran", "email": "richardcochran@gmail.com", "time": "Fri Mar 16 22:39:29 2012 +0000" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Sat Mar 17 01:41:43 2012 -0700" }, "message": "phc: Update author\u0027s email address.\n\nThis commit brings the author email address macros up to date for four\nmodules in the PTP Hardware Clock subsystem.\n\nSigned-off-by: Richard Cochran \u003crichardcochran@gmail.com\u003e\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "263a5c8e16c34199ddf6de3f102e789ffa3ee26e", "tree": "4f049e339d522b2ab0ba3bed3ec217e4bbc83d35", "parents": [ "54d20f006ceff1f2f1e69d0e54049b6c0765c039", "192cfd58774b4d17b2fe8bdc77d89c2ef4e0591d" ], "author": { "name": "Greg Kroah-Hartman", "email": "gregkh@linuxfoundation.org", "time": "Fri Mar 09 12:35:53 2012 -0800" }, "committer": { "name": "Greg Kroah-Hartman", "email": "gregkh@linuxfoundation.org", "time": "Fri Mar 09 12:35:53 2012 -0800" }, "message": "Merge 3.3-rc6 into driver-core-next\n\nThis was done to resolve a conflict in the drivers/base/cpu.c file.\n\nSigned-off-by: Greg Kroah-Hartman \u003cgregkh@linuxfoundation.org\u003e\n" }, { "commit": "ff4783ce78c08d2990126ce1874250ae8e72bbd2", "tree": "5c95885a4ab768101dd72942b57c238d452a7565", "parents": [ "622121719934f60378279eb440d3cec2fc3176d2", "203738e548cefc3fc3c2f73a9063176c9f3583d5" ], "author": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Sun Feb 26 21:55:51 2012 -0500" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Sun Feb 26 21:55:51 2012 -0500" }, "message": "Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net\n\nConflicts:\n\tdrivers/net/ethernet/sfc/rx.c\n\nOverlapping changes in drivers/net/ethernet/sfc/rx.c, one to change\nthe rx_buf-\u003eis_page boolean into a set of u16 flags, and another to\nadjust how -\u003eip_summed is initialized.\n\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "e3e09f2645b435062a34a2587a32ae8e5a5b48ab", "tree": "4eaf80a913007921438c51ca49df2f4028020dde", "parents": [ "b8e3995af4c7da7707b1710332a31f66e06b74dc" ], "author": { "name": "Giuseppe CAVALLARO", "email": "peppe.cavallaro@st.com", "time": "Tue Feb 21 21:26:28 2012 +0000" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Thu Feb 23 17:14:26 2012 -0500" }, "message": "phy: IC+101G and PHY_HAS_INTERRUPT flag\n\nThis patch adds the PHY_HAS_INTERRUPT flag for IC+101 device series.\nAlso the patch does a simple dity-up to signal that\nthe driver actually is for IP101A LF and IP101G devices.\nIn fact, these are two similar PHYs that have the same IDs\nand mainly differ for the EEE capability supported in the\nG series.\n\nSigned-off-by: Giuseppe Cavallaro \u003cpeppe.cavallaro@st.com\u003e\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "b8e3995af4c7da7707b1710332a31f66e06b74dc", "tree": "486ef40d3989e1abcaabe32666dc0615bd90740e", "parents": [ "03606895cd98c0a628b17324fd7b5ff15db7e3cd" ], "author": { "name": "David McKay", "email": "david.mckay@st.com", "time": "Tue Feb 21 21:24:57 2012 +0000" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Thu Feb 23 17:14:26 2012 -0500" }, "message": "netdev/phy/icplus: Correct broken phy_init code\n\nThe code for ip1001_config_init() was totally broken if you were not\nusing RGMII. Instead of returning an error code or zero it actually\nreturned the value in the IP1001_SPEC_CTRL_STATUS_2 register. It was\nalso trying to set the IP1001_APS_ON bit , but never actually wrote\nback the register.\n\nThe error checking was also incorrect in both this function and the\nreset function, so this patch fixes that up in a consistent fashion.\n\nSigned-off-by: David McKay \u003cdavid.mckay@st.com\u003e\nSigned-off-by: Giuseppe Cavallaro \u003cpeppe.cavallaro@st.com\u003e\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "b4e518547da042fdc65bd4bdafd046fed13337d5", "tree": "822699cd36da40399119d11b4820513af2eb22a7", "parents": [ "6d166fec12967063e0e709a935bba8c48fcde99e" ], "author": { "name": "Grant Likely", "email": "grant.likely@secretlab.ca", "time": "Fri Dec 16 15:50:17 2011 -0700" }, "committer": { "name": "Grant Likely", "email": "grant.likely@secretlab.ca", "time": "Thu Feb 23 14:37:47 2012 -0700" }, "message": "irq_domain/x86: Convert x86 (embedded) to use common irq_domain\n\nThis patch removes the x86-specific definition of irq_domain and replaces\nit with the common implementation.\n\nSigned-off-by: Grant Likely \u003cgrant.likely@secretlab.ca\u003e\nAcked-by: Sebastian Andrzej Siewior \u003cbigeasy@linutronix.de\u003e\nCc: Rob Herring \u003crob.herring@calxeda.com\u003e\nCc: Thomas Gleixner \u003ctglx@linutronix.de\u003e\n" }, { "commit": "23677ce3172fcb93522a1df077d21019e73ee1e3", "tree": "9558b9c1f24d03d612f4bae999d453ae7ec637d6", "parents": [ "1a0d6ae5795c376bae6d012fb25e8341e4c6d5f2" ], "author": { "name": "Joe Perches", "email": "joe@perches.com", "time": "Thu Feb 09 11:17:23 2012 +0000" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Mon Feb 13 00:47:40 2012 -0500" }, "message": "drivers/net: Remove boolean comparisons to true/false\n\nBooleans should not be compared to true or false\nbut be directly tested or tested with !.\n\nDone via cocci script:\n\n@@\nbool t;\n@@\n- t \u003d\u003d true\n+ t\n@@\nbool t;\n@@\n- t !\u003d true\n+ !t\n@@\nbool t;\n@@\n- t \u003d\u003d false\n+ !t\n@@\nbool t;\n@@\n- t !\u003d false\n+ t\n\nSigned-off-by: Joe Perches \u003cjoe@perches.com\u003e\nReviewed-by: Jeff Kirsher \u003cjeffrey.t.kirsher@intel.com\u003e\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "bd1d462e13b278fc57752d0b9b15040e60e561a0", "tree": "e2fdf1c18a93aab02830bcb8a5db8cdddfbb63a8", "parents": [ "d5c38b137ac8a6e3dbed13bc494d60df5b69dfc4", "62aa2b537c6f5957afd98e29f96897419ed5ebab" ], "author": { "name": "Greg Kroah-Hartman", "email": "gregkh@linuxfoundation.org", "time": "Thu Feb 02 11:24:44 2012 -0800" }, "committer": { "name": "Greg Kroah-Hartman", "email": "gregkh@linuxfoundation.org", "time": "Thu Feb 02 11:24:44 2012 -0800" }, "message": "Merge 3.3-rc2 into the driver-core-next branch.\n\nThis was done to resolve a merge and build problem with the\ndrivers/acpi/processor_driver.c file.\n\nReported-by: Stephen Rothwell \u003csfr@canb.auug.org.au\u003e\nSigned-off-by: Greg Kroah-Hartman \u003cgregkh@linuxfoundation.org\u003e\n" }, { "commit": "f3ff9247088a0af0c192a28908dab76ff3d8871f", "tree": "4ff2c822bcf82213d14b2195d4f00fe470876b1d", "parents": [ "9f30ea950edfaefa51221dd26a065b3442599778" ], "author": { "name": "Alan Stern", "email": "stern@rowland.harvard.edu", "time": "Tue Jan 24 13:35:24 2012 -0500" }, "committer": { "name": "Greg Kroah-Hartman", "email": "gregkh@suse.de", "time": "Tue Jan 24 16:00:35 2012 -0800" }, "message": "Remove useless get_driver()/put_driver() calls\n\nAs part of the removal of get_driver()/put_driver(), this patch\n(as1512) gets rid of various useless and unnecessary calls in several\ndrivers. In some cases it may be desirable to pin the driver by\ncalling try_module_get(), but that can be done later.\n\nSigned-off-by: Alan Stern \u003cstern@rowland.harvard.edu\u003e\nCC: \"David S. Miller\" \u003cdavem@davemloft.net\u003e\nCC: Konrad Rzeszutek Wilk \u003ckonrad.wilk@oracle.com\u003e\nCC: Michael Buesch \u003cm@bues.ch\u003e\nCC: Joerg Roedel \u003cjoerg.roedel@amd.com\u003e\nSigned-off-by: Greg Kroah-Hartman \u003cgregkh@suse.de\u003e\n" }, { "commit": "af58f1d62853cd883c1fa26556fb470f05878f21", "tree": "2e92cd1ba4d3bf51daa44d6dd0121b8e64833b0f", "parents": [ "8a622e71f58ec9f092fc99eacae0e6cf14f6e742" ], "author": { "name": "Randy Dunlap", "email": "rdunlap@xenotime.net", "time": "Sat Jan 21 09:03:04 2012 +0000" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Sun Jan 22 15:08:45 2012 -0500" }, "message": "kernel-doc: fix new warning in net/phy/mdio_bus.c\n\nFix new kernel-doc warning:\n\nWarning(drivers/net/phy/mdio_bus.c:49): No description found for parameter \u0027size\u0027\n\nSigned-off-by: Randy Dunlap \u003crdunlap@xenotime.net\u003e\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "72092cc45378176ba700034c91b7af2db524df26", "tree": "5505277b40f14304d78729aee8264b024799b775", "parents": [ "9c4886e5e63bbecea0b560829a96f37e8d9ddd7c" ], "author": { "name": "Manfred Rudigier", "email": "Manfred.Rudigier@omicron.at", "time": "Mon Jan 09 23:52:15 2012 +0000" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Thu Jan 12 15:26:01 2012 -0800" }, "message": "dp83640: Fix NOHZ local_softirq_pending 08 warning\n\nSimilar problem as in 481a8199142c050b72bff8a1956a49fd0a75bbe0 (\"can:\nfix NOHZ local_softirq_pending 08 warning\"). This fix replaces\nnetif_rx() with netif_rx_ni() which has to be used from\nprocess/softirq context.\n\nSigned-off-by: Manfred Rudigier \u003cmanfred.rudigier@omicron.at\u003e\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "eb8a54a78e974e1af3e17fa38bb74d3747c5c1bd", "tree": "d3642783d7470c26815b7d3c14ea5d5949d7dcdb", "parents": [ "1398eee08222a038fa5f017900f387e81f6e3ff4" ], "author": { "name": "Timur Tabi", "email": "timur@freescale.com", "time": "Thu Jan 12 15:23:04 2012 -0800" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Thu Jan 12 15:23:04 2012 -0800" }, "message": "phylib: introduce mdiobus_alloc_size()\n\nIntroduce function mdiobus_alloc_size() as an alternative to mdiobus_alloc().\nMost callers of mdiobus_alloc() also allocate a private data structure, and\nthen manually point bus-\u003epriv to this object. mdiobus_alloc_size()\ncombines the two operations into one, which simplifies memory management.\n\nThe original mdiobus_alloc() now just calls mdiobus_alloc_size(0).\n\nSigned-off-by: Timur Tabi \u003ctimur@freescale.com\u003e\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "d6c25beba35a76c002bff9235484d75a6f8e7e6b", "tree": "30cca470f12d3eed947f4d8ee816bed23307d10f", "parents": [ "a77e929a24ccf5a8545266a0c247e5ae862f13ba" ], "author": { "name": "Florian Fainelli", "email": "florian@openwrt.org", "time": "Mon Jan 09 23:59:27 2012 +0000" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Tue Jan 10 16:35:02 2012 -0800" }, "message": "mdio-octeon: use an unique MDIO bus name.\n\nSigned-off-by: Florian Fainelli \u003cflorian@openwrt.org\u003e\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "a77e929a24ccf5a8545266a0c247e5ae862f13ba", "tree": "00b8be4c9f5e4d779cbfa1f071ee7728063b6029", "parents": [ "9e6c643bb4502c50b6511206601b7760c610dfcc" ], "author": { "name": "Florian Fainelli", "email": "florian@openwrt.org", "time": "Mon Jan 09 23:59:26 2012 +0000" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Tue Jan 10 16:35:02 2012 -0800" }, "message": "mdio-gpio: use an unique MDIO bus name.\n\nSigned-off-by: Florian Fainelli \u003cflorian@openwrt.org\u003e\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "9e6c643bb4502c50b6511206601b7760c610dfcc", "tree": "4a5877bb5ce15ed3976d5b7d31d5077b5db49753", "parents": [ "3e617506c17df5cba55d7c615ec7cfbc812ec5fa" ], "author": { "name": "Florian Fainelli", "email": "florian@openwrt.org", "time": "Mon Jan 09 23:59:25 2012 +0000" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Tue Jan 10 16:35:02 2012 -0800" }, "message": "phy/fixed: use an unique MDIO bus name.\n\nSigned-off-by: Florian Fainelli \u003cflorian@openwrt.org\u003e\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "43c6759e73907e4c8e6624f70f5c4a860518b203", "tree": "501232103624ab09adb94f7b7d8f3ee5e70e7a95", "parents": [ "57adc1fcbae2c13104ce291b40f23e40a414fa87" ], "author": { "name": "Javier Martinez Canillas", "email": "javier@dowhile0.org", "time": "Tue Jan 03 20:23:18 2012 -0500" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Tue Jan 03 20:23:18 2012 -0500" }, "message": "net: phy: smsc: Move SMSC PHY constants to \u003clinux/smscphy.h\u003e\n\nSMSC generation 4 LAN chips integrate an IEEE 802.3 ethernet physical layer.\nThe ethernet driver for this family of devices needs to access the SMSC PHY\nregisters and bit-fields.\n\nSo, this patch moves these constants to a place where it can be used for both\nthe PHY and LAN drivers.\n\nSigned-off-by: Javier Martinez Canillas \u003cjavier@dowhile0.org\u003e\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "a8e510f682fe6d7671c11887e07c55f86caaf3c1", "tree": "b9c8042e5046fbfd81a596caaed05ba03fc3d467", "parents": [ "bf684f6512223673aa78b62ea59df8be409c460d" ], "author": { "name": "Frederic LAMBERT", "email": "frdrc66@gmail.com", "time": "Sun Dec 18 07:33:41 2011 +0000" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Mon Dec 19 16:30:40 2011 -0500" }, "message": "phy: Micrel KS8995MA 5-ports 10/100 managed Ethernet switch support added\n\nSigned-off-by: Gabor Juhos \u003cjuhosg@openwrt.org\u003e\nSigned-off-by: Frederic Lambert \u003cfrdrc66@gmail.com\u003e\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "6dec4ac4ee1ad894dc0e9647cd3e180f93fc353c", "tree": "cd71e597bbbe677820bb229c6aedbad412758959", "parents": [ "d6f03f29f7cdf064289f941bf0b838348e996e65", "fc0b927d9a5024e138c4318fe19a590f23e3eeec" ], "author": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Sat Nov 26 14:47:03 2011 -0500" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Sat Nov 26 14:47:03 2011 -0500" }, "message": "Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net\n\nConflicts:\n\tnet/ipv4/inet_diag.c\n" }, { "commit": "fc0b927d9a5024e138c4318fe19a590f23e3eeec", "tree": "8887bd2e7237f35d65ecb5aa1ed5aa2803aebef9", "parents": [ "261663b0ee2ee8e3947f4c11c1a08be18cd2cea1" ], "author": { "name": "Ben Hutchings", "email": "ben@decadent.org.uk", "time": "Fri Nov 25 14:40:02 2011 +0000" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Sat Nov 26 14:36:49 2011 -0500" }, "message": "net: Revert ARCNET and PHYLIB to tristate options\n\ncommit 88491d8103498a6166f70d5999902fec70924314 (\"drivers/net: Kconfig\n\u0026 Makefile cleanup\") changed the type of these options to bool, but\nthey select code that could (and still can) be built as modules.\n\nSigned-off-by: Ben Hutchings \u003cben@decadent.org.uk\u003e\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "37f07023d30708b5da091fe6d6be9b60783c6d82", "tree": "e4f576abd841cdeddc6cbdc9da6b083277784295", "parents": [ "b8ffdbd05f8692cdadccd04464271e48b1e8d439" ], "author": { "name": "Matt Carlson", "email": "mcarlson@broadcom.com", "time": "Thu Nov 17 14:30:55 2011 +0000" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Mon Nov 21 15:27:19 2011 -0500" }, "message": "net: Change mii to ethtool advertisement function names\n\nThis patch implements advice by Ben Hutchings to change the mii side of\nthe function names to look more like the register whose values they\nconvert. New LPA translation functions have been added as well.\n\nSigned-off-by: Matt Carlson \u003cmcarlson@broadcom.com\u003e\nSigned-off-by: Michael Chan \u003cmchan@broadcom.com\u003e\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "28011cf19b75df9d3f35489a7599a97ec0b3f1a0", "tree": "cc058e15191db60adb45e426fc3d328e9d246b41", "parents": [ "f85fa279138489543206381883c8f67ef94aa912" ], "author": { "name": "Matt Carlson", "email": "mcarlson@broadcom.com", "time": "Wed Nov 16 18:36:59 2011 -0500" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Wed Nov 16 18:36:59 2011 -0500" }, "message": "net: Add ethtool to mii advertisment conversion helpers\n\nTranslating between ethtool advertisement settings and MII\nadvertisements are common operations for ethernet drivers. This patch\nadds a set of helper functions that implements the conversion. The\npatch then modifies a couple of the drivers to use the new functions.\n\nSigned-off-by: Matt Carlson \u003cmcarlson@broadcom.com\u003e\nSigned-off-by: Michael Chan \u003cmchan@broadcom.com\u003e\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "64882709ef07f3eae29c7afc5aa8b84d12733a72", "tree": "e5504eef06ec6841b429f47e4b4cddf52d9fe5fa", "parents": [ "229a66e3bec97563aa92e25dfe0bc60b0d468619" ], "author": { "name": "Srinivas Kandagatla", "email": "srinivas.kandagatla@st.com", "time": "Tue Nov 15 11:54:15 2011 +0000" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Tue Nov 15 16:56:17 2011 -0500" }, "message": "mdio-gpio: Add reset functionality to mdio-gpio driver(v2).\n\nThis patch adds phy reset functionality to mdio-gpio driver. Now\nmdio_gpio_platform_data has new member as function pointer which can be\nfilled at the bsp level for a callback from phy infrastructure. Also the\nmdio-bitbang driver fills-in the reset function of mii_bus structure.\n\nWithout this patch the bsp level code has to takecare of the reseting\nPHY\u0027s on the bus, which become bit hacky for every bsp and\nphy-infrastructure is ignored aswell.\n\nSigned-off-by: Srinivas Kandagatla \u003csrinivas.kandagatla@st.com\u003e\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "9d9779e723a5d23b94abbe5bb7d1197921f6f3dd", "tree": "19c5f0910a919c3a230867f1aec1f81daedf1f4c", "parents": [ "5270f31222315de96a3ee00ecde5ad97528cacab" ], "author": { "name": "Paul Gortmaker", "email": "paul.gortmaker@windriver.com", "time": "Sun Jul 03 15:21:01 2011 -0400" }, "committer": { "name": "Paul Gortmaker", "email": "paul.gortmaker@windriver.com", "time": "Mon Oct 31 19:31:07 2011 -0400" }, "message": "drivers/net: Add module.h to drivers who were implicitly using it\n\nThe device.h header was including module.h, making it present for\nmost of these drivers. But we want to clean that up. Call out the\ninclude of module.h in the modular network drivers.\n\nSigned-off-by: Paul Gortmaker \u003cpaul.gortmaker@windriver.com\u003e\n" }, { "commit": "8a9ea3237e7eb5c25f09e429ad242ae5a3d5ea22", "tree": "a0a63398a9983667d52cbbbf4e2405b4f22b1d83", "parents": [ "1be025d3cb40cd295123af2c394f7229ef9b30ca", "8b3408f8ee994973869d8ba32c5bf482bc4ddca4" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Tue Oct 25 13:25:22 2011 +0200" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Tue Oct 25 13:25:22 2011 +0200" }, "message": "Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-next\n\n* git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-next: (1745 commits)\n dp83640: free packet queues on remove\n dp83640: use proper function to free transmit time stamping packets\n ipv6: Do not use routes from locally generated RAs\n |PATCH net-next] tg3: add tx_dropped counter\n be2net: don\u0027t create multiple RX/TX rings in multi channel mode\n be2net: don\u0027t create multiple TXQs in BE2\n be2net: refactor VF setup/teardown code into be_vf_setup/clear()\n be2net: add vlan/rx-mode/flow-control config to be_setup()\n net_sched: cls_flow: use skb_header_pointer()\n ipv4: avoid useless call of the function check_peer_pmtu\n TCP: remove TCP_DEBUG\n net: Fix driver name for mdio-gpio.c\n ipv4: tcp: fix TOS value in ACK messages sent from TIME_WAIT\n rtnetlink: Add missing manual netlink notification in dev_change_net_namespaces\n ipv4: fix ipsec forward performance regression\n jme: fix irq storm after suspend/resume\n route: fix ICMP redirect validation\n net: hold sock reference while processing tx timestamps\n tcp: md5: add more const attributes\n Add ethtool -g support to virtio_net\n ...\n\nFix up conflicts in:\n - drivers/net/Kconfig:\n\tThe split-up generated a trivial conflict with removal of a\n\tstale reference to Documentation/networking/net-modules.txt.\n\tRemove it from the new location instead.\n - fs/sysfs/dir.c:\n\tFairly nasty conflicts with the sysfs rb-tree usage, conflicting\n\twith Eric Biederman\u0027s changes for tagged directories.\n" }, { "commit": "59e52534172d845ebffb0d7e85fc56fb7b857051", "tree": "49552e03f1bdb413cd8b5f7542e91770688d7047", "parents": [ "73692d9bb58ecc2fa73f4b2bfcf6eadaa6d49a26", "0d89e54c8249645404283436d952afc261a04e1e" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Tue Oct 25 12:11:02 2011 +0200" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Tue Oct 25 12:11:02 2011 +0200" }, "message": "Merge branch \u0027for-linus\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/trivial\n\n* \u0027for-linus\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/trivial: (59 commits)\n MAINTAINERS: linux-m32r is moderated for non-subscribers\n linux@lists.openrisc.net is moderated for non-subscribers\n Drop default from \"DM365 codec select\" choice\n parisc: Kconfig: cleanup Kernel page size default\n Kconfig: remove redundant CONFIG_ prefix on two symbols\n cris: remove arch/cris/arch-v32/lib/nand_init.S\n microblaze: add missing CONFIG_ prefixes\n h8300: drop puzzling Kconfig dependencies\n MAINTAINERS: microblaze-uclinux@itee.uq.edu.au is moderated for non-subscribers\n tty: drop superfluous dependency in Kconfig\n ARM: mxc: fix Kconfig typo \u0027i.MX51\u0027\n Fix file references in Kconfig files\n aic7xxx: fix Kconfig references to READMEs\n Fix file references in drivers/ide/\n thinkpad_acpi: Fix printk typo \u0027bluestooth\u0027\n bcmring: drop commented out line in Kconfig\n btmrvl_sdio: fix typo \u0027btmrvl_sdio_sd6888\u0027\n doc: raw1394: Trivial typo fix\n CIFS: Don\u0027t free volume_info-\u003eUNC until we are entirely done with it.\n treewide: Correct spelling of successfully in comments\n ...\n" }, { "commit": "8b3408f8ee994973869d8ba32c5bf482bc4ddca4", "tree": "4394a829b509a481799a65868c61488a26698a74", "parents": [ "f5ff7cd1a84caa9545d952a37ac872ccb73825fb" ], "author": { "name": "Richard Cochran", "email": "richardcochran@gmail.com", "time": "Fri Oct 21 00:49:17 2011 +0000" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Mon Oct 24 19:14:50 2011 -0400" }, "message": "dp83640: free packet queues on remove\n\nIf the PHY should disappear (for example, on an USB Ethernet MAC), then\nthe driver would leak any undelivered time stamp packets. This commit\nfixes the issue by calling the appropriate functions to free any packets\nleft in the transmit and receive queues.\n\nThe driver first appeared in v3.0.\n\nSigned-off-by: Richard Cochran \u003crichard.cochran@omicron.at\u003e\nAcked-by: Eric Dumazet \u003ceric.dumazet@gmail.com\u003e\nCc: \u003cstable@vger.kernel.org\u003e\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "f5ff7cd1a84caa9545d952a37ac872ccb73825fb", "tree": "13d027308cfd1e3557a7824f6af48eb761e390a1", "parents": [ "9f56220fad0d13f8b0ebe7592f41fdb49874d143" ], "author": { "name": "Richard Cochran", "email": "richardcochran@gmail.com", "time": "Fri Oct 21 00:49:16 2011 +0000" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Mon Oct 24 19:14:50 2011 -0400" }, "message": "dp83640: use proper function to free transmit time stamping packets\n\nThe previous commit enforces a new rule for handling the cloned packets\nfor transmit time stamping. These packets must not be freed using any other\nfunction than skb_complete_tx_timestamp. This commit fixes the one and only\ndriver using this API.\n\nThe driver first appeared in v3.0.\n\nSigned-off-by: Richard Cochran \u003crichard.cochran@omicron.at\u003e\nAcked-by: Eric Dumazet \u003ceric.dumazet@gmail.com\u003e\nCc: \u003cstable@vger.kernel.org\u003e\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "1805b2f04855f07afe3a71d620a68f483b0ed74f", "tree": "b823b90f37f5404fcaef70f785c70112ca74a329", "parents": [ "78d81d15b74246c7cedf84894434890b33da3907", "f42af6c486aa5ca6ee62800cb45c5b252020509d" ], "author": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Mon Oct 24 18:18:09 2011 -0400" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Mon Oct 24 18:18:09 2011 -0400" }, "message": "Merge branch \u0027master\u0027 of ra.kernel.org:/pub/scm/linux/kernel/git/davem/net\n" }, { "commit": "f42af6c486aa5ca6ee62800cb45c5b252020509d", "tree": "46a1f09907234dc824cd5444aba62361ce4b2d11", "parents": [ "d2237d35748e7f448a9c2d9dc6a85ef637466e24" ], "author": { "name": "Dirk Eibach", "email": "eibach@gdsys.de", "time": "Tue Oct 18 03:04:11 2011 +0000" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Mon Oct 24 17:24:40 2011 -0400" }, "message": "net: Fix driver name for mdio-gpio.c\n\nSince commit\n\"7488876... dt/net: Eliminate users of of_platform_{,un}register_driver\"\nthere are two platform drivers named \"mdio-gpio\" registered.\nI renamed the of variant to \"mdio-ofgpio\".\n\nSigned-off-by: Dirk Eibach \u003ceibach@gdsys.de\u003e\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "fddf86fc4699a5fbabe6b8bda67613dbd57cbe47", "tree": "69022388e856ab212bd26c4cff8cd5df740f4d92", "parents": [ "3d153a7c8b23031df35e61377c0600a6c96a8b0b" ], "author": { "name": "Andy Fleming", "email": "afleming@freescale.com", "time": "Thu Oct 13 04:33:55 2011 +0000" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Wed Oct 19 15:59:45 2011 -0400" }, "message": "phylib: Modify Vitesse RGMII skew settings\n\nThe Vitesse driver was using the RGMII_ID interface type to determine if\nskew was necessary. However, we want to move away from using that\ninterface type, as it\u0027s really a property of the board\u0027s PHY connection.\nHowever, some boards depend on it, so we want to support it, while\nallowing new boards to use the more flexible \"fixups\" approach. To do\nthis, we extract the code which adds skew into its own function, and\ncall that function when RGMII_ID has been selected.\n\nAnother side-effect of this change is that if your PHY has skew set\nalready, it doesn\u0027t clear it. This way, the fixup code can modify the\nregister without config_init then clearing it.\n\nSigned-off-by: Andy Fleming \u003cafleming@freescale.com\u003e\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "a4886d522e18e5d4a63b95a5ead72f6105e3ef98", "tree": "0114dbc86ccdd7a4ca1419e121a8f06a9fe4a895", "parents": [ "2425717b27eb92b175335ca4ff0bb218cbe0cb64" ], "author": { "name": "Giuseppe CAVALLARO", "email": "peppe.cavallaro@st.com", "time": "Mon Oct 10 21:37:56 2011 +0000" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Tue Oct 18 23:50:02 2011 -0400" }, "message": "net/phy: extra delay only for RGMII interfaces for IC+ IP 1001\n\nThe extra delay of 2ns to adjust RX clock phase is actually needed\nin RGMII mode. Tested on the HDK7108 (STx7108c2).\n\nSigned-off-by: Giuseppe Cavallaro \u003cpeppe.cavallaro@st.com\u003e\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "88c5100c28b02c4b2b2c6f6fafbbd76d90f698b9", "tree": "08c4399e0341f7eb0ccb24e15f2cab687275c2a4", "parents": [ "8083f0fc969d9b5353061a7a6f963405057e26b1", "3ee72ca99288f1de95ec9c570e43f531c8799f06" ], "author": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Fri Oct 07 13:38:43 2011 -0400" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Fri Oct 07 13:38:43 2011 -0400" }, "message": "Merge branch \u0027master\u0027 of github.com:davem330/net\n\nConflicts:\n\tnet/batman-adv/soft-interface.c\n" }, { "commit": "76231e0297db30f1f0e947a02b42495e7d535d56", "tree": "a0fbf2e596d01de7cfe3d7ea8447b3e72e775ec9", "parents": [ "6fe3264945ee63292cdfb27b6e95bc52c603bb09" ], "author": { "name": "David Daney", "email": "david.daney@cavium.com", "time": "Fri Sep 30 12:17:48 2011 +0000" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Fri Sep 30 18:54:08 2011 -0400" }, "message": "netdev/phy/icplus: Use mdiobus_write() and mdiobus_read() for proper locking.\n\nUsually you have to take the bus lock. Why not here too?\n\nI saw this when working on something else. Not even compile tested.\n\nSigned-off-by: David Daney \u003cdavid.daney@cavium.com\u003e\nCc: Greg Dietsche \u003cGregory.Dietsche@cuw.edu\u003e\nCc: \"Uwe Kleine-Konig\" \u003cu.kleine-koenig@pengutronix.de\u003e\nCc: Giuseppe Cavallaro \u003cpeppe.cavallaro@st.com\u003e\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "6fe3264945ee63292cdfb27b6e95bc52c603bb09", "tree": "a4bb44b76d6a96aa735b17e1375f4dfc0375ccc0", "parents": [ "8e00f5fbb4ecbc3431fa686cba60cd76a62604af" ], "author": { "name": "David Daney", "email": "david.daney@cavium.com", "time": "Fri Sep 30 11:51:22 2011 +0000" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Fri Sep 30 18:54:08 2011 -0400" }, "message": "netdev/phy: Use mdiobus_read() so that proper locks are taken.\n\nAccesses to the mdio busses must be done with the mdio_lock to ensure\nproper operation. Conveniently we have the helper function\nmdiobus_read() to do that for us. Lets use it in get_phy_id() instead\nof accessing the bus without the lock held.\n\nSigned-off-by: David Daney \u003cdavid.daney@cavium.com\u003e\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "02715ed2e7b71569ed6e61f0b23b0736a509913d", "tree": "282c0f1daa4f7b6d23f4bef5eb4d7fa09c30927c", "parents": [ "f75159e9936143177b442afc78150b7a7ad8aa07" ], "author": { "name": "Richard Cochran", "email": "richardcochran@gmail.com", "time": "Tue Sep 20 01:25:42 2011 +0000" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Thu Sep 29 00:32:04 2011 -0400" }, "message": "dp83640: reduce driver noise\n\nThe driver has two warning messages that might be triggered\nby normal use cases. When they appear, the messages give the\nimpression of a never ending series of errors.\n\nThis commit changes them to debug messages instead.\n\nSigned-off-by: Richard Cochran \u003crichard.cochran@omicron.at\u003e\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "bfb9035c98906aafcd3cf22694fba2550997bf53", "tree": "82256f42b5be76c49c0009b96b0641b34a8f16d3", "parents": [ "395cf9691d72173d8cdaa613c5f0255f993af94b" ], "author": { "name": "Joe Perches", "email": "joe@perches.com", "time": "Wed Aug 17 06:58:04 2011 -0700" }, "committer": { "name": "Jiri Kosina", "email": "jkosina@suse.cz", "time": "Tue Sep 27 18:08:04 2011 +0200" }, "message": "treewide: Correct spelling of successfully in comments\n\nSigned-off-by: Joe Perches \u003cjoe@perches.com\u003e\nSigned-off-by: Jiri Kosina \u003cjkosina@suse.cz\u003e\n" }, { "commit": "dccaa9e091d2fd658634de31a1ab272072759cda", "tree": "38548ebcbccb061c0ca22dff5275b1f0426b7a8f", "parents": [ "3ce23fa9780b70525932c5e4b5ac401c67390fae" ], "author": { "name": "Richard Cochran", "email": "richardcochran@gmail.com", "time": "Tue Sep 20 01:43:16 2011 +0000" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Mon Sep 26 16:02:47 2011 -0400" }, "message": "dp83640: add time stamp insertion for sync messages\n\nThis commit adds one step support to the phyter. When enabled, the\nhardware does not provide time stamps for transmitted sync messages but\ninstead inserts the stamp into the outgoing packet.\n\nSigned-off-by: Richard Cochran \u003crichard.cochran@omicron.at\u003e\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "49b3fd4aff7ede794d4fe50b80095eb33cc9d911", "tree": "3f2c723c3ea48ebc61f07f9679db7e7f19ba3d3d", "parents": [ "7777de9af54a1402c79bf7663b38ff5ba308dd45" ], "author": { "name": "Richard Cochran", "email": "richardcochran@gmail.com", "time": "Tue Sep 20 01:43:14 2011 +0000" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Mon Sep 26 16:02:43 2011 -0400" }, "message": "dp83640: enable six external events and one periodic output\n\nThis patch enables six external event channels and one periodic output.\nOne GPIO is reserved for synchronizing multiple PHYs. The assignment\nof GPIO functions can be changed via a module parameter.\n\nThe code supports multiple simultaneous events by inducing a PTP clock\nevent for every channel marked in the PHY\u0027s extended status word.\n\nSigned-off-by: Richard Cochran \u003crichard.cochran@omicron.at\u003e\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "8decf868790b48a727d7e7ca164f2bcd3c1389c0", "tree": "b759a5f861f842af7ea76f9011b579d06e9d5508", "parents": [ "3fc72370186be2f9d4d6ef06d99e1caa5d92c564", "d93dc5c4478c1fd5de85a3e8aece9aad7bbae044" ], "author": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Thu Sep 22 03:23:13 2011 -0400" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Thu Sep 22 03:23:13 2011 -0400" }, "message": "Merge branch \u0027master\u0027 of github.com:davem330/net\n\nConflicts:\n\tMAINTAINERS\n\tdrivers/net/Kconfig\n\tdrivers/net/ethernet/broadcom/bnx2x/bnx2x_link.c\n\tdrivers/net/ethernet/broadcom/tg3.c\n\tdrivers/net/wireless/iwlwifi/iwl-pci.c\n\tdrivers/net/wireless/iwlwifi/iwl-trans-tx-pcie.c\n\tdrivers/net/wireless/rt2x00/rt2800usb.c\n\tdrivers/net/wireless/wl12xx/main.c\n" }, { "commit": "9c9b1f24f2aa31a3cea94939edc551f68ebadc89", "tree": "2735620455c67f98b977ed0c181e1927053cb9f5", "parents": [ "e3feb266c344394ce06bdecdfa05071118249c88" ], "author": { "name": "Giuseppe CAVALLARO", "email": "peppe.cavallaro@st.com", "time": "Tue Sep 06 20:14:50 2011 +0000" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Tue Sep 20 15:50:29 2011 -0400" }, "message": "net/phy: add IC+ IP101A and support APS.\n\nThis patch adds the IC+ IP101A Single port 10/100 PHY\nand supports the APS (i.e. power saving mode while link is down)\nfor both IP1001 and IP101A (where this mode is supported).\n\nSigned-off-by: Giuseppe Cavallaro \u003cpeppe.cavallaro@st.com\u003e\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "88491d8103498a6166f70d5999902fec70924314", "tree": "d22646735d94ad81597b535e9e56131cc1896d71", "parents": [ "330278cde612888e79fc4ab13d8f725258e903dd" ], "author": { "name": "Jeff Kirsher", "email": "jeffrey.t.kirsher@intel.com", "time": "Tue Aug 23 00:42:10 2011 -0700" }, "committer": { "name": "Jeff Kirsher", "email": "jeffrey.t.kirsher@intel.com", "time": "Sat Aug 27 00:58:49 2011 -0700" }, "message": "drivers/net: Kconfig \u0026 Makefile cleanup\n\nThe is does a general cleanup of the drivers/net/ Kconfig and\nMakefile. This patch create a \"core\" option and places all\nthe networking core drivers into this option (default is yes\nfor this option). In addition, it alphabitizes the Kconfig\ndriver options.\n\nAs a side cleanup, found that the arcnet, token ring, and PHY\nKconfig options were a tri-state option and should have been\na bool option.\n\nSigned-off-by: Jeff Kirsher \u003cjeffrey.t.kirsher@intel.com\u003e\n" }, { "commit": "6e6f400f5381e08dc80e1b5a37ed02a081c179d9", "tree": "40eb251b991f078a62dd1b73b606956446c7db62", "parents": [ "e2e6be56df37c371f564e127c154036b0c2211a1" ], "author": { "name": "Giuseppe CAVALLARO", "email": "peppe.cavallaro@st.com", "time": "Mon Aug 22 21:07:14 2011 +0000" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Fri Aug 26 12:48:24 2011 -0400" }, "message": "net/phy: fix DP83865 phy interrupt handler\n\nAccording to the DP83865 datasheet we need to clear\nthe interrupt status bit by writing a 1 to the\ncorresponding bit in INT_CLEAR (2:0 are reserved).\n\nProposed and tested by Thorsten.\n\nSigned-off-by: Thorsten Schubert \u003ctshu@msc-ge.com\u003e\nSigned-off-by: Giuseppe Cavallaro \u003cpeppe.cavallaro@st.com\u003e\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "8028837d71ba9904b17281b40f94b93e947fbe38", "tree": "9113cff86a93b3bd227e147768c7a54a0588121c", "parents": [ "cbc056602c7c63620c86904c431ff6b61e029dcc" ], "author": { "name": "Richard Cochran", "email": "richardcochran@gmail.com", "time": "Sat Aug 06 21:03:04 2011 +0000" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Sun Aug 07 22:53:22 2011 -0700" }, "message": "dp83640: increase receive time stamp buffer size\n\nThe dp83640 buffers receive time stamps from special PHY status frames,\nmatching them to received PTP packets in a work queue. Because the timeout\nfor orphaned time stamps is so long and the buffer is so small, the driver\ncan drop time stamps under moderate PTP traffic.\n\nThis commit fixes the issue by decreasing the timeout to (at least) one\ntimer tick and increasing the buffer size.\n\nSigned-off-by: Richard Cochran \u003crichard.cochran@omicron.at\u003e\nCc: \u003cstable@kernel.org\u003e\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "60063497a95e716c9a689af3be2687d261f115b4", "tree": "6ce0d68db76982c53df46aee5f29f944ebf2c320", "parents": [ "148817ba092f9f6edd35bad3c6c6b8e8f90fe2ed" ], "author": { "name": "Arun Sharma", "email": "asharma@fb.com", "time": "Tue Jul 26 16:09:06 2011 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Tue Jul 26 16:49:47 2011 -0700" }, "message": "atomic: use \u003clinux/atomic.h\u003e\n\nThis allows us to move duplicated code in \u003casm/atomic.h\u003e\n(atomic_inc_not_zero() for now) to \u003clinux/atomic.h\u003e\n\nSigned-off-by: Arun Sharma \u003casharma@fb.com\u003e\nReviewed-by: Eric Dumazet \u003ceric.dumazet@gmail.com\u003e\nCc: Ingo Molnar \u003cmingo@elte.hu\u003e\nCc: David Miller \u003cdavem@davemloft.net\u003e\nCc: Eric Dumazet \u003ceric.dumazet@gmail.com\u003e\nAcked-by: Mike Frysinger \u003cvapier@gentoo.org\u003e\nSigned-off-by: Andrew Morton \u003cakpm@linux-foundation.org\u003e\nSigned-off-by: Linus Torvalds \u003ctorvalds@linux-foundation.org\u003e\n" }, { "commit": "9f6ec8d697c08963d83880ccd35c13c5ace716ea", "tree": "ad8d93cf6fcdd09b86ade09f5fcbbc66cdb1cca2", "parents": [ "4aa3a715551c93eda32d79bd52042ce500bd5383", "56299378726d5f2ba8d3c8cbbd13cb280ba45e4f" ], "author": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Mon Jun 20 22:29:08 2011 -0700" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Mon Jun 20 22:29:08 2011 -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/iwlwifi/iwl-agn-rxon.c\n\tdrivers/net/wireless/rtlwifi/pci.c\n\tnet/netfilter/ipvs/ip_vs_core.c\n" }, { "commit": "0a3f084179731f6755462aa7fec677f8e1f0580a", "tree": "4790f15ccc0596ec815895b23734510cabd140d5", "parents": [ "cb0a60564943db21ed3af975ac3d578cdc80b329" ], "author": { "name": "Greg Dietsche", "email": "Gregory.Dietsche@cuw.edu", "time": "Thu Jun 16 07:04:30 2011 +0000" }, "committer": { "name": "David S. Miller", "email": "davem@conan.davemloft.net", "time": "Fri Jun 17 00:03:04 2011 -0400" }, "message": "net: icplus: remove unnecessary code\n\nCompile tested.\nremove unnecessary code that matches this coccinelle pattern\n\tif (...)\n\t\treturn ret;\n\treturn ret;\n\nSigned-off-by: Greg Dietsche \u003cGregory.Dietsche@cuw.edu\u003e\nSigned-off-by: David S. Miller \u003cdavem@conan.davemloft.net\u003e\n" }, { "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" } ], "next": "dab1086362f0a357e74f45bba48d664a48c294ec" }