)]}'
{
  "log": [
    {
      "commit": "57bf6eef2f43ae810504753208b3a2c0bb2e4765",
      "tree": "54ea4e292e1a6279139580b7d3e9ea74f3d09c61",
      "parents": [
        "621b99b6f6a8ae69ca9b69dec0fec3a68f774bb7"
      ],
      "author": {
        "name": "Joe Perches",
        "email": "joe@perches.com",
        "time": "Thu May 13 15:26:17 2010 +0000"
      },
      "committer": {
        "name": "David S. Miller",
        "email": "davem@davemloft.net",
        "time": "Fri May 14 03:06:19 2010 -0700"
      },
      "message": "ixgb and e1000: Use new function for copybreak tests\n\nThere appears to be an off-by-1 defect in the maximum packet size\ncopied when copybreak is speified in these modules.\n\nThe copybreak module params are specified as:\n\"Maximum size of packet that is copied to a new buffer on receive\"\n\nThe tests are changed from \"\u003c copybreak\" to \"\u003c\u003d copybreak\"\nand moved into new static functions for readability.\n\nSigned-off-by: Joe Perches \u003cjoe@perches.com\u003e\nSigned-off-by: Jeff Kirsher \u003cjeffrey.t.kirsher@intel.com\u003e\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n"
    },
    {
      "commit": "621b99b6f6a8ae69ca9b69dec0fec3a68f774bb7",
      "tree": "7082b744249e41960bc5ef5909afb0f908606c3b",
      "parents": [
        "2a2ec45ddeedaddb9ff8cb98eab7d4f85f44df4a"
      ],
      "author": {
        "name": "Jesse Brandeburg",
        "email": "jesse.brandeburg@intel.com",
        "time": "Thu May 13 15:25:56 2010 +0000"
      },
      "committer": {
        "name": "David S. Miller",
        "email": "davem@davemloft.net",
        "time": "Fri May 14 03:06:19 2010 -0700"
      },
      "message": "e1000: cleanup unused parameters\n\nDuring the cleanup pass after the removal of e1000e hardware from e1000 some\nparameters were missed.  Remove them because it is just dead code.\n\nSigned-off-by: Jesse Brandeburg \u003cjesse.brandeburg@intel.com\u003e\nSigned-off-by: Jeff Kirsher \u003cjeffrey.t.kirsher@intel.com\u003e\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n"
    },
    {
      "commit": "2a2ec45ddeedaddb9ff8cb98eab7d4f85f44df4a",
      "tree": "66f498acfb60c7a1da8a5ff6c617e8f45b820b2a",
      "parents": [
        "a4b770972b8f819e408d7cc3ae9637e15bff62f6"
      ],
      "author": {
        "name": "Jesse Brandeburg",
        "email": "jesse.brandeburg@intel.com",
        "time": "Thu May 13 15:25:33 2010 +0000"
      },
      "committer": {
        "name": "David S. Miller",
        "email": "davem@davemloft.net",
        "time": "Fri May 14 03:06:18 2010 -0700"
      },
      "message": "e1000: fix WARN_ON with mac-vlan\n\nWhen adding more than 14 mac-vlan adapters on e1000 the driver\nwould fire a WARN_ON when adding the 15th.  The WARN_ON in this\ncase is completely un-necessary, as the code below the WARN_ON is\ndirectly handling the value the WARN_ON triggered on.\n\nCC: Jiri Pirko \u003cjpirko@redhat.com\u003e\nSigned-off-by: Jesse Brandeburg \u003cjesse.brandeburg@intel.com\u003e\nSigned-off-by: Jeff Kirsher \u003cjeffrey.t.kirsher@intel.com\u003e\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n"
    },
    {
      "commit": "a4b770972b8f819e408d7cc3ae9637e15bff62f6",
      "tree": "62e3c413b084c106d750cf6cc0701709cde30100",
      "parents": [
        "21ce849ba5cc178740c6532ba3dded852296ad91"
      ],
      "author": {
        "name": "Joe Perches",
        "email": "joe@perches.com",
        "time": "Fri May 14 00:19:28 2010 -0700"
      },
      "committer": {
        "name": "David S. Miller",
        "email": "davem@davemloft.net",
        "time": "Fri May 14 00:19:28 2010 -0700"
      },
      "message": "drivers/net: Remove unnecessary returns from void function()s\n\nThis patch removes from drivers/net/ all the unnecessary\nreturn; statements that precede the last closing brace of\nvoid functions.\n\nIt does not remove the returns that are immediately\npreceded by a label as gcc doesn\u0027t like that.\n\nIt also does not remove null void functions with return.\n\nDone via:\n$ grep -rP --include\u003d*.[ch] -l \"return;\\n}\" net/ | \\\n  xargs perl -i -e \u0027local $/ ; while (\u003c\u003e) { s/\\n[ \\t\\n]+return;\\n}/\\n}/g; print; }\u0027\n\nwith some cleanups by hand.\n\nCompile tested x86 allmodconfig only.\n\nSigned-off-by: Joe Perches \u003cjoe@perches.com\u003e\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n"
    },
    {
      "commit": "eab2abf5826b78b126826cc70e564c44816396da",
      "tree": "f771389b55090767e8aecdc36f3e80019b3b60bf",
      "parents": [
        "edf15c17420fed108046da50b3d3ae53dfa0e0ae"
      ],
      "author": {
        "name": "Jesse Brandeburg",
        "email": "jesse.brandeburg@intel.com",
        "time": "Tue May 04 22:26:03 2010 +0000"
      },
      "committer": {
        "name": "David S. Miller",
        "email": "davem@davemloft.net",
        "time": "Wed May 05 21:15:32 2010 -0700"
      },
      "message": "e1000/e1000e: implement a simple interrupt moderation\n\nBack before e1000-7.3.20, the e1000 driver had a simple algorithm that\nmanaged interrupt moderation.  The driver was updated in 7.3.20 to\nhave the new \"adaptive\" interrupt moderation but we have customer\nrequests to redeploy the old way as an option.  This patch adds the\nold functionality back.  The new functionality can be enabled via\nmodule parameter or at runtime via ethtool.\nModule parameter: (InterruptThrottleRate\u003d4) to use this new\nmoderation method.\nEthtool method: ethtool -C ethX rx-usecs 4\n\nSigned-off-by: Jesse Brandeburg \u003cjesse.brandeburg@intel.com\u003e\nSigned-off-by: Jeff Kirsher \u003cjeffrey.t.kirsher@intel.com\u003e\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n"
    },
    {
      "commit": "675ad47375c76a7c3be4ace9554d92cd55518ced",
      "tree": "54acb7e8aa4db5e93b960d565b1cc2dce45988b9",
      "parents": [
        "709b9326ef6fc1b7e379d47d5f39ebc27dad3f4d"
      ],
      "author": {
        "name": "Emil Tantilov",
        "email": "emil.s.tantilov@intel.com",
        "time": "Tue Apr 27 14:02:58 2010 +0000"
      },
      "committer": {
        "name": "David S. Miller",
        "email": "davem@davemloft.net",
        "time": "Tue Apr 27 17:05:03 2010 -0700"
      },
      "message": "e1000: Use netdev_\u003clevel\u003e, pr_\u003clevel\u003e and dev_\u003clevel\u003e\n\nThis patch is an alternative to similar patch provided by Joe Perches.\n\nSubstitute DPRINTK macro for e_\u003clevel\u003e that uses netdev_\u003clevel\u003e and dev_\u003clevel\u003e\nsimilar to e1000e.\n- Convert printk to pr_\u003clevel\u003e where applicable.\n- Use common #define pr_fmt for the driver.\n- Use dev_\u003clevel\u003e for displaying text in parts of the driver where the interface\n  name is not assigned (like e1000_param.c).\n- Better align test with the new macros.\n\nCC: Joe Perches \u003cjoe@perches.com\u003e\nSigned-off-by: Emil Tantilov \u003cemil.s.tantilov@intel.com\u003e\nSigned-off-by: Jeff Kirsher \u003cjeffrey.t.kirsher@intel.com\u003e\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n"
    },
    {
      "commit": "b16f53bef9be0a756a0672e27d0a526686040e02",
      "tree": "ef44806ac770a2af3cc34501ee138ef00ed55a1f",
      "parents": [
        "ff65e8275f6c96a5eda57493bd84c4555decf7b3"
      ],
      "author": {
        "name": "Nick Nunley",
        "email": "nicholasx.d.nunley@intel.com",
        "time": "Tue Apr 27 13:08:45 2010 +0000"
      },
      "committer": {
        "name": "David S. Miller",
        "email": "davem@davemloft.net",
        "time": "Tue Apr 27 16:29:49 2010 -0700"
      },
      "message": "e1000: use DMA API instead of PCI DMA functions\n\nSigned-off-by: Nicholas Nunley \u003cnicholasx.d.nunley@intel.com\u003e\nSigned-off-by: Jeff Kirsher \u003cjeffrey.t.kirsher@intel.com\u003e\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n"
    },
    {
      "commit": "e743d31312d00932391b123dfac3324d2b9e8c81",
      "tree": "e5ac3aacbfdde1fe8eb44c4e010085915da5ea05",
      "parents": [
        "b4bf665c5761837f693e87ab27870a5868185ccc"
      ],
      "author": {
        "name": "Eric Dumazet",
        "email": "eric.dumazet@gmail.com",
        "time": "Wed Apr 14 15:59:40 2010 -0700"
      },
      "committer": {
        "name": "David S. Miller",
        "email": "davem@davemloft.net",
        "time": "Wed Apr 14 16:11:33 2010 -0700"
      },
      "message": "drivers: net: use skb_headlen()\n\nreplaces (skb-\u003elen - skb-\u003edata_len) occurrences by skb_headlen(skb)\n\nSigned-off-by: Eric Dumazet \u003ceric.dumazet@gmail.com\u003e\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n"
    },
    {
      "commit": "4a35ecf8bf1c4b039503fa554100fe85c761de76",
      "tree": "9b75f5d5636004d9a9aa496924377379be09aa1f",
      "parents": [
        "b4d562e3c3553ac58c7120555c4e4aefbb090a2a",
        "fb9e2d887243499b8d28efcf80821c4f6a092395"
      ],
      "author": {
        "name": "David S. Miller",
        "email": "davem@davemloft.net",
        "time": "Tue Apr 06 23:53:30 2010 -0700"
      },
      "committer": {
        "name": "David S. Miller",
        "email": "davem@davemloft.net",
        "time": "Tue Apr 06 23:53:30 2010 -0700"
      },
      "message": "Merge branch \u0027master\u0027 of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6\n\nConflicts:\n\tdrivers/net/bonding/bond_main.c\n\tdrivers/net/via-velocity.c\n\tdrivers/net/wireless/iwlwifi/iwl-agn.c\n"
    },
    {
      "commit": "22bedad3ce112d5ca1eaf043d4990fa2ed698c87",
      "tree": "b6fba5688d48b1396f01d13ee53610dea7749c15",
      "parents": [
        "a748ee2426817a95b1f03012d8f339c45c722ae1"
      ],
      "author": {
        "name": "Jiri Pirko",
        "email": "jpirko@redhat.com",
        "time": "Thu Apr 01 21:22:57 2010 +0000"
      },
      "committer": {
        "name": "David S. Miller",
        "email": "davem@davemloft.net",
        "time": "Sat Apr 03 14:22:15 2010 -0700"
      },
      "message": "net: convert multicast list to list_head\n\nConverts the list and the core manipulating with it to be the same as uc_list.\n\n+uses two functions for adding/removing mc address (normal and \"global\"\n variant) instead of a function parameter.\n+removes dev_mcast.c completely.\n+exposes netdev_hw_addr_list_* macros along with __hw_addr_* functions for\n manipulation with lists on a sandbox (used in bonding and 80211 drivers)\n\nSigned-off-by: Jiri Pirko \u003cjpirko@redhat.com\u003e\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n"
    },
    {
      "commit": "39ca5f033bb2ea18877632809185268eebbb37a9",
      "tree": "2cde0a3364df707c4738437743c91ce02e2d0742",
      "parents": [
        "7438189baa0a2fe30084bdc97e3d540ebc5444f3"
      ],
      "author": {
        "name": "Emil Tantilov",
        "email": "emil.s.tantilov@intel.com",
        "time": "Fri Mar 26 11:25:58 2010 +0000"
      },
      "committer": {
        "name": "David S. Miller",
        "email": "davem@davemloft.net",
        "time": "Sat Mar 27 08:33:22 2010 -0700"
      },
      "message": "e1000: do not modify tx_queue_len on link speed change\n\nPreviously the driver tweaked txqueuelen to avoid false Tx hang reports\nseen at half duplex.  This had the effect of overriding user set values\non link change/reset. Testing shows that adjusting only the timeout\nfactor is sufficient to prevent Tx hang reports at half duplex.\n\nThis patch removes all instances of tx_queue_len in the driver.\n\nBased on e1000e patch by Franco Fichtner \u003cfranco@lastsummer.de\u003e\n\nCC: Franco Fichtner \u003cfranco@lastsummer.de\u003e\nSigned-off-by: Emil Tantilov \u003cemil.s.tantilov@intel.com\u003e\nAcked-by: Jesse Brandeburg \u003cjesse.brandeburg@intel.com\u003e\nSigned-off-by: Jeff Kirsher \u003cjeffrey.t.kirsher@intel.com\u003e\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n"
    },
    {
      "commit": "d6dbee861386cd3f4cee62bcf28597e63e251e0c",
      "tree": "191bf8cf781719d30732f48d27393d7b41978d14",
      "parents": [
        "c2bb1b9c7e862ecca2ffb20b1457034d2c401845"
      ],
      "author": {
        "name": "Frans Pop",
        "email": "elendil@planet.nl",
        "time": "Wed Mar 24 07:57:35 2010 +0000"
      },
      "committer": {
        "name": "David S. Miller",
        "email": "davem@davemloft.net",
        "time": "Wed Mar 24 14:10:22 2010 -0700"
      },
      "message": "net/intel: remove trailing space in messages\n\nIncludes one minor indentation fix to placate checkpatch.\n\nSigned-off-by: Frans Pop \u003celendil@planet.nl\u003e\nCc: e1000-devel@lists.sourceforge.net\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n"
    },
    {
      "commit": "04488734806948624dabc4514f96f14cd75b9a50",
      "tree": "74f3a3c10a7177a5f86398b83ad7bf0569fe8b89",
      "parents": [
        "54831a83bfe656c4c54e287c734c6b0ccaa3719b",
        "c4d49794ff2838038fd9756eae39c39a5a685833"
      ],
      "author": {
        "name": "David S. Miller",
        "email": "davem@davemloft.net",
        "time": "Thu Feb 25 23:22:42 2010 -0800"
      },
      "committer": {
        "name": "David S. Miller",
        "email": "davem@davemloft.net",
        "time": "Thu Feb 25 23:22:42 2010 -0800"
      },
      "message": "Merge branch \u0027master\u0027 of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6\n"
    },
    {
      "commit": "b5abb028e214cca68f4231d4f3bc0847ddbc986e",
      "tree": "1ff65ef5395914b6b5e9f77b7cd550cebc7dc20f",
      "parents": [
        "242cc0547f3bcecc0b02ca6f3e9512760185727e"
      ],
      "author": {
        "name": "Anton Blanchard",
        "email": "anton@samba.org",
        "time": "Fri Feb 19 17:54:53 2010 +0000"
      },
      "committer": {
        "name": "David S. Miller",
        "email": "davem@davemloft.net",
        "time": "Tue Feb 23 01:24:59 2010 -0800"
      },
      "message": "e1000: Fix DMA mapping error handling on RX\n\nCheck for error return from pci_map_single/pci_map_page and clean up.\n\nWith this and the previous patch the driver was able to handle a significant\npercentage of errors (I set the fault injection rate to 10% and could still\ndownload large files at a reasonable speed).\n\nSigned-off-by: Anton Blanchard \u003canton@samba.org\u003e\nSigned-off-by: Jeff Kirsher \u003cjeffrey.t.kirsher@intel.com\u003e\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n"
    },
    {
      "commit": "10886af54a2478f97f2d5f89bbe270b99206f8ab",
      "tree": "47c04fe2b4913772ab423fc2a2d0ae1d46c19ea9",
      "parents": [
        "295fae568885a93c39a0e29a9455054608b6cc0e"
      ],
      "author": {
        "name": "Jiri Pirko",
        "email": "jpirko@redhat.com",
        "time": "Tue Feb 23 01:19:22 2010 -0800"
      },
      "committer": {
        "name": "David S. Miller",
        "email": "davem@davemloft.net",
        "time": "Tue Feb 23 01:19:22 2010 -0800"
      },
      "message": "e1000: correct wrong coding style for \"else\"\n\nSigned-off-by: Jiri Pirko \u003cjpirko@redhat.com\u003e\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n"
    },
    {
      "commit": "7a81e9f3ca712db82344ea3ab2a5879241f59c48",
      "tree": "0fb735aa960e09d3fb4109412f7ba06cf6c9b4b0",
      "parents": [
        "0ddf477b8a9b02412a6cabd51c486998811c7dd1"
      ],
      "author": {
        "name": "Jiri Pirko",
        "email": "jpirko@redhat.com",
        "time": "Mon Feb 22 09:10:44 2010 +0000"
      },
      "committer": {
        "name": "David S. Miller",
        "email": "davem@davemloft.net",
        "time": "Mon Feb 22 15:45:51 2010 -0800"
      },
      "message": "e1000: convert to use netdev_for_each_mc_addr\n\nSigned-off-by: Jiri Pirko \u003cjpirko@redhat.com\u003e\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n"
    },
    {
      "commit": "dbb5aaebc44ce7f64b12904c58fbc1dd487982a7",
      "tree": "1e12e8b4bb53365666cc5e9763989b8c6535069b",
      "parents": [
        "b548192acaebcb05d6a87d1e94f19835b1a18a8b"
      ],
      "author": {
        "name": "Nick Nunley",
        "email": "nicholasx.d.nunley@intel.com",
        "time": "Wed Feb 03 14:49:48 2010 +0000"
      },
      "committer": {
        "name": "David S. Miller",
        "email": "davem@davemloft.net",
        "time": "Wed Feb 03 19:39:57 2010 -0800"
      },
      "message": "e1000: call pci_save_state after pci_restore_state\n\nThis patch adds a call to pci_save_state() immediately after\nthe call to pci_restore_state(). Due to a change in the behavior\nof pci_restore_state() it is necessary to call pci_save_state()\nto keep the state_saved flag. This patch is based on a similar\npatch for ixgbe.\n\nSigned-off-by: Nicholas Nunley \u003cnicholasx.d.nunley@intel.com\u003e\nSigned-off-by: Jeff Kirsher \u003cjeffrey.t.kirsher@intel.com\u003e\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n"
    },
    {
      "commit": "b548192acaebcb05d6a87d1e94f19835b1a18a8b",
      "tree": "d84ebe0a50cbeba290d01525ec14d3c91f713e24",
      "parents": [
        "10eec95569513206877769ad9336591c08015cfe"
      ],
      "author": {
        "name": "Nick Nunley",
        "email": "nicholasx.d.nunley@intel.com",
        "time": "Wed Feb 03 14:49:28 2010 +0000"
      },
      "committer": {
        "name": "David S. Miller",
        "email": "davem@davemloft.net",
        "time": "Wed Feb 03 19:39:56 2010 -0800"
      },
      "message": "e1000: Report link status in ethtool when interface is down\n\nWith this change ethtool will correctly report link status when\nthe interface is down. Currently ethtool reports the link as not\ndetected when the interface is down.\n\nSigned-off-by: Nicholas Nunley \u003cnicholasx.d.nunley@intel.com\u003e\nSigned-off-by: Jeff Kirsher \u003cjeffrey.t.kirsher@intel.com\u003e\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n"
    },
    {
      "commit": "05ba712d7eb156009753e18e5116cabd869cc6e2",
      "tree": "1ad850d6889f6b3671a5636653940f20a7d22bdf",
      "parents": [
        "257ddbdad13cd3c4f7d03b85af632c508aa8abc9",
        "b473946a0853860e13b51c28add5524741117786"
      ],
      "author": {
        "name": "David S. Miller",
        "email": "davem@davemloft.net",
        "time": "Thu Jan 28 06:12:38 2010 -0800"
      },
      "committer": {
        "name": "David S. Miller",
        "email": "davem@davemloft.net",
        "time": "Thu Jan 28 06:12:38 2010 -0800"
      },
      "message": "Merge branch \u0027master\u0027 of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6\n"
    },
    {
      "commit": "32e7bfc41110bc8f29ec0f293c3bcee6645fef34",
      "tree": "b770a040aee7a6a196514cbf5328debb33321d4d",
      "parents": [
        "9010bc3364db56dd88a1851e0797e597e322ce08"
      ],
      "author": {
        "name": "Jiri Pirko",
        "email": "jpirko@redhat.com",
        "time": "Mon Jan 25 13:36:10 2010 -0800"
      },
      "committer": {
        "name": "David S. Miller",
        "email": "davem@davemloft.net",
        "time": "Mon Jan 25 13:36:10 2010 -0800"
      },
      "message": "net: use helpers to access uc list V2\n\nThis patch introduces three macros to work with uc list from net drivers.\n\nSigned-off-by: Jiri Pirko \u003cjpirko@redhat.com\u003e\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n"
    },
    {
      "commit": "9926146b15fd96d78a4f7c32e7a26d50639369f4",
      "tree": "264806b984ed232d80e6998ce895c6497be952b3",
      "parents": [
        "33d7959a7a9ef36573bfd0cc85ebef29ed4b846d"
      ],
      "author": {
        "name": "Jesse Brandeburg",
        "email": "jesse.brandeburg@intel.com",
        "time": "Fri Jan 22 22:56:16 2010 +0000"
      },
      "committer": {
        "name": "David S. Miller",
        "email": "davem@davemloft.net",
        "time": "Sat Jan 23 01:08:53 2010 -0800"
      },
      "message": "e1000/e1000e: don\u0027t use small hardware rx buffers\n\nWhen testing the \"e1000: enhance frame fragment detection\" (and e1000e)\npatches we found some bugs with reducing the MTU size.  The 1024 byte\ndescriptor used with the 1000 mtu test also (re) introduced the\n(originally) reported bug, and causes us to need the e1000_clean_tx_irq\n\"enhance frame fragment detection\" fix.\n\nSo what has occured here is that 2.6.32 is only vulnerable for mtu \u003c\n1500 due to the jumbo specific routines in both e1000 and e1000e.\nSo, 2.6.32 needs the 2kB buffer len fix for those smaller MTUs, but\nis not vulnerable to the original issue reported.  It has been pointed\nout that this vulnerability needs to be patched in older kernels that\ndon\u0027t have the e1000 jumbo routine.  Without the jumbo routines, we\nneed the \"enhance frame fragment detection\" fix the e1000, old\ne1000e is only vulnerable for \u003c 1500 mtu, and needs a similar\nfix.  We split the patches up to provide easy backport paths.\n\nThere is only a slight bit of extra code when this fix and the\noriginal \"enhance frame fragment detection\" fixes are applied, so\nplease apply both, even though it is a bit of overkill.\n\nSigned-off-by: Jesse Brandeburg \u003cjesse.brandeburg@intel.com\u003e\nSigned-off-by: Jeff Kirsher \u003cjeffrey.t.kirsher@intel.com\u003e\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n"
    },
    {
      "commit": "51c24aaacaea90c8e87f1dec75a2ac7622b593f8",
      "tree": "9f54936c87764bef75e97395cb56b7d1e0df24c6",
      "parents": [
        "4276e47e2d1c85a2477caf0d22b91c4f2377fba8",
        "6be325719b3e54624397e413efd4b33a997e55a3"
      ],
      "author": {
        "name": "David S. Miller",
        "email": "davem@davemloft.net",
        "time": "Sat Jan 23 00:31:06 2010 -0800"
      },
      "committer": {
        "name": "David S. Miller",
        "email": "davem@davemloft.net",
        "time": "Sat Jan 23 00:31:06 2010 -0800"
      },
      "message": "Merge branch \u0027master\u0027 of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6\n"
    },
    {
      "commit": "40a14deaf411592b57cb0720f0e8004293ab9865",
      "tree": "fc485d84b49042915e5d03a03f9bb988e8c3d175",
      "parents": [
        "c1fa347f20f17f14a4a1575727fa24340e8a9117"
      ],
      "author": {
        "name": "Jesse Brandeburg",
        "email": "jesse.brandeburg@intel.com",
        "time": "Tue Jan 19 14:15:38 2010 +0000"
      },
      "committer": {
        "name": "David S. Miller",
        "email": "davem@davemloft.net",
        "time": "Wed Jan 20 16:21:22 2010 -0800"
      },
      "message": "e1000: enhance frame fragment detection\n\nOriginally From: Neil Horman \u003cnhorman@tuxdriver.com\u003e\nModified by: Jesse Brandeburg \u003cjesse.brandeburg@intel.com\u003e\n\nHey all-\n\tA security discussion was recently given:\nhttp://events.ccc.de/congress/2009/Fahrplan//events/3596.en.html\nAnd a patch that I submitted awhile back was brought up.  Apparently some of\ntheir testing revealed that they were able to force a buffer fragment in e1000\nin which the trailing fragment was greater than 4 bytes.  As a result the\nfragment check I introduced failed to detect the fragement and a partial\ninvalid frame was passed up into the network stack.  I\u0027ve written this patch\nto correct it.  I\u0027m in the process of testing it now, but it makes good\nlogical sense to me.  Effectively it maintains a per-adapter state variable\nwhich detects a non-EOP frame, and discards it and subsequent non-EOP frames\nleading up to _and_ _including_ the next positive-EOP frame (as it is by\ndefinition the last fragment).  This should prevent any and all partial frames\nfrom entering the network stack from e1000.\n\nSigned-off-by: Jesse Brandeburg \u003cjesse.brandeburg@intel.com\u003e\nAcked-by: Neil Horman \u003cnhorman@tuxdriver.com\u003e\nSigned-off-by: Jeff Kirsher \u003cjeffrey.t.kirsher@intel.com\u003e\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n"
    },
    {
      "commit": "c1fa347f20f17f14a4a1575727fa24340e8a9117",
      "tree": "520a4cc063e0f64030ddae6744970c7fcb0785db",
      "parents": [
        "b4ced2b768ab6c580148d1163c82a655fe147edc"
      ],
      "author": {
        "name": "Roel Kluin",
        "email": "roel.kluin@gmail.com",
        "time": "Tue Jan 19 14:21:45 2010 +0000"
      },
      "committer": {
        "name": "David S. Miller",
        "email": "davem@davemloft.net",
        "time": "Wed Jan 20 16:21:22 2010 -0800"
      },
      "message": "e1000/e1000e/igb/igbvf/ixgb/ixgbe: Fix tests of unsigned in *_tx_map()\n\nThe variable count and i are unsigned so the (\u003c|\u003e\u003d)0 tests do not work.\n\nSigned-off-by: Roel Kluin \u003croel.kluin@gmail.com\u003e\nSigned-off-by: Jeff Kirsher \u003cjeffrey.t.kirsher@intel.com\u003e\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n"
    },
    {
      "commit": "a3aa18842a5303fc28fcc4d57dbd16618bd830a0",
      "tree": "9214348bd1e57ad0a3701314be60adf19dfef702",
      "parents": [
        "108316c1bd0a75ba855ce4a6540c530e1562bfb0"
      ],
      "author": {
        "name": "Alexey Dobriyan",
        "email": "adobriyan@gmail.com",
        "time": "Thu Jan 07 11:58:11 2010 +0000"
      },
      "committer": {
        "name": "David S. Miller",
        "email": "davem@davemloft.net",
        "time": "Thu Jan 07 23:54:26 2010 -0800"
      },
      "message": "drivers/net/: use DEFINE_PCI_DEVICE_TABLE()\n\nUse DEFINE_PCI_DEVICE_TABLE() so we get place PCI ids table into correct section\nin every case.\n\nSigned-off-by: Alexey Dobriyan \u003cadobriyan@gmail.com\u003e\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n"
    },
    {
      "commit": "8e95a2026f3b43f7c3d676adaccd2de9532e8dcc",
      "tree": "3733318168cd512480b6db58c5c16d1c8847f0b7",
      "parents": [
        "3454f835837609d60b29a266e3bd9d701073b060"
      ],
      "author": {
        "name": "Joe Perches",
        "email": "joe@perches.com",
        "time": "Thu Dec 03 07:58:21 2009 +0000"
      },
      "committer": {
        "name": "David S. Miller",
        "email": "davem@davemloft.net",
        "time": "Thu Dec 03 13:18:01 2009 -0800"
      },
      "message": "drivers/net: Move \u0026\u0026 and || to end of previous line\n\nOnly files where David Miller is the primary git-signer.\nwireless, wimax, ixgbe, etc are not modified.\n\nCompile tested x86 allyesconfig only\nNot all files compiled (not x86 compatible)\n\nAdded a few \u003e 80 column lines, which I ignored.\nExisting checkpatch complaints ignored.\n\nSigned-off-by: Joe Perches \u003cjoe@perches.com\u003e\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n"
    },
    {
      "commit": "602c0554d7b00c9703e1a0bc584e9c583f577642",
      "tree": "19928889ab797326d9bb841aca1f79a80a62c540",
      "parents": [
        "03b1320dfceeb093890cdd7433e910dca6225ddb"
      ],
      "author": {
        "name": "Alexander Duyck",
        "email": "alexander.h.duyck@intel.com",
        "time": "Wed Dec 02 16:46:00 2009 +0000"
      },
      "committer": {
        "name": "David S. Miller",
        "email": "davem@davemloft.net",
        "time": "Wed Dec 02 19:57:10 2009 -0800"
      },
      "message": "e1000: remove use of skb_dma_map from e1000 driver\n\nRemove the use of skb_dma_map from the e1000 driver in order to avoid\nissues when HW iommu are in use.\n\nSigned-off-by: Alexander Duyck \u003calexander.h.duyck@intel.com\u003e\nSigned-off-by: Jeff Kirsher \u003cjeffrey.t.kirsher@intel.com\u003e\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n"
    },
    {
      "commit": "a0607fd3a25ba1848a63a0d925e36d914735ab47",
      "tree": "c9bbdf40c9ded30af844e80870a7180ce0c0cb5c",
      "parents": [
        "2939e275994977b6c9eb7fd082b7b0caa35b96b0"
      ],
      "author": {
        "name": "Joe Perches",
        "email": "joe@perches.com",
        "time": "Wed Nov 18 23:29:17 2009 -0800"
      },
      "committer": {
        "name": "David S. Miller",
        "email": "davem@davemloft.net",
        "time": "Wed Nov 18 23:29:17 2009 -0800"
      },
      "message": "drivers/net: request_irq - Remove unnecessary leading \u0026 from second arg\n\nNot as fancy as coccinelle.  Checkpatch errors ignored.\nCompile tested allyesconfig x86, not all files compiled.\n\ngrep -rPl --include\u003d*.[ch] \"\\brequest_irq\\s*\\([^,\\)]+,\\s*\\\u0026\" drivers/net | while read file ; do \\\n\tperl -i -e \u0027local $/; while (\u003c\u003e) { s@(\\brequest_irq\\s*\\([^,\\)]+,\\s*)\\\u0026@\\1@g ; print ; }\u0027 $file ;\\\ndone\n\nSigned-off-by: Joe Perches \u003cjoe@perches.com\u003e\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n"
    },
    {
      "commit": "8328c38fcda2743249fd142174acf025d4cdd21f",
      "tree": "40c920ed68896e0c71290d2e0b00cac5108ac8b5",
      "parents": [
        "e0f36a95c7adb6551188cdcc5a7031ce106fccbf"
      ],
      "author": {
        "name": "Ajit Khaparde",
        "email": "ajitk@serverengines.com",
        "time": "Tue Oct 13 01:45:48 2009 +0000"
      },
      "committer": {
        "name": "David S. Miller",
        "email": "davem@davemloft.net",
        "time": "Tue Oct 13 11:48:28 2009 -0700"
      },
      "message": "e1000: Fix erroneous display of stats by ethtool -S\n\nCommit 23d26497 overlooked the way offsets for netdev stats were considered.\nBecause of this some of the stats shown by ethtool -S were wrong.\nThis patch fixes it.\n\nSigned-off-by: Ajit Khaparde \u003cajitk@serverengines.com\u003e\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n"
    },
    {
      "commit": "89d71a66c40d629e3b1285def543ab1425558cd5",
      "tree": "45159e85418170fe36e4e023d9617693625d1740",
      "parents": [
        "bff1c09640b3006bca711e18ef08a5fb955ad9b5"
      ],
      "author": {
        "name": "Eric Dumazet",
        "email": "eric.dumazet@gmail.com",
        "time": "Tue Oct 13 05:34:20 2009 +0000"
      },
      "committer": {
        "name": "David S. Miller",
        "email": "davem@davemloft.net",
        "time": "Tue Oct 13 11:48:18 2009 -0700"
      },
      "message": "net: Use netdev_alloc_skb_ip_align()\n\nSigned-off-by: Eric Dumazet \u003ceric.dumazet@gmail.com\u003e\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n"
    },
    {
      "commit": "5fe31deffa097795aed7ab276c90287823d26497",
      "tree": "a7fbbfd16edf08d8795303358e586d9bb634a9cc",
      "parents": [
        "8d24e93309d688d59d4b6cf0b9cffc40337e067d"
      ],
      "author": {
        "name": "Ajit Khaparde",
        "email": "ajitkhaparde@gmail.com",
        "time": "Wed Oct 07 02:42:23 2009 +0000"
      },
      "committer": {
        "name": "David S. Miller",
        "email": "davem@davemloft.net",
        "time": "Wed Oct 07 22:00:27 2009 -0700"
      },
      "message": "e1000: Use the instance of net_device_stats from net_device.\n\nSince net_device has an instance of net_device_stats,\nwe can remove the instance of this from the adapter structure.\n\nSigned-off-by: Ajit Khaparde \u003cajitk@serverengines.com\u003e\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n"
    },
    {
      "commit": "a71b4f5e2b42a773947625ce0a6367837f8d9359",
      "tree": "f87293d318fe3c2f11b14db766f8760493fa50cc",
      "parents": [
        "11b7f7b37809f594951b7f98094c85f433f86d1a"
      ],
      "author": {
        "name": "Don Skidmore",
        "email": "donald.c.skidmore@intel.com",
        "time": "Fri Sep 25 12:20:57 2009 +0000"
      },
      "committer": {
        "name": "David S. Miller",
        "email": "davem@davemloft.net",
        "time": "Sat Sep 26 20:16:05 2009 -0700"
      },
      "message": "e1000: cleanup unused prototype\n\nThe function e1000_enable_tx_pkt_filtering() was removed in\na previous cleanup patch.  this removes the no longer used\nprototype.\n\nSigned-off-by: Don Skidmore \u003cdonald.c.skidmore@intel.com\u003e\nSigned-off-by: Jeff Kirsher \u003cjeffrey.t.kirsher@intel.com\u003e\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n"
    },
    {
      "commit": "11b7f7b37809f594951b7f98094c85f433f86d1a",
      "tree": "02e018e0b2264454c3a010af3392276a0f77e0cd",
      "parents": [
        "8f601b2d565fdf24e34d90c617cd4b777faad68f"
      ],
      "author": {
        "name": "Jesse Brandeburg",
        "email": "jesse.brandeburg@intel.com",
        "time": "Fri Sep 25 12:20:33 2009 +0000"
      },
      "committer": {
        "name": "David S. Miller",
        "email": "davem@davemloft.net",
        "time": "Sat Sep 26 20:16:01 2009 -0700"
      },
      "message": "e1000: fix namespacecheck warnings\n\na couple of functions needed to be removed/declared static\n\nSigned-off-by: Jesse Brandeburg \u003cjesse.brandeburg@intel.com\u003e\nSigned-off-by: Don Skidmore \u003cdonald.c.skidmore@intel.com\u003e\nSigned-off-by: Jeff Kirsher \u003cjeffrey.t.kirsher@intel.com\u003e\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n"
    },
    {
      "commit": "8f601b2d565fdf24e34d90c617cd4b777faad68f",
      "tree": "80af51b1bbdf17cf8f1897f096e4e911407897be",
      "parents": [
        "120a5d0d588c9a4d47574fcfdab8454817c8586c"
      ],
      "author": {
        "name": "Jesse Brandeburg",
        "email": "jesse.brandeburg@intel.com",
        "time": "Fri Sep 25 12:20:11 2009 +0000"
      },
      "committer": {
        "name": "David S. Miller",
        "email": "davem@davemloft.net",
        "time": "Sat Sep 26 20:15:58 2009 -0700"
      },
      "message": "e1000: drop unused functionality for eeprom write/read\n\neerd and eewr don\u0027t exist on pre PCIe devices\n\nSigned-off-by: Jesse Brandeburg \u003cjesse.brandeburg@intel.com\u003e\nSigned-off-by: Don Skidmore \u003cdonald.c.skidmore@intel.com\u003e\nSigned-off-by: Jeff Kirsher \u003cjeffrey.t.kirsher@intel.com\u003e\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n"
    },
    {
      "commit": "120a5d0d588c9a4d47574fcfdab8454817c8586c",
      "tree": "7fd259149f9fbbf38f777995f568ec5aa32f7a04",
      "parents": [
        "650b5a5cc34b9fbd38b68e9b8bb1455222fcdb87"
      ],
      "author": {
        "name": "Jesse Brandeburg",
        "email": "jesse.brandeburg@intel.com",
        "time": "Fri Sep 25 15:19:46 2009 -0700"
      },
      "committer": {
        "name": "David S. Miller",
        "email": "davem@davemloft.net",
        "time": "Sat Sep 26 20:15:55 2009 -0700"
      },
      "message": "e1000: updated whitespace and comments\n\nA large whitespace change to e1000_hw.[ch] in order to update it to kernel coding\nstyle (by running lindent).  Updated function header comments into kdoc style.\n\nSigned-off-by: Jesse Brandeburg \u003cjesse.brandeburg@intel.com\u003e\nSigned-off-by: Don Skidmore \u003cdonald.c.skidmore@intel.com\u003e\nSigned-off-by: Jeff Kirsher \u003cjeffrey.t.kirsher@intel.com\u003e\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n"
    },
    {
      "commit": "650b5a5cc34b9fbd38b68e9b8bb1455222fcdb87",
      "tree": "86056bc988f98d4562c251a5ff690c6032d42855",
      "parents": [
        "3d6114e71dffb9fb9dedc8569103310c5bbf0296"
      ],
      "author": {
        "name": "Jesse Brandeburg",
        "email": "jesse.brandeburg@intel.com",
        "time": "Fri Sep 25 12:19:23 2009 +0000"
      },
      "committer": {
        "name": "David S. Miller",
        "email": "davem@davemloft.net",
        "time": "Sat Sep 26 20:15:52 2009 -0700"
      },
      "message": "e1000: drop redunant line of code, cleanup\n\nadapter was being assigned twice, also clarified variable name and unwrapped\nline.\n\nSigned-off-by: Jesse Brandeburg \u003cjesse.brandeburg@intel.com\u003e\nSigned-off-by: Don Skidmore \u003cdonald.c.skidmore@intel.com\u003e\nSigned-off-by: Jeff Kirsher \u003cjeffrey.t.kirsher@intel.com\u003e\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n"
    },
    {
      "commit": "3d6114e71dffb9fb9dedc8569103310c5bbf0296",
      "tree": "7fc265f766ef35cb6330e73680d83e6140fae30f",
      "parents": [
        "8fce47317fc96b222ea7e28fb6d153b1855e91cd"
      ],
      "author": {
        "name": "Jesse Brandeburg",
        "email": "jesse.brandeburg@intel.com",
        "time": "Fri Sep 25 12:19:02 2009 +0000"
      },
      "committer": {
        "name": "David S. Miller",
        "email": "davem@davemloft.net",
        "time": "Sat Sep 26 20:15:47 2009 -0700"
      },
      "message": "e1000: remove races when changing mtu\n\nthis patch fixes a bug that occurs when routing packets and simultaneously\nchanging the mtu.  the rx_buffer_len variable is used during the rx cleanup\nand if that changes on the fly without stopping traffic bad things happen\n\nSigned-off-by: Jesse Brandeburg \u003cjesse.brandeburg@intel.com\u003e\nSigned-off-by: Don Skidmore \u003cdonald.c.skidmore@intel.com\u003e\nSigned-off-by: Jeff Kirsher \u003cjeffrey.t.kirsher@intel.com\u003e\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n"
    },
    {
      "commit": "8fce47317fc96b222ea7e28fb6d153b1855e91cd",
      "tree": "f1981a54e82c35779b83b20d6e58e22f29700595",
      "parents": [
        "cdd7549e27bf5e8abc4e19d5e8d110b8252b4fe4"
      ],
      "author": {
        "name": "Jesse Brandeburg",
        "email": "jesse.brandeburg@intel.com",
        "time": "Fri Sep 25 12:18:41 2009 +0000"
      },
      "committer": {
        "name": "David S. Miller",
        "email": "davem@davemloft.net",
        "time": "Sat Sep 26 20:15:45 2009 -0700"
      },
      "message": "e1000: two workarounds were incomplete, fix them\n\n1) 82544 does not need last_tx_tso workaround, it interferes with the 82544\nworkaround too\n2) 82544 hang workaround was using the address of the page struct instead of\nthe physical address as its \"workaround decider\" not sure how that ever worked\n\nSigned-off-by: Jesse Brandeburg \u003cjesse.brandeburg@intel.com\u003e\nSigned-off-by: Don Skidmore \u003cdonald.c.skidmore@intel.com\u003e\nSigned-off-by: Jeff Kirsher \u003cjeffrey.t.kirsher@intel.com\u003e\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n"
    },
    {
      "commit": "cdd7549e27bf5e8abc4e19d5e8d110b8252b4fe4",
      "tree": "20682463abca2954c6a50ec1ac77971e989becc3",
      "parents": [
        "be0f071956e2142e2e88e9d6d5655ba1c75d07c8"
      ],
      "author": {
        "name": "Jesse Brandeburg",
        "email": "jesse.brandeburg@intel.com",
        "time": "Fri Sep 25 12:18:07 2009 +0000"
      },
      "committer": {
        "name": "David S. Miller",
        "email": "davem@davemloft.net",
        "time": "Sat Sep 26 20:15:42 2009 -0700"
      },
      "message": "e1000: fix tx waking queue after queue stopped during shutdown\n\nThis fix closes a race where the adapter can be shutting down while\nhard_start_xmit is being called and interrupts are being handled.\n\nSigned-off-by: Jesse Brandeburg \u003cjesse.brandeburg@intel.com\u003e\nSigned-off-by: Don Skidmore \u003cdonald.c.skidmore@intel.com\u003e\nSigned-off-by: Jeff Kirsher \u003cjeffrey.t.kirsher@intel.com\u003e\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n"
    },
    {
      "commit": "be0f071956e2142e2e88e9d6d5655ba1c75d07c8",
      "tree": "e0b1be3f259841aaabcfbb02c4495dd2580d0130",
      "parents": [
        "baa34745fe6263c733f43feddb0b8100d6538f37"
      ],
      "author": {
        "name": "Jesse Brandeburg",
        "email": "jesse.brandeburg@intel.com",
        "time": "Fri Sep 25 12:17:44 2009 +0000"
      },
      "committer": {
        "name": "David S. Miller",
        "email": "davem@davemloft.net",
        "time": "Sat Sep 26 20:15:36 2009 -0700"
      },
      "message": "e1000: test link state conclusively\n\ne1000 was using one particular way to detect link, but with the advent\nof some of the newer hardware designs using SERDES connections, tests\nfor link must completely cover all cases.\n\nSigned-off-by: Jesse Brandeburg \u003cjesse.brandeburg@intel.com\u003e\nSigned-off-by: Don Skidmore \u003cdonald.c.skidmore@intel.com\u003e\nSigned-off-by: Jeff Kirsher \u003cjeffrey.t.kirsher@intel.com\u003e\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n"
    },
    {
      "commit": "baa34745fe6263c733f43feddb0b8100d6538f37",
      "tree": "c77d8e304a958f01f9665a51e1703e1f20c499dd",
      "parents": [
        "51851073093f36a626de5f5eb1b87db9cae7e0d2"
      ],
      "author": {
        "name": "Jesse Brandeburg",
        "email": "jesse.brandeburg@intel.com",
        "time": "Fri Sep 25 12:17:23 2009 +0000"
      },
      "committer": {
        "name": "David S. Miller",
        "email": "davem@davemloft.net",
        "time": "Sat Sep 26 20:15:34 2009 -0700"
      },
      "message": "e1000: stop timers at appropriate times\n\nthere were some hotplug cases that made timers still run after the driver\nhad been removed, make sure to stop all the timers and not allow racy\nreschedules.\n\nSigned-off-by: Jesse Brandeburg \u003cjesse.brandeburg@intel.com\u003e\nSigned-off-by: Don Skidmore \u003cdonald.c.skidmore@intel.com\u003e\nSigned-off-by: Jeff Kirsher \u003cjeffrey.t.kirsher@intel.com\u003e\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n"
    },
    {
      "commit": "51851073093f36a626de5f5eb1b87db9cae7e0d2",
      "tree": "b78b351ca6531e8efd531db04795627d7f0d6891",
      "parents": [
        "282b177782b6bea756f9d46f72422a7304693179"
      ],
      "author": {
        "name": "Jesse Brandeburg",
        "email": "jesse.brandeburg@intel.com",
        "time": "Fri Sep 25 12:17:01 2009 +0000"
      },
      "committer": {
        "name": "David S. Miller",
        "email": "davem@davemloft.net",
        "time": "Sat Sep 26 20:15:29 2009 -0700"
      },
      "message": "e1000: use netif_tx_disable\n\nwe can use netif_tx_disable now because LLTX has been removed.\n\nSigned-off-by: Jesse Brandeburg \u003cjesse.brandeburg@intel.com\u003e\nSigned-off-by: Don Skidmore \u003cdonald.c.skidmore@intel.com\u003e\nSigned-off-by: Jeff Kirsher \u003cjeffrey.t.kirsher@intel.com\u003e\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n"
    },
    {
      "commit": "282b177782b6bea756f9d46f72422a7304693179",
      "tree": "efee753d4b0f0a57542c5b5f77739862874380f1",
      "parents": [
        "1532ecea1debf8d2cd50c99e299ad35f43a55291"
      ],
      "author": {
        "name": "Jesse Brandeburg",
        "email": "jesse.brandeburg@intel.com",
        "time": "Fri Sep 25 12:16:39 2009 +0000"
      },
      "committer": {
        "name": "David S. Miller",
        "email": "davem@davemloft.net",
        "time": "Sat Sep 26 20:15:26 2009 -0700"
      },
      "message": "e1000: remove unused functions\n\nafter removal of pcie, need to remove some unnecessary functions\n\nSigned-off-by: Jesse Brandeburg \u003cjesse.brandeburg@intel.com\u003e\nSigned-off-by: Don Skidmore \u003cdonald.c.skidmore@intel.com\u003e\nSigned-off-by: Jeff Kirsher \u003cjeffrey.t.kirsher@intel.com\u003e\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n"
    },
    {
      "commit": "1532ecea1debf8d2cd50c99e299ad35f43a55291",
      "tree": "f7a0e1a201e8f596a259f0808e93c181e5f119d9",
      "parents": [
        "99c4a6344f6574c97019ac16e8d54bfe5ad21f2d"
      ],
      "author": {
        "name": "Jesse Brandeburg",
        "email": "jesse.brandeburg@intel.com",
        "time": "Fri Sep 25 12:16:14 2009 +0000"
      },
      "committer": {
        "name": "David S. Miller",
        "email": "davem@davemloft.net",
        "time": "Sat Sep 26 20:15:23 2009 -0700"
      },
      "message": "e1000: drop dead pcie code from e1000\n\nthis patch is the first in a series of clean up patches for e1000 to drop\nunused code, and update the driver to kernel spec, and then, to update the\ndriver to have all available bug fixes.\n\nCall it the e1000 weight loss plan.\n\nSigned-off-by: Jesse Brandeburg \u003cjesse.brandeburg@intel.com\u003e\nSigned-off-by: Don Skidmore \u003cdonald.c.skidmore@intel.com\u003e\nSigned-off-by: Jeff Kirsher \u003cjeffrey.t.kirsher@intel.com\u003e\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n"
    },
    {
      "commit": "fd589a8f0a13f53a2dd580b1fe170633cf6b095f",
      "tree": "942c50188ca58041b0453189e710eafcfebaea57",
      "parents": [
        "4f37940d64a155c025968118849b596f6aaa8128"
      ],
      "author": {
        "name": "Anand Gadiyar",
        "email": "gadiyar@ti.com",
        "time": "Thu Jul 16 17:13:03 2009 +0200"
      },
      "committer": {
        "name": "Jiri Kosina",
        "email": "jkosina@suse.cz",
        "time": "Mon Sep 21 15:14:55 2009 +0200"
      },
      "message": "trivial: fix typo \"to to\" in multiple files\n\nSigned-off-by: Anand Gadiyar \u003cgadiyar@ti.com\u003e\nSigned-off-by: Jiri Kosina \u003cjkosina@suse.cz\u003e\n"
    },
    {
      "commit": "7ab0f2736bfe137a82a7084bbfb5f809da95cabd",
      "tree": "e305ec96eceebb285efee4b6fd307822ab257fe6",
      "parents": [
        "aae5e7c30fc660c50dfecbdd745799b05af90f01"
      ],
      "author": {
        "name": "Ben Hutchings",
        "email": "bhutchings@solarflare.com",
        "time": "Thu Sep 03 10:39:43 2009 +0000"
      },
      "committer": {
        "name": "David S. Miller",
        "email": "davem@davemloft.net",
        "time": "Thu Sep 03 20:02:11 2009 -0700"
      },
      "message": "netdev: Remove redundant checks for CAP_NET_ADMIN in MDIO implementations\n\ndev_ioctl() already checks capable(CAP_NET_ADMIN) before calling the\ndriver\u0027s implementation of MDIO ioctls.\n\nSigned-off-by: Ben Hutchings \u003cbhutchings@solarflare.com\u003e\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n"
    },
    {
      "commit": "fd38d7a0a0618656e491ed67af735bc4e3600367",
      "tree": "0afca5e748ec6fac988b340dfce3ed2883d93ef4",
      "parents": [
        "6fa12c85031485dff38ce550c24f10da23b0adaa"
      ],
      "author": {
        "name": "Graham, David",
        "email": "david.graham@intel.com",
        "time": "Mon Aug 31 14:12:51 2009 +0000"
      },
      "committer": {
        "name": "David S. Miller",
        "email": "davem@davemloft.net",
        "time": "Tue Sep 01 17:40:11 2009 -0700"
      },
      "message": "e1000: Fix for e1000 kills IPMI on a tagged vlan.\n\nEnabling VLAN filters (VFE) when the primary interface is brought up\n(per commit 78ed11a) has caused problems for some users who manage\ntheir systems using IPMI over a VLAN. This is because when the driver\nenables the VLAN filter, this same filter table is enabled for the\nmanagement channel, and the table is initially empty, which means that\nthe IPMI/VLAN packets are filtered out and not received by the BMC.\nThis is a problem only on e1000 class adapters, as it is only\non e1000 that the filter table is common to the management and host\nstreams.\n\nWith this change, filtering is only enabled when one or more host VLANs\nexist, and is disabled when the last host VLAN is removed. VLAN filtering\nis always disabled when the primary interface is in promiscuous mode,\nand will be (re)enabled if VLANs exist when the interface exits\npromiscuous mode.\n\nNote that this does not completely resolve the issue for those using VLAN\nmanagement, because if the host adds a VLAN, then the above problem\noccurs when that VLAN is enabled. However, it does mean the there is no\nproblem for configurations where management is on a VLAN and the host is\nnot.\n\nA complete solution to this issue would require further driver changes.\nThe driver would need to discover if (and which) management VLANs are\nactive before enabling VLAN filtering, so that it could ensure that the\nmanaged VLANs are included in the VLAN filter table. This discovery\nrequires that the BMC identifies its VLAN in registers accessible\nto the driver, and at least on Dell PE2850 systems the BMC does not\nidentify its VLAN to allow such discovery. Intel is pursuing this issue\nwith the BMC vendor.\n\nSigned-off-by: Dave Graham \u003cdavid.graham@intel.com\u003e\nSigned-off-by: Jeff Kirsher \u003cjeffrey.t.kirsher@intel.com\u003e\nTested-by: Krzysztof Piotr Oledzki \u003cole@ans.pl\u003e\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n"
    },
    {
      "commit": "3b29a56d31d585d39bf9ffe9ef1f10bd637ee0f1",
      "tree": "32bef42ee7730a73422195347476d412a5cb8fde",
      "parents": [
        "27a1de95a1461ec0589005c293d6ac23a46cb72d"
      ],
      "author": {
        "name": "Stephen Hemminger",
        "email": "shemminger@vyatta.com",
        "time": "Mon Aug 31 19:50:55 2009 +0000"
      },
      "committer": {
        "name": "David S. Miller",
        "email": "davem@davemloft.net",
        "time": "Tue Sep 01 01:13:52 2009 -0700"
      },
      "message": "intel: convert drivers to netdev_tx_t\n\nGet rid of some bogus return wrapping as well.\n\nSigned-off-by: Stephen Hemminger \u003cshemminger@vyatta.com\u003e\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n"
    },
    {
      "commit": "c46b59b241ec52ffaf92ece8d8ab726621d580fb",
      "tree": "bc13bb6a80831bc0be45fcf02db3bd64f5704f6d",
      "parents": [
        "cd1da503847a28775f60b959cb7b0123cee2a1a3"
      ],
      "author": {
        "name": "Graham, David",
        "email": "david.graham@intel.com",
        "time": "Tue Aug 25 04:43:17 2009 +0000"
      },
      "committer": {
        "name": "David S. Miller",
        "email": "davem@davemloft.net",
        "time": "Wed Aug 26 15:36:51 2009 -0700"
      },
      "message": "e1000: Remove unused function e1000_mta_set.\n\nRemove function e1000_mta_set, as it is no longer called\n\nSigned-off-by: Dave Graham \u003cdavid.graham@intel.com\u003e\nSigned-off-by: Jeff Kirsher \u003cjeffrey.t.kirsher@intel.com\u003e\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n"
    },
    {
      "commit": "b7cb8c2c8275ab081b97610b13a83c80904571a6",
      "tree": "d65785b59b2adadc5e428392ecde3144afc0e70c",
      "parents": [
        "edbbb3ca107715067b27a71e6ea7f58750912aa2"
      ],
      "author": {
        "name": "Jesse Brandeburg",
        "email": "jesse.brandeburg@intel.com",
        "time": "Mon Jul 06 10:45:01 2009 +0000"
      },
      "committer": {
        "name": "David S. Miller",
        "email": "davem@davemloft.net",
        "time": "Mon Jul 06 18:07:52 2009 -0700"
      },
      "message": "e1000: fix flow control thresholds\n\nwhen testing the jumbo frames with pages patch, the stats would\nshow rx_missed errors (dropped packets) even when connected to a\nlink partner with flow control enabled.\n\nthis indicates that for this MTU (9000) the flow control\nthresholds are not adjusting correctly.\n\nIn fact, before this change, the FCRTH (xoff threshold) is 36864\nwhen the fifo size is only 40000, with 9000 byte MTU.\n\nfix it so that we at least have room for one frame after we send\nthe xoff.\n\nSigned-off-by: Jesse Brandeburg \u003cjesse.brandeburg@intel.com\u003e\nSigned-off-by: Jeff Kirsher \u003cjeffrey.t.kirsher@intel.com\u003e\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n"
    },
    {
      "commit": "edbbb3ca107715067b27a71e6ea7f58750912aa2",
      "tree": "4b9772ff2dc239ad61812cce4b4e6249a25512a2",
      "parents": [
        "94c9e5a89349a1f1ebabe0876c059dc387b8b2a0"
      ],
      "author": {
        "name": "Jesse Brandeburg",
        "email": "jesse.brandeburg@intel.com",
        "time": "Mon Jul 06 10:44:39 2009 +0000"
      },
      "committer": {
        "name": "David S. Miller",
        "email": "davem@davemloft.net",
        "time": "Mon Jul 06 18:07:51 2009 -0700"
      },
      "message": "e1000: implement jumbo receive with partial descriptors\n\nThis is code extremely similar to what is committed in e1000e\nalready.\n\ne1000 will no longer request 32kB slab buffers to support jumbo\nframes on PCI/PCI-X adapters.  This will significantly reduce the\nlikelyhood of order:3 allocation failures.\n\nThis new code adds support for using pages as receive buffers,\nand the driver will chain multiple pages together to build a\njumbo frame for OS consumption.\n\nThe hardware takes a power of two buffer size and will\ndump as much data as it can receive into 1 or more buffers.\n\nThe benefits of applying this are\n1) stop akpm\u0027s dissing :-) of this lame e1000 behavior [1]\n2) more efficient memory allocation (half) when using jumbo\n   frames, which will also allow for much better socket utilization\n   with jumbos since the socket is charged for the full allocation\n   of each receive buffer, regardless of how much is used.\n3) this was a feature request by a customer\n4) copybreak for small packets \u003c 256 bytes still applies\n\n[1] http://lkml.org/lkml/2008/7/10/68\n    http://article.gmane.org/gmane.linux.network/130986\n\nSigned-off-by: Jesse Brandeburg \u003cjesse.brandeburg@intel.com\u003e\nCC: Andrew Morton \u003cakpm@linux-foundation.org\u003e\nSigned-off-by: Jeff Kirsher \u003cjeffrey.t.kirsher@intel.com\u003e\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n"
    },
    {
      "commit": "94c9e5a89349a1f1ebabe0876c059dc387b8b2a0",
      "tree": "77ca6e744fdcdbe129e2b8ec06132c1f36f5aa27",
      "parents": [
        "f77139c07a0e1dd164e039320ada50111f899223"
      ],
      "author": {
        "name": "Jesse Brandeburg",
        "email": "jesse.brandeburg@intel.com",
        "time": "Mon Jul 06 10:44:20 2009 +0000"
      },
      "committer": {
        "name": "David S. Miller",
        "email": "davem@davemloft.net",
        "time": "Mon Jul 06 18:07:47 2009 -0700"
      },
      "message": "e1000: allow ethtool coalesece to adjust interrupts per second\n\nThis patch allows on-the-fly adjustment of the interrupts per second generated\nby e1000 devices 82545/82546 (hardware support of ITR register is a\nrequirement)\n\nadjust using this command:\nethtool -C eth0 rx-usecs 10\n\nwhere 10 is 10 microseconds per interrupt interval, so 10 \u003d 100,000 interrupts\nper second, and 125 \u003d 8000 interrupts per second.\n\nchanges should be immediate.\n\n1,3 are special values and indicate the automatic tuning mode to the driver,\nwhere 1 is 4000-90000 interrupts per second and 3 is 4000-20000 interrupts\nper second and is the driver default.\n\nSigned-off-by: Jesse Brandeburg \u003cjesse.brandeburg@intel.com\u003e\nSigned-off-by: Jeff Kirsher \u003cjeffrey.t.kirsher@intel.com\u003e\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n"
    },
    {
      "commit": "eab633021c26025b34f36f79f0311d3d99f40ceb",
      "tree": "2480afd9c68fe414a83b7b0d753c421000d4321c",
      "parents": [
        "679be3ba0c493eb66d22c206273729ce50925e85"
      ],
      "author": {
        "name": "Andre Detsch",
        "email": "adetsch@br.ibm.com",
        "time": "Tue Jun 30 12:46:13 2009 +0000"
      },
      "committer": {
        "name": "David S. Miller",
        "email": "davem@davemloft.net",
        "time": "Tue Jun 30 19:47:00 2009 -0700"
      },
      "message": "e1000: return PCI_ERS_RESULT_DISCONNECT on permanent error\n\nPCI drivers that implement the io_error_detected callback\nshould return PCI_ERS_RESULT_DISCONNECT if the state\npassed in is pci_channel_io_perm_failure.  This state is\nnot checked in many of the network drivers.\n\nThe patch fixes the omission in the e1000 driver.\n\nBased on Mike Mason\u0027s similar patch for e1000e.\n\nSigned-off-by: Andre Detsch \u003cadetsch@br.ibm.com\u003e\nCC: Mike Mason \u003cmmlnx@us.ibm.com\u003e\nSigned-off-by: Jeff Kirsher \u003cjeffrey.t.kirsher@intel.com\u003e\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n"
    },
    {
      "commit": "679be3ba0c493eb66d22c206273729ce50925e85",
      "tree": "0248f05b482e2877009c89ec6c70d7dfbd3ae7e5",
      "parents": [
        "91615f765a2935b6cbae424b9eee1585ed681ae6"
      ],
      "author": {
        "name": "Jesse Brandeburg",
        "email": "jesse.brandeburg@intel.com",
        "time": "Tue Jun 30 12:45:34 2009 +0000"
      },
      "committer": {
        "name": "David S. Miller",
        "email": "davem@davemloft.net",
        "time": "Tue Jun 30 19:46:58 2009 -0700"
      },
      "message": "e1000: fix unmap bug\n\nas reported by kerneloops.org\n\n[  121.781161] ------------[ cut here ]------------\n[  121.781171] WARNING: at lib/dma-debug.c:793 check_unmap+0x14e/0x577()\n[  121.781173] Hardware name: S5520HC\n[  121.781177] e1000 0000:0a:00.0: DMA-API: device driver tries to free DMA\nmemory it has not allocated [device address\u003d0x00000001d688b0fa] [size\u003d1522\nbytes]\n[  121.781180] Modules linked in: e1000 mdio  dca [last unloaded: ixgbe]\n[  121.781187] Pid: 4793, comm: bash Tainted: P 2.6.30-master-06161113 #3\n[  121.781190] Call Trace:\n[  121.781195]  [\u003cffffffff8123056f\u003e] ? check_unmap+0x14e/0x577\n[  121.781201]  [\u003cffffffff81057a19\u003e] warn_slowpath_common+0x77/0x8f\n[  121.781205]  [\u003cffffffff81057ae1\u003e] warn_slowpath_fmt+0x9f/0xa1\n[  121.781212]  [\u003cffffffff81477ce2\u003e] ? _spin_lock_irqsave+0x3f/0x49\n[  121.781216]  [\u003cffffffff8122fa97\u003e] ? get_hash_bucket+0x28/0x33\n[  121.781220]  [\u003cffffffff8123056f\u003e] check_unmap+0x14e/0x577\n[  121.781225]  [\u003cffffffff810e4f48\u003e] ? check_bytes_and_report+0x38/0xcb\n[  121.781230]  [\u003cffffffff81230bbf\u003e] debug_dma_unmap_page+0x80/0x92\n[  121.781234]  [\u003cffffffff8122e549\u003e] ? unmap_single+0x1a/0x4e\n[  121.781239]  [\u003cffffffff813901e1\u003e] ? __kfree_skb+0x74/0x78\n[  121.781250]  [\u003cffffffffa00662ef\u003e] pci_unmap_single+0x64/0x6d [e1000]\n[  121.781259]  [\u003cffffffffa0066344\u003e] e1000_clean_rx_ring+0x4c/0xbf [e1000]\n[  121.781268]  [\u003cffffffffa00663df\u003e] e1000_clean_all_rx_rings+0x28/0x36 [e1000]\n[  121.781277]  [\u003cffffffffa0067464\u003e] e1000_down+0x138/0x141 [e1000]\n[  121.781286]  [\u003cffffffffa00681c2\u003e] __e1000_shutdown+0x6b/0x198 [e1000]\n[  121.781296]  [\u003cffffffffa0068405\u003e] e1000_suspend+0x17/0x50 [e1000]\n[  121.781301]  [\u003cffffffff81237665\u003e] pci_legacy_suspend+0x3b/0xbe\n[  121.781305]  [\u003cffffffff81237bc6\u003e] pci_pm_suspend+0x3e/0xf1\n[  121.781310]  [\u003cffffffff812eaf1c\u003e] pm_op+0x57/0xde\n[  121.781314]  [\u003cffffffff812eb444\u003e] dpm_suspend_start+0x31e/0x470\n[  121.781319]  [\u003cffffffff810877da\u003e] suspend_devices_and_enter+0x3e/0x1a2\n[  121.781323]  [\u003cffffffff81087a0f\u003e] enter_state+0xd1/0x127\n[  121.781327]  [\u003cffffffff8108717a\u003e] state_store+0xa7/0xc9\n[  121.781332]  [\u003cffffffff81221843\u003e] kobj_attr_store+0x17/0x19\n[  121.781336]  [\u003cffffffff8113c01e\u003e] sysfs_write_file+0xe5/0x121\n[  121.781341]  [\u003cffffffff810ed165\u003e] vfs_write+0xab/0x105\n[  121.781344]  [\u003cffffffff810ed279\u003e] sys_write+0x47/0x6d\n[  121.781349]  [\u003cffffffff81027aab\u003e] system_call_fastpath+0x16/0x1b\n[  121.781352] ---[ end trace 97bacaaac2ed7786 ]---\n\nFix is to correctly zero out internal -\u003edma value when unmapping\nand make sure never to unmap unless there specifically was a mapping done.\n\nSigned-off-by: Jesse Brandeburg \u003cjesse.brandeburg@intel.com\u003e\nSigned-off-by: Jeff Kirsher \u003cjeffrey.t.kirsher@intel.com\u003e\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n"
    },
    {
      "commit": "31278e71471399beaff9280737e52b47db4dc345",
      "tree": "25fe2ff8e48a75b7f569dccc463f3bd2561c6c66",
      "parents": [
        "7b85576d15bf2574b0a451108f59f9ad4170dd3f"
      ],
      "author": {
        "name": "Jiri Pirko",
        "email": "jpirko@redhat.com",
        "time": "Wed Jun 17 01:12:19 2009 +0000"
      },
      "committer": {
        "name": "David S. Miller",
        "email": "davem@davemloft.net",
        "time": "Thu Jun 18 00:29:08 2009 -0700"
      },
      "message": "net: group address list and its count\n\nThis patch is inspired by patch recently posted by Johannes Berg. Basically what\nmy patch does is to group list and a count of addresses into newly introduced\nstructure netdev_hw_addr_list. This brings us two benefits:\n1) struct net_device becames a bit nicer.\n2) in the future there will be a possibility to operate with lists independently\n   on netdevices (with exporting right functions).\nI wanted to introduce this patch before I\u0027ll post a multicast lists conversion.\n\nSigned-off-by: Jiri Pirko \u003cjpirko@redhat.com\u003e\n\n drivers/net/bnx2.c              |    4 +-\n drivers/net/e1000/e1000_main.c  |    4 +-\n drivers/net/ixgbe/ixgbe_main.c  |    6 +-\n drivers/net/mv643xx_eth.c       |    2 +-\n drivers/net/niu.c               |    4 +-\n drivers/net/virtio_net.c        |   10 ++--\n drivers/s390/net/qeth_l2_main.c |    2 +-\n include/linux/netdevice.h       |   17 +++--\n net/core/dev.c                  |  130 ++++++++++++++++++--------------------\n 9 files changed, 89 insertions(+), 90 deletions(-)\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n"
    },
    {
      "commit": "042a53a9e437feaf2230dd2cadcecfae9c7bfe05",
      "tree": "ae9078f61e390a3014aecb3fe80d3438ab25ee51",
      "parents": [
        "eae3f29cc73f83cc3f1891d3ad40021b5172c630"
      ],
      "author": {
        "name": "Eric Dumazet",
        "email": "eric.dumazet@gmail.com",
        "time": "Fri Jun 05 04:04:16 2009 +0000"
      },
      "committer": {
        "name": "David S. Miller",
        "email": "davem@davemloft.net",
        "time": "Mon Jun 08 00:21:48 2009 -0700"
      },
      "message": "net: skb_shared_info optimization\n\nskb_dma_unmap() is quite expensive for small packets,\nbecause we use two different cache lines from skb_shared_info.\n\nOne to access nr_frags, one to access dma_maps[0]\n\nInstead of dma_maps being an array of MAX_SKB_FRAGS + 1 elements,\nlet dma_head alone in a new dma_head field, close to nr_frags,\nto reduce cache lines misses.\n\nTested on my dev machine (bnx2 \u0026 tg3 adapters), nice speedup !\n\nSigned-off-by: Eric Dumazet \u003ceric.dumazet@gmail.com\u003e\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n"
    },
    {
      "commit": "b2f8f7525c8aa1fdd8ad8c72c832dfb571d5f768",
      "tree": "71ae1801d264bca62efa0d22376b49de7f206e9a",
      "parents": [
        "d455e5b165a367a628110ec2d18807ea10052cd1",
        "12186be7d2e1106cede1cc728526e3d7998cbe94"
      ],
      "author": {
        "name": "David S. Miller",
        "email": "davem@davemloft.net",
        "time": "Wed Jun 03 02:43:41 2009 -0700"
      },
      "committer": {
        "name": "David S. Miller",
        "email": "davem@davemloft.net",
        "time": "Wed Jun 03 02:43:41 2009 -0700"
      },
      "message": "Merge branch \u0027master\u0027 of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6\n\nConflicts:\n\tdrivers/net/forcedeth.c\n"
    },
    {
      "commit": "ea30e11970a96cfe5e32c03a29332554573b4a10",
      "tree": "b4e90ff7bb784d1b4dbd65ee8c17249b993b0c51",
      "parents": [
        "5a9a8e32ebe269c71d8d3e78f9435fe7729f38e9"
      ],
      "author": {
        "name": "Neil Horman",
        "email": "nhorman@tuxdriver.com",
        "time": "Tue Jun 02 01:29:58 2009 -0700"
      },
      "committer": {
        "name": "David S. Miller",
        "email": "davem@davemloft.net",
        "time": "Tue Jun 02 01:29:58 2009 -0700"
      },
      "message": "e1000: add missing length check to e1000 receive routine\n\n\tPatch to fix bad length checking in e1000.  E1000 by default does two\nthings:\n\n1) Spans rx descriptors for packets that don\u0027t fit into 1 skb on recieve\n2) Strips the crc from a frame by subtracting 4 bytes from the length prior to\ndoing an skb_put\n\nSince the e1000 driver isn\u0027t written to support receiving packets that span\nmultiple rx buffers, it checks the End of Packet bit of every frame, and\ndiscards it if its not set.  This places us in a situation where, if we have a\nspanning packet, the first part is discarded, but the second part is not (since\nit is the end of packet, and it passes the EOP bit test).  If the second part of\nthe frame is small (4 bytes or less), we subtract 4 from it to remove its crc,\nunderflow the length, and wind up in skb_over_panic, when we try to skb_put a\nhuge number of bytes into the skb.  This amounts to a remote DOS attack through\ncareful selection of frame size in relation to interface MTU.  The fix for this\nis already in the e1000e driver, as well as the e1000 sourceforge driver, but no\none ever pushed it to e1000.  This is lifted straight from e1000e, and prevents\nsmall frames from causing the underflow described above\n\nSigned-off-by: Neil Horman \u003cnhorman@tuxdriver.com\u003e\nTested-by: Andy Gospodarek \u003candy@greyhouse.net\u003e\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n"
    },
    {
      "commit": "ccffad25b5136958d4769ed6de5e87992dd9c65c",
      "tree": "cd5f36fe67f4deeae23d76436f7a032a201cba44",
      "parents": [
        "ae63e808f508c38fe65e23a1480c85d5bd00ecbd"
      ],
      "author": {
        "name": "Jiri Pirko",
        "email": "jpirko@redhat.com",
        "time": "Fri May 22 23:22:17 2009 +0000"
      },
      "committer": {
        "name": "David S. Miller",
        "email": "davem@davemloft.net",
        "time": "Fri May 29 22:12:32 2009 -0700"
      },
      "message": "net: convert unicast addr list\n\nThis patch converts unicast address list to standard list_head using\npreviously introduced struct netdev_hw_addr. It also relaxes the\nlocking. Original spinlock (still used for multicast addresses) is not\nneeded and is no longer used for a protection of this list. All\nreading and writing takes place under rtnl (with no changes).\n\nI also removed a possibility to specify the length of the address\nwhile adding or deleting unicast address. It\u0027s always dev-\u003eaddr_len.\n\nThe convertion touched especially e1000 and ixgbe codes when the\nchange is not so trivial.\n\nSigned-off-by: Jiri Pirko \u003cjpirko@redhat.com\u003e\n\n drivers/net/bnx2.c               |   13 +--\n drivers/net/e1000/e1000_main.c   |   24 +++--\n drivers/net/ixgbe/ixgbe_common.c |   14 ++--\n drivers/net/ixgbe/ixgbe_common.h |    4 +-\n drivers/net/ixgbe/ixgbe_main.c   |    6 +-\n drivers/net/ixgbe/ixgbe_type.h   |    4 +-\n drivers/net/macvlan.c            |   11 +-\n drivers/net/mv643xx_eth.c        |   11 +-\n drivers/net/niu.c                |    7 +-\n drivers/net/virtio_net.c         |    7 +-\n drivers/s390/net/qeth_l2_main.c  |    6 +-\n drivers/scsi/fcoe/fcoe.c         |   16 ++--\n include/linux/netdevice.h        |   18 ++--\n net/8021q/vlan.c                 |    4 +-\n net/8021q/vlan_dev.c             |   10 +-\n net/core/dev.c                   |  195 +++++++++++++++++++++++++++-----------\n net/dsa/slave.c                  |   10 +-\n net/packet/af_packet.c           |    4 +-\n 18 files changed, 227 insertions(+), 137 deletions(-)\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n"
    },
    {
      "commit": "cdd0db058d64f2619b08e7d098ee0014aa0a5bc1",
      "tree": "a5e31f6687eff581309b095781c7e2f0bc676182",
      "parents": [
        "28679751a924c11f7135641f26e99249385de5b4"
      ],
      "author": {
        "name": "Eric Dumazet",
        "email": "eric.dumazet@gmail.com",
        "time": "Thu May 28 00:00:41 2009 +0000"
      },
      "committer": {
        "name": "David S. Miller",
        "email": "davem@davemloft.net",
        "time": "Fri May 29 01:46:27 2009 -0700"
      },
      "message": "net: dont update dev-\u003etrans_start\n\nSecond round of drivers for Gb cards (and NIU one I forgot in the 10GB round)\n\nNow that core network takes care of trans_start updates, dont do it\nin drivers themselves, if possible. Drivers can avoid one cache miss\n(on dev-\u003etrans_start) in their start_xmit() handler.\n\nExceptions are NETIF_F_LLTX drivers\n\nSigned-off-by: Eric Dumazet \u003ceric.dumazet@gmail.com\u003e\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n"
    },
    {
      "commit": "22f6dacdfcfdc792d068e9c41234808860498d04",
      "tree": "281a7d476f256ea3e2f800177ba685b169cc0540",
      "parents": [
        "928f308f556f4943e50c5064b546f47bce301f02",
        "9b05126baa146fc3f41360164141d4e1b3ea93c4"
      ],
      "author": {
        "name": "David S. Miller",
        "email": "davem@davemloft.net",
        "time": "Fri May 08 02:48:30 2009 -0700"
      },
      "committer": {
        "name": "David S. Miller",
        "email": "davem@davemloft.net",
        "time": "Fri May 08 02:48:30 2009 -0700"
      },
      "message": "Merge branch \u0027master\u0027 of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6\n\nConflicts:\n\tinclude/net/tcp.h\n"
    },
    {
      "commit": "c2d5ab4973bfaa72cbb677801825ce56c8f69b56",
      "tree": "80a5a2f555285a45c8e38f409aa996953f60fee6",
      "parents": [
        "c9c7d2e5a06cd3a26b6be096949e3371ec2aa123"
      ],
      "author": {
        "name": "Jesse Brandeburg",
        "email": "jesse.brandeburg@intel.com",
        "time": "Thu May 07 11:07:35 2009 +0000"
      },
      "committer": {
        "name": "David S. Miller",
        "email": "davem@davemloft.net",
        "time": "Thu May 07 14:52:32 2009 -0700"
      },
      "message": "e1000/e1000e/igb/ixgb: don\u0027t txhang after link down\n\nafter the recent changes to wired drivers to use only\nnetif_carrier_off the driver can have outstanding tx work to\ncomplete that will never complete once link is down.  Since the\nintel hardware will hold this tx work forever, the driver\nnotices a tx timeout condition internally and might try\nto instigate printk and reset of the part with a\nnetif_stop_queue, which doesn\u0027t work because link is down.\n\nDon\u0027t bother arming to tx hang detection when link is down.\n\nSigned-off-by: Jesse Brandeburg \u003cjesse.brandeburg@intel.com\u003e\nSigned-off-by: Jeff Kirsher \u003cjeffrey.t.kirsher@intel.com\u003e\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n"
    },
    {
      "commit": "e151a60ad1faffb6241cf7eb6846353df1f33a32",
      "tree": "32362bffe010306c755c188d13603db83d03b4c6",
      "parents": [
        "815bcc2719c12b6f5b511706e2d19728e07f0b02"
      ],
      "author": {
        "name": "Jesse Brandeburg",
        "email": "jesse.brandeburg@intel.com",
        "time": "Mon May 04 11:19:42 2009 +0000"
      },
      "committer": {
        "name": "David S. Miller",
        "email": "davem@davemloft.net",
        "time": "Mon May 04 21:28:13 2009 -0700"
      },
      "message": "e1000: fix virtualization bug\n\na recent fix to e1000 (commit 15b2bee2) caused KVM/QEMU/VMware based\nvirtualized e1000 interfaces to begin failing when resetting.\n\nThis is because the driver in a virtual environment doesn\u0027t\nget to run instructions *AT ALL* when an interrupt is asserted.\nThe interrupt code runs immediately and this recent bug fix\nallows an interrupt to be possible when the interrupt handler\nwill reject it (due to the new code), when being called from\nany path in the driver that holds the E1000_RESETTING flag.\n\nthe driver should use the __E1000_DOWN flag instead of the\n__E1000_RESETTING flag to prevent interrupt execution\nwhile reconfiguring the hardware.\n\nSigned-off-by: Jesse Brandeburg \u003cjesse.brandeburg@intel.com\u003e\nSigned-off-by: Jeff Kirsher \u003cjeffrey.t.kirsher@intel.com\u003e\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n"
    },
    {
      "commit": "4cb9be7ab47820a1fa747569f5f035a5f628c91b",
      "tree": "f272447c9bdc5b01578760f1c0f973a183f801b5",
      "parents": [
        "bf98a82633b97fb638fcee0fae3c0de54d1f7b05"
      ],
      "author": {
        "name": "Jesse Brandeburg",
        "email": "jesse.brandeburg@intel.com",
        "time": "Tue Apr 21 18:42:05 2009 +0000"
      },
      "committer": {
        "name": "David S. Miller",
        "email": "davem@davemloft.net",
        "time": "Wed Apr 22 00:47:54 2009 -0700"
      },
      "message": "e1000/e1000e/igb/ixgb: do not use netif_wake_queue un-necessarily\n\nIt was pointed out that the Intel wired ethernet drivers do not need to\nwake the tx queue since netif_carrier_on/off will take care of the qdisc\nmanagement in order to guarantee the correct handling of the transmit\nroutine enable state.\n\nSigned-off-by: Jesse Brandeburg \u003cjesse.brandeburg@intel.com\u003e\nSigned-off-by: Jeff Kirsher \u003cjeffrey.t.kirsher@intel.com\u003e\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n"
    },
    {
      "commit": "e5e9743bb7429f53c83ad69b432f7b661e74c3f0",
      "tree": "db3691aef0d46c4aed4a2be6dc8ab7c44c3488cb",
      "parents": [
        "a0f82f64e26929776c58a5c93c2ecb38e3d82815",
        "775d8d931581764a1ec982ebe5a927b12762fb6d"
      ],
      "author": {
        "name": "David S. Miller",
        "email": "davem@davemloft.net",
        "time": "Tue Apr 21 01:32:26 2009 -0700"
      },
      "committer": {
        "name": "David S. Miller",
        "email": "davem@davemloft.net",
        "time": "Tue Apr 21 01:32:26 2009 -0700"
      },
      "message": "Merge branch \u0027master\u0027 of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6\n\nConflicts:\n\tnet/core/dev.c\n"
    },
    {
      "commit": "eb62efd287fe6e12d18083287e38e4a811c28256",
      "tree": "e6265cd0ff517cfb02fced4988a6fb362f1dc7fd",
      "parents": [
        "9c563d20671e5fbe3045fd79c18b306ccb77b0b6"
      ],
      "author": {
        "name": "Jesse Brandeburg",
        "email": "jesse.brandeburg@intel.com",
        "time": "Fri Apr 17 20:44:36 2009 +0000"
      },
      "committer": {
        "name": "David S. Miller",
        "email": "davem@davemloft.net",
        "time": "Mon Apr 20 02:00:39 2009 -0700"
      },
      "message": "e1000: init link state correctly\n\nAs reported by Andrew Lutomirski \u003camluto@gmail.com\u003e\n\nAll the intel wired ethernet drivers were calling netif_carrier_off\nand netif_stop_queue (or variants) before calling register_netdevice\n\nThis is incorrect behavior as was pointed out by davem, and causes\nifconfig and friends to report a strange state before first link\nafter the driver was loaded.\n\nThis apparently confused *some* versions of networkmanager.\n\nAndy tested this for e1000e and confirmed it was working for him.\n\nSigned-off-by: Jesse Brandeburg \u003cjesse.brandeburg@intel.com\u003e\nReported-by: Andrew Lutomirski \u003camluto@gmail.com\u003e\nSigned-off-by: Jeff Kirsher \u003cjeffrey.t.kirsher@intel.com\u003e\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n"
    },
    {
      "commit": "843f42678f6c47a2c8d1648e584cb57ebff3750f",
      "tree": "ffcef58a48baebe78f28104656638ad5d44c57ee",
      "parents": [
        "a86043c2ad92aa6312807039198d6ab6171164ef"
      ],
      "author": {
        "name": "Jesse Brandeburg",
        "email": "jesse.brandeburg@intel.com",
        "time": "Thu Apr 16 16:59:47 2009 +0000"
      },
      "committer": {
        "name": "David S. Miller",
        "email": "davem@davemloft.net",
        "time": "Fri Apr 17 01:09:59 2009 -0700"
      },
      "message": "e1000: fix transmit routine exit bug\n\nIf the e1000 transmit cleanup inner loop exited early, then\ncleaned might not be true.  This could cause tx hangs or other\nbadness.  Use count to track the total number of descriptors\ncleaned instead of basing a tx queue restart off of a temporary\nworking state variable.\n\nThis code now makes the flow the same for e1000/e1000e/igb/ixgbe\n\nSigned-off-by: Jesse Brandeburg \u003cjesse.brandeburg@intel.com\u003e\nSigned-off-by: Jeff Kirsher \u003cjeffrey.t.kirsher@intel.com\u003e\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n"
    },
    {
      "commit": "b43fcd7dc7bf0471b3bdda8fee3418e93ac25863",
      "tree": "c0348b09954d41823e80e8818cf8404b5fee8b07",
      "parents": [
        "719bfeaae8104fca4ca5d47c02592b08682f14fa"
      ],
      "author": {
        "name": "Rafael J. Wysocki",
        "email": "rjw@sisk.pl",
        "time": "Wed Apr 15 17:43:24 2009 +0000"
      },
      "committer": {
        "name": "David S. Miller",
        "email": "davem@davemloft.net",
        "time": "Thu Apr 16 02:15:22 2009 -0700"
      },
      "message": "NET/e1000: Fix powering off during shutdown\n\nPrevent e1000 from putting the adapter into D3 during shutdown except when\nwe\u0027re going to power off the system, since doing that may generally cause\nproblems with kexec to happen (such problems were observed for igb and\nforcedeth).  For this purpose seperate e1000_shutdown() from e1000_suspend()\nand use the appropriate PCI PM callbacks in both of them.\n\nSigned-off-by: \"Rafael J. Wysocki\" \u003crjw@sisk.pl\u003e\nSigned-off-by: Jeff Kirsher \u003cjeffrey.t.kirsher@intel.com\u003e\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n"
    },
    {
      "commit": "df26fd2c594a0876b4e6b802dee7753024e484d9",
      "tree": "712a390221b7fdc643f284cee1ac908669e31908",
      "parents": [
        "32e8f9a8d9bd52b59b512f8e5177b08e8edfd58b"
      ],
      "author": {
        "name": "Jesse Brandeburg",
        "email": "jesse.brandeburg@intel.com",
        "time": "Tue Apr 14 16:38:49 2009 -0700"
      },
      "committer": {
        "name": "David S. Miller",
        "email": "davem@davemloft.net",
        "time": "Tue Apr 14 16:38:49 2009 -0700"
      },
      "message": "e1000/e1000: fix compile warning\n\ne1000/e1000e compile report a possible unused variable, fix\nthat for now.  Shortly after this a small refactor and bug\nfix will follow in the same code.\n\nSigned-off-by: Jesse Brandeburg \u003cjesse.brandeburg@intel.com\u003e\nSigned-off-by: Jeff Kirsher \u003cjeffrey.t.kirsher@intel.com\u003e\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n"
    },
    {
      "commit": "284901a90a9e0b812ca3f5f852cbbfb60d10249d",
      "tree": "06c1b5a0f83c90cfb662f756e7781977ce739ce8",
      "parents": [
        "6afd142fd0dfba497246d0fab236c20a7b4bf778"
      ],
      "author": {
        "name": "Yang Hongyang",
        "email": "yanghy@cn.fujitsu.com",
        "time": "Mon Apr 06 19:01:15 2009 -0700"
      },
      "committer": {
        "name": "Linus Torvalds",
        "email": "torvalds@linux-foundation.org",
        "time": "Tue Apr 07 08:31:11 2009 -0700"
      },
      "message": "dma-mapping: replace all DMA_32BIT_MASK macro with DMA_BIT_MASK(32)\n\nReplace all DMA_32BIT_MASK macro with DMA_BIT_MASK(32)\n\nSigned-off-by: Yang Hongyang\u003cyanghy@cn.fujitsu.com\u003e\nSigned-off-by: Andrew Morton \u003cakpm@linux-foundation.org\u003e\nSigned-off-by: Linus Torvalds \u003ctorvalds@linux-foundation.org\u003e\n"
    },
    {
      "commit": "6a35528a8346f6e6fd32ed7e51f04d1fa4ca2c01",
      "tree": "9caaf8645b573687bbcf3a16b5aa7dd233fed46e",
      "parents": [
        "8a59f5d2526593c6bc1a0754c3a16ccc9ed41ce3"
      ],
      "author": {
        "name": "Yang Hongyang",
        "email": "yanghy@cn.fujitsu.com",
        "time": "Mon Apr 06 19:01:13 2009 -0700"
      },
      "committer": {
        "name": "Linus Torvalds",
        "email": "torvalds@linux-foundation.org",
        "time": "Tue Apr 07 08:31:10 2009 -0700"
      },
      "message": "dma-mapping: replace all DMA_64BIT_MASK macro with DMA_BIT_MASK(64)\n\nReplace all DMA_64BIT_MASK macro with DMA_BIT_MASK(64)\n\nSigned-off-by: Yang Hongyang\u003cyanghy@cn.fujitsu.com\u003e\nSigned-off-by: Andrew Morton \u003cakpm@linux-foundation.org\u003e\nSigned-off-by: Linus Torvalds \u003ctorvalds@linux-foundation.org\u003e\n"
    },
    {
      "commit": "81c522851436dbc058c9c0c11b32e60d76b180ce",
      "tree": "d665ad0664f8a362baf496da9d4578dab2d0c397",
      "parents": [
        "2b05e0021b21e1dc484a1237b7fa674e8a3704bb"
      ],
      "author": {
        "name": "Jesse Brandeburg",
        "email": "jesse.brandeburg@intel.com",
        "time": "Sat Apr 04 16:36:53 2009 -0700"
      },
      "committer": {
        "name": "David S. Miller",
        "email": "davem@davemloft.net",
        "time": "Sat Apr 04 16:36:53 2009 -0700"
      },
      "message": "e1000: fix loss of multicast packets\n\ne1000 (and e1000e, igb, ixgbe, ixgb) all do a series of\noperations each time a multicast address is added.  The flow goes\nsomething like\n\n1) stack adds one multicast address\n2) stack passes whole current list of unicast and multicast\n   addresses to driver\n3) driver clears entire list in hardware\n4) driver programs each multicast address using iomem in a loop\n\nThis was causing multicast packets to be lost during the\nreprogramming process.\n\nreference with test program:\nhttp://kerneltrap.org/mailarchive/linux-netdev/2009/3/14/5160514/thread\n\nThanks to Dave Boutcher for his report and test program.\n\nThis driver fix prepares an array all at once in memory and\nprograms it in one shot to the hardware, not requiring an \"erase\"\ncycle.\n\nSigned-off-by: Jesse Brandeburg \u003cjesse.brandeburg@intel.com\u003e\nSigned-off-by: Jeff Kirsher \u003cjeffrey.t.kirsher@intel.com\u003e\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n"
    },
    {
      "commit": "a6c42322722976ca81e6d02e4a702f33d659d8fc",
      "tree": "1f3a9a036b41edb32ee00cf6c0a972dfad80b18f",
      "parents": [
        "ccfb342c5cd584f0f3e682280f7152310edf0e39"
      ],
      "author": {
        "name": "Jesse Brandeburg",
        "email": "jesse.brandeburg@intel.com",
        "time": "Wed Mar 25 21:59:22 2009 +0000"
      },
      "committer": {
        "name": "David S. Miller",
        "email": "davem@davemloft.net",
        "time": "Thu Mar 26 01:00:55 2009 -0700"
      },
      "message": "e1000: fix close race with interrupt\n\nthis is in regards to\nhttp://bugzilla.kernel.org/show_bug.cgi?id\u003d12876\n\nwhere it appears that e1000 can leave its interrupt enabled after\nexiting the driver.  Fix the bug by making the interrupt enable\npaths more aware of the driver exiting.\n\nThanks to Alan Cox for the poke and initial investigation.\n\nCC: Alan Cox \u003calan@lxorguk.ukuu.org.uk\u003e\nSigned-off-by: Jesse Brandeburg \u003cjesse.brandeburg@intel.com\u003e\nSigned-off-by: Jeff Kirsher \u003cjeffrey.t.kirsher@intel.com\u003e\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n"
    },
    {
      "commit": "ccfb342c5cd584f0f3e682280f7152310edf0e39",
      "tree": "f24cac7f47fafa9f73afa4f74986086b838b49e3",
      "parents": [
        "37e73df8c3f19f4733c60ec53c104ff6f79ba467"
      ],
      "author": {
        "name": "Alexander Duyck",
        "email": "alexander.h.duyck@intel.com",
        "time": "Wed Mar 25 21:59:04 2009 +0000"
      },
      "committer": {
        "name": "David S. Miller",
        "email": "davem@davemloft.net",
        "time": "Thu Mar 26 01:00:54 2009 -0700"
      },
      "message": "e1000: cleanup clean_tx_irq routine so that it completely cleans ring\n\nThe tx cleanup routine was stopping after 64 packets and this was causing\nissues resulting in the ring not being completely cleaned.\n\nThis change updates the driver to clean the entire ring and if it doesn\u0027t\nit then will retry on the next pass.\n\nSigned-off-by: Alexander Duyck \u003calexander.h.duyck@intel.com\u003e\nSigned-off-by: Jeff Kirsher \u003cjeffrey.t.kirsher@intel.com\u003e\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n"
    },
    {
      "commit": "37e73df8c3f19f4733c60ec53c104ff6f79ba467",
      "tree": "b02ed6f4dd5bd1491b0986a38dfc7b0da21ba28d",
      "parents": [
        "5a29f7893fbe681f1334285be7e41e56f0de666c"
      ],
      "author": {
        "name": "Alexander Duyck",
        "email": "alexander.h.duyck@intel.com",
        "time": "Wed Mar 25 21:58:45 2009 +0000"
      },
      "committer": {
        "name": "David S. Miller",
        "email": "davem@davemloft.net",
        "time": "Thu Mar 26 01:00:53 2009 -0700"
      },
      "message": "e1000: fix tx hang detect logic and address dma mapping issues\n\nThis patch changes the dma mapping to better support\nskb_dma_map/skb_dma_unmap and addresses and redefines the tx hang logic to\nbe based off of time stamp instead of if the dma field is populated\n\nSigned-off-by: Alexander Duyck \u003calexander.h.duyck@intel.com\u003e\nSigned-off-by: Jeff Kirsher \u003cjeffrey.t.kirsher@intel.com\u003e\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n"
    },
    {
      "commit": "d20b606c99c7fd9f1b6c6ec43c877eaae827d169",
      "tree": "8f7e64519cd5928a57f86efd1a1026bf41fc0953",
      "parents": [
        "8ddc951c73cbc317148c0b9973dde81eece57e4c"
      ],
      "author": {
        "name": "Jesse Brandeburg",
        "email": "jesse.brandeburg@intel.com",
        "time": "Mon Mar 02 16:03:21 2009 -0800"
      },
      "committer": {
        "name": "David S. Miller",
        "email": "davem@davemloft.net",
        "time": "Mon Mar 02 16:03:21 2009 -0800"
      },
      "message": "e1000: fix unmap bug\n\nThis is in reference to the issue shown in kerneloops (search e1000 unmap)\n\nThe e1000 transmit code was calling pci_unmap_page on dma handles that it\nmight have called pci_map_single on.\n\nSame bug as e1000e\n\nSigned-off-by: Jesse Brandeburg \u003cjesse.brandeburg@intel.com\u003e\nAcked-by: Bruce Allan \u003cbruce.w.allan@intel.com\u003e\nSigned-off-by: Jeff Kirsher \u003cjeffrey.t.kirsher@intel.com\u003e\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n"
    },
    {
      "commit": "3c842138c0cf313e906538b89d88ba0d969ce747",
      "tree": "c26119b0c8fb8820ec7d95a65da6de8d87b5f449",
      "parents": [
        "9107584ecdda31981557034cccf5185afced3e0e"
      ],
      "author": {
        "name": "Breno Leitao",
        "email": "leitao@linux.vnet.ibm.com",
        "time": "Thu Feb 19 14:38:52 2009 -0800"
      },
      "committer": {
        "name": "David S. Miller",
        "email": "davem@davemloft.net",
        "time": "Thu Feb 19 14:38:52 2009 -0800"
      },
      "message": "e1000: Removing the unused macro PAGE_USE_COUNT()\n\nRemoving the unused macro PAGE_USE_COUNT(), since there is no more reference\nto it. The last reference was removed by Jesse\u0027s commit number \n630b25cdf4e3f8c0a11eb04fc8436cc36653cd58.\n\nSigned-off-by: Breno Leitao \u003cleitao@linux.vnet.ibm.com\u003e\nAcked-by: Jeff Kirsher \u003cjeffrey.t.kirsher@intel.com\u003e\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n"
    },
    {
      "commit": "005c79b3d4df48fa01b77e5ccf46e5cd4754cfd5",
      "tree": "bc3ef1b64dcdb48b2d6accb51951a0d73b33262e",
      "parents": [
        "4d7902f22b0804730b80f7a4147f676430248a3a",
        "eda58a85ec3fc05855a26654d97a2b53f0e715b9"
      ],
      "author": {
        "name": "David S. Miller",
        "email": "davem@davemloft.net",
        "time": "Wed Feb 04 16:51:58 2009 -0800"
      },
      "committer": {
        "name": "David S. Miller",
        "email": "davem@davemloft.net",
        "time": "Wed Feb 04 16:51:58 2009 -0800"
      },
      "message": "Merge branch \u0027master\u0027 of /home/davem/src/GIT/linux-2.6/\n"
    },
    {
      "commit": "4d7155b932b8129c72e2f2714890e20b2a05e0b7",
      "tree": "7d94cfea5239cc6b11673e326f7a1851720921ed",
      "parents": [
        "714c48f1bb553a2e5dd8d6ff66accc7c51218ac9"
      ],
      "author": {
        "name": "Karsten Keil",
        "email": "kkeil@suse.de",
        "time": "Tue Feb 03 15:18:01 2009 -0800"
      },
      "committer": {
        "name": "David S. Miller",
        "email": "davem@davemloft.net",
        "time": "Tue Feb 03 15:18:01 2009 -0800"
      },
      "message": "e1000: Fix PCI enable to honor the need_ioport flag\n\nOn machine were no IO ports are assigned the call\nto pci_enable_device() will fail, even if need_ioport\nis false, we need to use pci_enable_device_mem() here.\n\nSigned-off-by: Karsten Keil \u003ckkeil@suse.de\u003e\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n"
    },
    {
      "commit": "09640e6365c679b5642b1c41b6d7078f51689ddf",
      "tree": "a2b80c153bd23fe59db8c6994fda29923819fcea",
      "parents": [
        "ee437770c42088b9b653e8b3bf28a61fa647f84e"
      ],
      "author": {
        "name": "Harvey Harrison",
        "email": "harvey.harrison@gmail.com",
        "time": "Sun Feb 01 00:45:17 2009 -0800"
      },
      "committer": {
        "name": "David S. Miller",
        "email": "davem@davemloft.net",
        "time": "Sun Feb 01 00:45:17 2009 -0800"
      },
      "message": "net: replace uses of __constant_{endian}\n\nBase versions handle constant folding now.\n\nSigned-off-by: Harvey Harrison \u003charvey.harrison@gmail.com\u003e\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n"
    },
    {
      "commit": "05bee4737774881e027bfd9a8b5c40a7d68f6325",
      "tree": "5fd32eb8fe345d2d30e85910beac241a4439e8cd",
      "parents": [
        "80595d59ba9917227856e663da249c2276a8628d",
        "905db44087855e3c1709f538ecdc22fd149cadd8"
      ],
      "author": {
        "name": "David S. Miller",
        "email": "davem@davemloft.net",
        "time": "Fri Jan 30 14:31:07 2009 -0800"
      },
      "committer": {
        "name": "David S. Miller",
        "email": "davem@davemloft.net",
        "time": "Fri Jan 30 14:31:07 2009 -0800"
      },
      "message": "Merge branch \u0027master\u0027 of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6\n\nConflicts:\n\tdrivers/net/e1000/e1000_main.c\n"
    },
    {
      "commit": "15b2bee22a0390d951301b53e83df88d0350c499",
      "tree": "46f8f27df702ad07dd5724710bcb48bf75eaf9a0",
      "parents": [
        "9fa5fdf291c9b58b1cb8b4bb2a0ee57efa21d635"
      ],
      "author": {
        "name": "Jesse Brandeburg",
        "email": "jesse.brandeburg@intel.com",
        "time": "Tue Jan 27 16:41:58 2009 -0800"
      },
      "committer": {
        "name": "David S. Miller",
        "email": "davem@davemloft.net",
        "time": "Tue Jan 27 16:41:58 2009 -0800"
      },
      "message": "e1000: fix bug with shared interrupt during reset\n\nA nasty bug was found where an MTU change (or anything else that caused a\nreset) could race with the interrupt code.  The interrupt code was entered\nby a shared interrupt during the MTU change.\n\nThis change prevents the interrupt code from running while the driver is in\nthe middle of its reset path.\n\nSigned-off-by: Jesse Brandeburg \u003cjesse.brandeburg@intel.com\u003e\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n"
    },
    {
      "commit": "8017943e6b177f117e4be71f09a38e2c9fd56193",
      "tree": "c61a4441836fe59b087c81986fc551516722a013",
      "parents": [
        "921aa7491201b238589ab9f94184b18a1ed00e12"
      ],
      "author": {
        "name": "Alexander Duyck",
        "email": "alexander.h.duyck@intel.com",
        "time": "Wed Jan 21 14:42:47 2009 -0800"
      },
      "committer": {
        "name": "David S. Miller",
        "email": "davem@davemloft.net",
        "time": "Wed Jan 21 14:42:47 2009 -0800"
      },
      "message": "e1000: drop lltx, remove unnecessary lock\n\nLLTX is deprecated, don\u0027t use it.  This completes the removal of LLTX from\nthe Intel Network drivers.\n\nSigned-off-by: Jeff Kirsher \u003cjeffrey.t.kirsher@intel.com\u003e\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n"
    },
    {
      "commit": "288379f050284087578b77e04f040b57db3db3f8",
      "tree": "ac5f5c83e2778a1966327d87316fc94067363b45",
      "parents": [
        "627af770c63acddc2402dd19fec70df5c3ad8ab7"
      ],
      "author": {
        "name": "Ben Hutchings",
        "email": "bhutchings@solarflare.com",
        "time": "Mon Jan 19 16:43:59 2009 -0800"
      },
      "committer": {
        "name": "David S. Miller",
        "email": "davem@davemloft.net",
        "time": "Wed Jan 21 14:33:50 2009 -0800"
      },
      "message": "net: Remove redundant NAPI functions\n\nFollowing the removal of the unused struct net_device * parameter from\nthe NAPI functions named *netif_rx_* in commit 908a7a1, they are\nexactly equivalent to the corresponding *napi_* functions and are\ntherefore redundant.\n\nSigned-off-by: Ben Hutchings \u003cbhutchings@solarflare.com\u003e\nAcked-by: Neil Horman \u003cnhorman@tuxdriver.com\u003e\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n"
    },
    {
      "commit": "025dfdafe77f20b3890981a394774baab7b9c827",
      "tree": "c4d514990d7a0673df5d32aa11fded95f9644ff0",
      "parents": [
        "0abb8b6a939b742f273edc68b64dba26c57331bc"
      ],
      "author": {
        "name": "Frederik Schwarzer",
        "email": "schwarzerf@gmail.com",
        "time": "Thu Oct 16 19:02:37 2008 +0200"
      },
      "committer": {
        "name": "Jiri Kosina",
        "email": "jkosina@suse.cz",
        "time": "Tue Jan 06 11:28:06 2009 +0100"
      },
      "message": "trivial: fix then -\u003e than typos in comments and documentation\n\n- (better, more, bigger ...) then -\u003e (...) than\n\nSigned-off-by: Frederik Schwarzer \u003cschwarzerf@gmail.com\u003e\nSigned-off-by: Jiri Kosina \u003cjkosina@suse.cz\u003e\n"
    },
    {
      "commit": "908a7a16b852ffd618a9127be8d62432182d81b4",
      "tree": "a0b509227e26bef7edd347575761e0dbeb5756e7",
      "parents": [
        "889bd9b6dbcd426b8698c4a779dd7dbf247f57b8"
      ],
      "author": {
        "name": "Neil Horman",
        "email": "nhorman@tuxdriver.com",
        "time": "Mon Dec 22 20:43:12 2008 -0800"
      },
      "committer": {
        "name": "David S. Miller",
        "email": "davem@davemloft.net",
        "time": "Mon Dec 22 20:43:12 2008 -0800"
      },
      "message": "net: Remove unused netdev arg from some NAPI interfaces.\n\nWhen the napi api was changed to separate its 1:1 binding to the net_device\nstruct, the netif_rx_[prep|schedule|complete] api failed to remove the now\nvestigual net_device structure parameter.  This patch cleans up that api by\nproperly removing it..\n\nSigned-off-by: Neil Horman \u003cnhorman@tuxdriver.com\u003e\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n"
    },
    {
      "commit": "3e1d7cd2dc708f2054b2180e05ae283b9f91d543",
      "tree": "dfaded0839a1811819d660d0ffcc5a36c0a50e27",
      "parents": [
        "a4d2f34b7c3ff8a53df755961faf8186c6e7b464"
      ],
      "author": {
        "name": "Wang Chen",
        "email": "wangchen@cn.fujitsu.com",
        "time": "Wed Dec 03 22:07:10 2008 -0800"
      },
      "committer": {
        "name": "David S. Miller",
        "email": "davem@davemloft.net",
        "time": "Wed Dec 03 22:07:10 2008 -0800"
      },
      "message": "e1000: e1000_adapter-\u003epolling_netdev is useless\n\nCommit bea3348eef27e6044b6161fd04c3152215f96411\n\"[NET]: Make NAPI polling independent of struct net_device objects.\"\nmade NAPI polling to be independent of net_device.\nSo e1000_adapter-\u003epolling_netdev is no longer used.\nKill it.\n\nSigned-off-by: Wang Chen \u003cwangchen@cn.fujitsu.com\u003e\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n"
    },
    {
      "commit": "b30c4d8f8210bc4ea92942ab786407ec2d780549",
      "tree": "e3c376cd94f1b72d23913b696a2412ef77113b5a",
      "parents": [
        "a46e534bc76ed4e92daa181526b30274d37c6979"
      ],
      "author": {
        "name": "Jeff Kirsher",
        "email": "jeffrey.t.kirsher@intel.com",
        "time": "Thu Nov 27 00:22:45 2008 -0800"
      },
      "committer": {
        "name": "David S. Miller",
        "email": "davem@davemloft.net",
        "time": "Thu Nov 27 00:22:45 2008 -0800"
      },
      "message": "e1000: cleanup link up/down messages\n\nThe system log messages created on a link status change need to follow a\nspecific format to work with tools some customers use.  This also makes\nthe messages consistant with other Intel driver link messages.\n\nSigned-off-by: Jeff Kirsher \u003cjeffrey.t.kirsher@intel.com\u003e\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n"
    },
    {
      "commit": "008298231abbeb91bc7be9e8b078607b816d1a4a",
      "tree": "8cb0c17720086ef97c614b96241f06aa63ce8511",
      "parents": [
        "6ab33d51713d6d60c7677c0d020910a8cb37e513"
      ],
      "author": {
        "name": "Stephen Hemminger",
        "email": "shemminger@vyatta.com",
        "time": "Thu Nov 20 20:14:53 2008 -0800"
      },
      "committer": {
        "name": "David S. Miller",
        "email": "davem@davemloft.net",
        "time": "Thu Nov 20 20:14:53 2008 -0800"
      },
      "message": "netdev: add more functions to netdevice ops\n\nThis patch moves neigh_setup and hard_start_xmit into the network device ops\nstructure. For bisection, fix all the previously converted drivers as well.\nBonding driver took the biggest hit on this.\n\nAdded a prefetch of the hard_start_xmit in the fast path to try and reduce\nany impact this would have.\n\nSigned-off-by: Stephen Hemminger \u003cshemminger@vyatta.com\u003e\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n"
    },
    {
      "commit": "0e7614bc3df034e2f92e0d424cc6f81dcdb7af65",
      "tree": "9fda1192b7bc30e8c36e6cfc23ae7cb5999da270",
      "parents": [
        "80ff32b76f7969bf62206840c4e1d04674e41df9"
      ],
      "author": {
        "name": "Stephen Hemminger",
        "email": "shemminger@vyatta.com",
        "time": "Wed Nov 19 22:18:22 2008 -0800"
      },
      "committer": {
        "name": "David S. Miller",
        "email": "davem@davemloft.net",
        "time": "Wed Nov 19 22:42:50 2008 -0800"
      },
      "message": "e1000: convert to net_device_ops\n\nConvert to new network device ops interface.\n\nSigned-off-by: Stephen Hemminger \u003cshemminger@vyatta.com\u003e\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n"
    },
    {
      "commit": "198d6ba4d7f48c94f990f4604f0b3d73925e0ded",
      "tree": "56bbdf8ba2553c23c8099da9344a8f1d1aba97ab",
      "parents": [
        "9a57f7fabd383920585ed8b74eacd117c6551f2d",
        "7f0f598a0069d1ab072375965a4b69137233169c"
      ],
      "author": {
        "name": "David S. Miller",
        "email": "davem@davemloft.net",
        "time": "Tue Nov 18 23:38:23 2008 -0800"
      },
      "committer": {
        "name": "David S. Miller",
        "email": "davem@davemloft.net",
        "time": "Tue Nov 18 23:38:23 2008 -0800"
      },
      "message": "Merge branch \u0027master\u0027 of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6\n\nConflicts:\n\n\tdrivers/isdn/i4l/isdn_net.c\n\tfs/cifs/connect.c\n"
    },
    {
      "commit": "de1264896c8012a261c1cba17e6a61199c276ad3",
      "tree": "9a91175b435d83f597f8ca784130ec54d42ba4a7",
      "parents": [
        "6ff68026f4757d68461b7fbeca5c944e1f5f8b44"
      ],
      "author": {
        "name": "\\\"Rafael J. Wysocki\\",
        "email": "rjw@sisk.pl",
        "time": "Fri Nov 07 20:30:19 2008 +0000"
      },
      "committer": {
        "name": "David S. Miller",
        "email": "davem@davemloft.net",
        "time": "Sun Nov 16 01:35:56 2008 -0800"
      },
      "message": "e1000: Use device_set_wakeup_enable\n\nSince dev-\u003epower.should_wakeup bit is used by the PCI core to\ndecide whether the device should wake up the system from sleep\nstates, set/unset this bit whenever WOL is enabled/disabled using\ne1000_set_wol().  Accordingly, use device_can_wakeup() for checking\nif wake-up is supported by the device.\n\nSigned-off-by: \"Rafael J. Wysocki\" \u003crjw@sisk.pl\u003e\nSigned-off-by: Jeff Kirsher \u003cjeffrey.t.kirsher@intel.com\u003e\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n"
    },
    {
      "commit": "4cf1653aa90c6320dc8032443b5e322820aa28b1",
      "tree": "7920008d3f953defdcda8c81d39da963290d93ad",
      "parents": [
        "454d7c9b14e20fd1949e2686e9de4a2926e01476"
      ],
      "author": {
        "name": "Wang Chen",
        "email": "wangchen@cn.fujitsu.com",
        "time": "Wed Nov 12 23:38:14 2008 -0800"
      },
      "committer": {
        "name": "David S. Miller",
        "email": "davem@davemloft.net",
        "time": "Wed Nov 12 23:38:14 2008 -0800"
      },
      "message": "netdevice: safe convert to netdev_priv() #part-2\n\nWe have some reasons to kill netdev-\u003epriv:\n1. netdev-\u003epriv is equal to netdev_priv().\n2. netdev_priv() wraps the calculation of netdev-\u003epriv\u0027s offset, obviously\n   netdev_priv() is more flexible than netdev-\u003epriv.\nBut we cann\u0027t kill netdev-\u003epriv, because so many drivers reference to it\ndirectly.\n\nThis patch is a safe convert for netdev-\u003epriv to netdev_priv(netdev).\nSince all of the netdev-\u003epriv is only for read.\nBut it is too big to be sent in one mail.\nI split it to 4 parts and make every part smaller than 100,000 bytes,\nwhich is max size allowed by vger.\n\nSigned-off-by: Wang Chen \u003cwangchen@cn.fujitsu.com\u003e\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n"
    },
    {
      "commit": "babcda74e9d96bb58fd9c6c5112dbdbff169e695",
      "tree": "fcbe5e70f1fff01ad49504171e964c387a5ad7f8",
      "parents": [
        "ab2910921064b657610a3b501358a305e13087ea"
      ],
      "author": {
        "name": "David S. Miller",
        "email": "davem@davemloft.net",
        "time": "Mon Nov 03 21:11:17 2008 -0800"
      },
      "committer": {
        "name": "David S. Miller",
        "email": "davem@davemloft.net",
        "time": "Mon Nov 03 21:11:17 2008 -0800"
      },
      "message": "drivers/net: Kill now superfluous -\u003elast_rx stores.\n\nThe generic packet receive code takes care of setting\nnetdev-\u003elast_rx when necessary, for the sake of the\nbonding ARP monitor.\n\nDrivers need not do it any more.\n\nSome cases had to be skipped over because the drivers\nwere making use of the -\u003elast_rx value themselves.\n\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n"
    },
    {
      "commit": "275f165fa970174f8a98205529750e8abb6c0a33",
      "tree": "a9548561c6fd50de8a0d706704ba6c6f22bc7b19",
      "parents": [
        "842e08bd6891bd78b4c3d2e0c4a94bebb32ab3ad"
      ],
      "author": {
        "name": "Arjan van de Ven",
        "email": "arjan@infradead.org",
        "time": "Mon Oct 20 21:42:39 2008 -0700"
      },
      "committer": {
        "name": "Jeff Garzik",
        "email": "jgarzik@redhat.com",
        "time": "Fri Oct 31 00:53:48 2008 -0400"
      },
      "message": "pci: use pci_ioremap_bar() in drivers/net\n\nUse the newly introduced pci_ioremap_bar() function in drivers/net.\npci_ioremap_bar() just takes a pci device and a bar number, with the goal\nof making it really hard to get wrong, while also having a central place\nto stick sanity checks.\n\nSigned-off-by: Arjan van de Ven \u003carjan@linux.intel.com\u003e\nSigned-off-by: Jeff Garzik \u003cjgarzik@redhat.com\u003e\n"
    },
    {
      "commit": "e174961ca1a0b28f7abf0be47973ad57cb74e5f0",
      "tree": "e8f74ecd420a0e380a71670e5aec5c2a0c15640a",
      "parents": [
        "0c68ae2605dbcf67414d8d1f19af93be44b355fb"
      ],
      "author": {
        "name": "Johannes Berg",
        "email": "johannes@sipsolutions.net",
        "time": "Mon Oct 27 15:59:26 2008 -0700"
      },
      "committer": {
        "name": "David S. Miller",
        "email": "davem@davemloft.net",
        "time": "Mon Oct 27 17:06:18 2008 -0700"
      },
      "message": "net: convert print_mac to %pM\n\nThis converts pretty much everything to print_mac. There were\na few things that had conflicts which I have just dropped for\nnow, no harm done.\n\nI\u0027ve built an allyesconfig with this and looked at the files\nthat weren\u0027t built very carefully, but it\u0027s a huge patch.\n\nSigned-off-by: Johannes Berg \u003cjohannes@sipsolutions.net\u003e\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n"
    },
    {
      "commit": "20501a69818827884b4381cdcedefdb5e7892915",
      "tree": "5181adfc89fcefb8bbc7966c80e5e4895221fe8b",
      "parents": [
        "7bb82d924536cfa62db73dd381b07d9e9b084ffa"
      ],
      "author": {
        "name": "Patrick McHardy",
        "email": "kaber@trash.net",
        "time": "Sat Oct 11 12:25:59 2008 -0700"
      },
      "committer": {
        "name": "David S. Miller",
        "email": "davem@davemloft.net",
        "time": "Sat Oct 11 12:25:59 2008 -0700"
      },
      "message": "e1000: allow VLAN devices to use TSO and CSUM offload\n\nThis patch changes e1000 to set vlan_features so TSO and CSUM\noffload can be used by VLAN devices, similar as with the other\nIntel drivers.\n\nSigned-off-by: Patrick McHardy \u003ckaber@trash.net\u003e\nSigned-off-by: Jesse Brandeburg \u003cjesse.brandeburg@intel.com\u003e\nSigned-off-by: Jeff Kirsher \u003cjeffrey.t.kirsher@intel.com\u003e\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n"
    },
    {
      "commit": "3ed30676f5bc9960c67644fa37c5fdc36ae47b5b",
      "tree": "c95e30027cec695c1ede5a967f084cd508e571f4",
      "parents": [
        "af807c82978ec1b8c5120b59b78ef951b3e4603b"
      ],
      "author": {
        "name": "Dave Graham",
        "email": "david.graham@intel.com",
        "time": "Thu Oct 09 14:29:26 2008 -0700"
      },
      "committer": {
        "name": "David S. Miller",
        "email": "davem@davemloft.net",
        "time": "Thu Oct 09 14:29:26 2008 -0700"
      },
      "message": "e1000: don\u0027t generate bad checksums for tcp packets with 0 csum\n\nWhen offloading transmit checksums only, the driver was not\ncorrectly configuring the hardware to handle the case of a zero\nchecksum.  For UDP the correct behavior is to leave it alone, but\nfor tcp the checksum must be changed from 0x0000 to 0xFFFF.  The\nhardware takes care of this case but only if it is told the\npacket is tcp.\n\nsame patch as e1000e\n\nSigned-off-by: Dave Graham \u003cdavid.graham@intel.com\u003e\nSigned-off-by: Jesse Brandeburg \u003cjesse.brandeburg@intel.com\u003e\nSigned-off-by: Jeff Kirsher \u003cjeffrey.t.kirsher@intel.com\u003e\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n"
    },
    {
      "commit": "b262e60309e1b0eb25d300c7e739427d5316abb1",
      "tree": "bf319d78c79bb5cb617ff0c8340c73aa349bba15",
      "parents": [
        "93c8b90f01f0dc73891da4e84b26524b61d29d66",
        "0523820482dcb42784572ffd2296c2f08c275a2b"
      ],
      "author": {
        "name": "David S. Miller",
        "email": "davem@davemloft.net",
        "time": "Wed Oct 01 06:12:56 2008 -0700"
      },
      "committer": {
        "name": "David S. Miller",
        "email": "davem@davemloft.net",
        "time": "Wed Oct 01 06:12:56 2008 -0700"
      },
      "message": "Merge branch \u0027master\u0027 of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6\n\nConflicts:\n\n\tdrivers/net/wireless/ath9k/core.c\n\tdrivers/net/wireless/ath9k/main.c\n\tnet/core/dev.c\n"
    },
    {
      "commit": "630b25cdf4e3f8c0a11eb04fc8436cc36653cd58",
      "tree": "4d1bedf445af354119d70aca074fc5dbe3cd4be9",
      "parents": [
        "b22596726bd37c7a4df4a43406a9a60f617d3d02"
      ],
      "author": {
        "name": "Brandeburg, Jesse",
        "email": "jesse.brandeburg@intel.com",
        "time": "Tue Sep 16 13:01:28 2008 -0700"
      },
      "committer": {
        "name": "Jeff Garzik",
        "email": "jgarzik@redhat.com",
        "time": "Wed Sep 24 22:17:42 2008 -0400"
      },
      "message": "e1000: remove unused Kconfig option for disabling packet split\n\nSince the e1000/e1000e split, no hardware supported by e1000\nsupports packet split, just remove the Kconfig option and associated\ncode from the driver.\n\nSigned-off-by: Jesse Brandeburg \u003cjesse.brandeburg@intel.com\u003e\nSigned-off-by: Jeff Garzik \u003cjgarzik@redhat.com\u003e\n"
    }
  ],
  "next": "78566fecbb12a7616ae9a88b2ffbc8062c4a89e3"
}
