)]}'
{
  "log": [
    {
      "commit": "fbef0a40919a80eb8a02fe9d3b96dfdcdebf4317",
      "tree": "b097fb14f85f74ef0b855cbf689933a701c65fe2",
      "parents": [
        "78fbfd8a653ca972afe479517a40661bfff6d8c3"
      ],
      "author": {
        "name": "David S. Miller",
        "email": "davem@davemloft.net",
        "time": "Fri Mar 11 15:55:37 2011 -0500"
      },
      "committer": {
        "name": "David S. Miller",
        "email": "davem@davemloft.net",
        "time": "Sat Mar 12 15:08:43 2011 -0800"
      },
      "message": "net: Remove unnecessary padding in struct flowi\n\nMove tos, scope, proto, and flags to the beginning of\nthe structure.\n\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n"
    },
    {
      "commit": "78fbfd8a653ca972afe479517a40661bfff6d8c3",
      "tree": "9dccc5c16bf269d53d8499064ec95a998e84c646",
      "parents": [
        "1561747ddf9d28185548687b11aae7074d6129c4"
      ],
      "author": {
        "name": "David S. Miller",
        "email": "davem@davemloft.net",
        "time": "Sat Mar 12 00:00:52 2011 -0500"
      },
      "committer": {
        "name": "David S. Miller",
        "email": "davem@davemloft.net",
        "time": "Sat Mar 12 15:08:42 2011 -0800"
      },
      "message": "ipv4: Create and use route lookup helpers.\n\nThe idea here is this minimizes the number of places one has to edit\nin order to make changes to how flows are defined and used.\n\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n"
    },
    {
      "commit": "1561747ddf9d28185548687b11aae7074d6129c4",
      "tree": "7d0561b6fd8e5f6e6f30e49142213bfb348be5ac",
      "parents": [
        "ab1ebc953081d4e50f8e6d2d8d89b2cde3184e78",
        "1f4a0244ff002672be855ff2eaa4a29a63d42d42"
      ],
      "author": {
        "name": "David S. Miller",
        "email": "davem@davemloft.net",
        "time": "Sat Mar 12 14:41:02 2011 -0800"
      },
      "committer": {
        "name": "David S. Miller",
        "email": "davem@davemloft.net",
        "time": "Sat Mar 12 14:41:02 2011 -0800"
      },
      "message": "Merge branch \u0027master\u0027 of master.kernel.org:/pub/scm/linux/kernel/git/jkirsher/net-next-2.6\n"
    },
    {
      "commit": "ab1ebc953081d4e50f8e6d2d8d89b2cde3184e78",
      "tree": "e25d01c62a4c7f3de78675faa6728b54848304e2",
      "parents": [
        "70d279a7e2a6e308530822ba2bf4134cc0f5c091",
        "409ec36c320d580a036045e603f96286c362c609"
      ],
      "author": {
        "name": "David S. Miller",
        "email": "davem@davemloft.net",
        "time": "Sat Mar 12 11:06:59 2011 -0800"
      },
      "committer": {
        "name": "David S. Miller",
        "email": "davem@davemloft.net",
        "time": "Sat Mar 12 11:06:59 2011 -0800"
      },
      "message": "Merge branch \u0027for-davem\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless-next-2.6\n"
    },
    {
      "commit": "1f4a0244ff002672be855ff2eaa4a29a63d42d42",
      "tree": "9d122241efafdb5a09e718c45c7c5bdd95194b2b",
      "parents": [
        "ff4ab2061199cdb938282d302d5044b1858e28c8"
      ],
      "author": {
        "name": "John Fastabend",
        "email": "john.r.fastabend@intel.com",
        "time": "Thu Mar 10 12:06:12 2011 +0000"
      },
      "committer": {
        "name": "Jeff Kirsher",
        "email": "jeffrey.t.kirsher@intel.com",
        "time": "Sat Mar 12 04:15:35 2011 -0800"
      },
      "message": "ixgbe: DCB, PFC not cleared until reset occurs\n\nThe PFC configuration is not cleared until the device is reset. This\nhas not been a problem because setting DCB attributes forced a\nhardware reset. Now that we no longer require this reset to occur\nPFC remains configured even after being disabled until the\ndevice is reset.\n\nThis removes a goto in the PFC hardware set routines for 82598 and\n82599 devices that was short circuiting the clear.\n\nSigned-off-by: John Fastabend \u003cjohn.r.fastabend@intel.com\u003e\nTested-by: Ross Brattain \u003cross.b.brattain@intel.com\u003e\nSigned-off-by: Jeff Kirsher \u003cjeffrey.t.kirsher@intel.com\u003e\n"
    },
    {
      "commit": "ff4ab2061199cdb938282d302d5044b1858e28c8",
      "tree": "d0aaa0de221ca032c706e06379f89d0514571433",
      "parents": [
        "1390a59452a0895d3fea5b5504fa75ba36c13a74"
      ],
      "author": {
        "name": "Lior Levy",
        "email": "lior.levy@intel.com",
        "time": "Fri Mar 11 02:03:07 2011 +0000"
      },
      "committer": {
        "name": "Jeff Kirsher",
        "email": "jeffrey.t.kirsher@intel.com",
        "time": "Sat Mar 12 04:15:08 2011 -0800"
      },
      "message": "ixgbe: add support for VF Transmit rate limit using iproute2\n\nImplemented ixgbe_ndo_set_vf_bw function which is being used by iproute2\ntool. In addition, updated ixgbe_ndo_get_vf_config function to show the\nactual rate limit to the user.\n\nThe rate limitation can be configured only when the link is up and the\nlink speed is 10Gb.\nThe rate limit value can be 0 or ranged between 11 and actual link\nspeed measured in Mbps. A value of \u00270\u0027 disables the rate limit for\nthis specific VF.\n\niproute2 usage will be \u0027ip link set ethX vf Y rate Z\u0027.\nAfter the command is made, the rate will be changed instantly.\nTo view the current rate limit, use \u0027ip link show ethX\u0027.\n\nThe rates will be zeroed only upon driver reload or a link speed change.\n\nThis feature is being supported by 82599 and X540 devices.\n\nSigned-off-by: Lior Levy \u003clior.levy@intel.com\u003e\nSigned-off-by: Jeff Kirsher \u003cjeffrey.t.kirsher@intel.com\u003e\n"
    },
    {
      "commit": "1390a59452a0895d3fea5b5504fa75ba36c13a74",
      "tree": "8535968cc4b9c6acfbc28cef156477b094b139ea",
      "parents": [
        "6fb456a07c68913516da9de90d3849ee9821dea8"
      ],
      "author": {
        "name": "John Fastabend",
        "email": "john.r.fastabend@intel.com",
        "time": "Wed Mar 09 04:46:16 2011 +0000"
      },
      "committer": {
        "name": "Jeff Kirsher",
        "email": "jeffrey.t.kirsher@intel.com",
        "time": "Sat Mar 12 04:14:48 2011 -0800"
      },
      "message": "ixgbe: DCB, set minimum bandwidth per traffic class\n\nDCB provides a guaranteed bandwidth in the case with 0%\nbandwidth then no bandwidth is guaranteed. However the\ntraffic class should still be able to transmit traffic.\nFor this to work the traffic class must be given the\nminimum credits required to send a frame.\n\nSigned-off-by: John Fastabend \u003cjohn.r.fastabend@intel.com\u003e\nTested-by: Ross Brattain \u003cross.b.brattain@intel.com\u003e\nSigned-off-by: Jeff Kirsher \u003cjeffrey.t.kirsher@intel.com\u003e\n"
    },
    {
      "commit": "6fb456a07c68913516da9de90d3849ee9821dea8",
      "tree": "58a0d803bf622c73df3019c403694f9b6dbb8d8d",
      "parents": [
        "9dda173667207fe59d380e522d318c144dc032f7"
      ],
      "author": {
        "name": "Emil Tantilov",
        "email": "emil.s.tantilov@intel.com",
        "time": "Sat Mar 05 08:02:18 2011 +0000"
      },
      "committer": {
        "name": "Jeff Kirsher",
        "email": "jeffrey.t.kirsher@intel.com",
        "time": "Sat Mar 12 04:14:28 2011 -0800"
      },
      "message": "ixgbe: correct typo in define name\n\nVF Free Running Timer register name missing an F.\n\nSigned-off-by: Emil Tantilov \u003cemil.s.tantilov@intel.com\u003e\nAcked-by: Greg Rose \u003cgregory.v.rose@intel.com\u003e\nTested-by: Evan Swanson \u003cevan.swanson@intel.com\u003e\nSigned-off-by: Jeff Kirsher \u003cjeffrey.t.kirsher@intel.com\u003e\n"
    },
    {
      "commit": "9dda173667207fe59d380e522d318c144dc032f7",
      "tree": "b72d2f22dd98594e2156361aca4d2a095abf8b3e",
      "parents": [
        "7e7eb4346329da3b9fd4b8d4a5a66d327d9fff6c"
      ],
      "author": {
        "name": "Emil Tantilov",
        "email": "emil.s.tantilov@intel.com",
        "time": "Sat Mar 05 01:28:07 2011 +0000"
      },
      "committer": {
        "name": "Jeff Kirsher",
        "email": "jeffrey.t.kirsher@intel.com",
        "time": "Sat Mar 12 04:14:01 2011 -0800"
      },
      "message": "ixgbe: update PHY code to support 100Mbps as well as 1G/10G\n\nThis change updates the PHY setup code to support 100Mbps capable PHYs\nas well as 10G and 1Gbps.\n\nSigned-off-by: Emil Tantilov \u003cemil.s.tantilov@intel.com\u003e\nTested-by: Stephen Ko \u003cstephen.s.ko@intel.com\u003e\nSigned-off-by: Jeff Kirsher \u003cjeffrey.t.kirsher@intel.com\u003e\n"
    },
    {
      "commit": "7e7eb4346329da3b9fd4b8d4a5a66d327d9fff6c",
      "tree": "b0b6782157d5eff5e3b7480ec50c7abc586fcbdc",
      "parents": [
        "c27931da83bc486e192c8dfdab903ba51e176c54"
      ],
      "author": {
        "name": "Emil Tantilov",
        "email": "emil.s.tantilov@intel.com",
        "time": "Fri Mar 04 03:20:59 2011 +0000"
      },
      "committer": {
        "name": "Jeff Kirsher",
        "email": "jeffrey.t.kirsher@intel.com",
        "time": "Sat Mar 12 04:13:41 2011 -0800"
      },
      "message": "ixgbe: remove timer reset to 0 on timeout\n\nThe VF mailbox polling for acks and messages would reset the timer to zero\non a timeout. Under heavy load a timeout may actually occur without being\nthe result of an error and when this occurs it is not practical to perform\na full VF driver reset on every message timeout. Instead, just return an\nerror (which is already done) and the VF driver will have an opportunity\nto retry the operation.\n\nSigned-off-by: Emil Tantilov \u003cemil.s.tantilov@intel.com\u003e\nAcked-by: Greg Rose \u003cgregory.v.rose@intel.com\u003e\nSigned-off-by: Jeff Kirsher \u003cjeffrey.t.kirsher@intel.com\u003e\n"
    },
    {
      "commit": "c27931da83bc486e192c8dfdab903ba51e176c54",
      "tree": "bd9374768b0d1a6ee6249170f31fbc435872e94e",
      "parents": [
        "17049d30c2dec6f26d6165cc135578f9e41d53d3"
      ],
      "author": {
        "name": "John Fastabend",
        "email": "john.r.fastabend@intel.com",
        "time": "Wed Feb 23 05:58:25 2011 +0000"
      },
      "committer": {
        "name": "Jeff Kirsher",
        "email": "jeffrey.t.kirsher@intel.com",
        "time": "Sat Mar 12 04:13:20 2011 -0800"
      },
      "message": "ixgbe: DCB during ifup use correct CEE or IEEE mode\n\nDCB settings are cleared in the hardware across link events\nduring ifup ixgbe reprograms the hardware for DCB if it is\nenabled. Now that we have two modes CEE or IEEE we need to\nuse the correct set of configuration data.\n\nThis patch checks the dcbx_cap bits and then enables the\ndevice in the correct mode.\n\nSigned-off-by: John Fastabend \u003cjohn.r.fastabend@intel.com\u003e\nTested-by: Ross Brattain \u003cross.b.brattain@intel.com\u003e\nSigned-off-by: Jeff Kirsher \u003cjeffrey.t.kirsher@intel.com\u003e\n"
    },
    {
      "commit": "17049d30c2dec6f26d6165cc135578f9e41d53d3",
      "tree": "b58a6c005d89c15a58213cc2e62e9d4de81d8c37",
      "parents": [
        "3b97fd695453ced96f22bdf1a84453f6744d25cc"
      ],
      "author": {
        "name": "John Fastabend",
        "email": "john.r.fastabend@intel.com",
        "time": "Wed Feb 23 05:58:19 2011 +0000"
      },
      "committer": {
        "name": "Jeff Kirsher",
        "email": "jeffrey.t.kirsher@intel.com",
        "time": "Sat Mar 12 04:12:54 2011 -0800"
      },
      "message": "ixgbe: IEEE 802.1Qaz, implement priority assignment table\n\nThis patch adds support to use the priority assignment\ntable in the ieee_ets structure to map priorities to\ntraffic classes. Previously ixgbe only supported a\n1:1 mapping. Now we can enable and disable hardware\nDCB support when multiple traffic classes are actually\nbeing used. This allows the default case all priorities\nmapped to traffic class 0 to work in normal hardware\nmode and utilize the full packet buffer.\n\nThis patch does not address putting the hardware in\n4TC mode so packet buffer space may be underutilized\nin this case. A follow up patch can address this\noptimization. But at least we have the hooks to do\nthis now.\n\nAlso CEE will behave as it always has and map priorities\n1:1 with traffic classes.\n\nSigned-off-by: John Fastabend \u003cjohn.r.fastabend@intel.com\u003e\nTested-by: Ross Brattain \u003cross.b.brattain@intel.com\u003e\nSigned-off-by: Jeff Kirsher \u003cjeffrey.t.kirsher@intel.com\u003e\n"
    },
    {
      "commit": "3b97fd695453ced96f22bdf1a84453f6744d25cc",
      "tree": "b14fae0ed8354fa673f8ca02d1b8578a13b46208",
      "parents": [
        "8187cd485b1a74b6ae258786b9ade3ecaafec318"
      ],
      "author": {
        "name": "John Fastabend",
        "email": "john.r.fastabend@intel.com",
        "time": "Wed Feb 23 05:58:14 2011 +0000"
      },
      "committer": {
        "name": "Jeff Kirsher",
        "email": "jeffrey.t.kirsher@intel.com",
        "time": "Sat Mar 12 04:12:35 2011 -0800"
      },
      "message": "ixgbe: DCB, missed translation from 8021Qaz TSA to CEE link strict\n\nThe patch below  allowed IEEE 802.1Qaz and CEE DCB hardware\nconfigurations to use common hardware set routines,\n\ncommit 88eb696cc6a7af8f9272266965b1a4dd7d6a931b\nAuthor: John Fastabend \u003cjohn.r.fastabend@intel.com\u003e\nDate:   Thu Feb 10 03:02:11 2011 -0800\n\n    ixgbe: DCB, abstract out dcb_config from DCB hardware configuration\n\nHowever the case when CEE link strict and group strict\nare set was missed and are currently being mapped\nincorrectly in some configurations.\n\nThis patch resolves this.\n\nSigned-off-by: John Fastabend \u003cjohn.r.fastabend@intel.com\u003e\nTested-by: Ross Brattain \u003cross.b.brattain@intel.com\u003e\nSigned-off-by: Jeff Kirsher \u003cjeffrey.t.kirsher@intel.com\u003e\n"
    },
    {
      "commit": "8187cd485b1a74b6ae258786b9ade3ecaafec318",
      "tree": "b5d78ae3c66968b72a94ee6765e6ec886e764445",
      "parents": [
        "24095aa347a32673cf220fc0bd0b78d28ba0a69e"
      ],
      "author": {
        "name": "John Fastabend",
        "email": "john.r.fastabend@intel.com",
        "time": "Wed Feb 23 05:58:08 2011 +0000"
      },
      "committer": {
        "name": "Jeff Kirsher",
        "email": "jeffrey.t.kirsher@intel.com",
        "time": "Sat Mar 12 04:12:14 2011 -0800"
      },
      "message": "ixgbe: DCB: enable RSS to be used with DCB\n\nRSS had previously been disabled when DCB was enabled because\nDCB was single queued per traffic class. Now that DCB implements\nmultiple Tx/Rx rings per traffic class enable RSS.\n\nHere RSS hashes across the queues in the traffic class.\n\nSigned-off-by: John Fastabend \u003cjohn.r.fastabend@intel.com\u003e\nTested-by: Ross Brattain \u003cross.b.brattain.@intel.com\u003e\nSigned-off-by: Jeff Kirsher \u003cjeffrey.t.kirsher@intel.com\u003e\n"
    },
    {
      "commit": "24095aa347a32673cf220fc0bd0b78d28ba0a69e",
      "tree": "4b7a3e37c581de6c8282b0ec0c6e2627cce32419",
      "parents": [
        "e5b646355770d34eab360ebae93c56c407dfe803"
      ],
      "author": {
        "name": "John Fastabend",
        "email": "john.r.fastabend@intel.com",
        "time": "Wed Feb 23 05:58:03 2011 +0000"
      },
      "committer": {
        "name": "Jeff Kirsher",
        "email": "jeffrey.t.kirsher@intel.com",
        "time": "Sat Mar 12 04:11:53 2011 -0800"
      },
      "message": "ixgbe: enable ndo_tc_setup\n\nThis patch adds the ndo_tc_setup to ixgbe. By default we set\nthe device to use strict priority.\n\nSigned-off-by: John Fastabend \u003cjohn.r.fastabend@intel.com\u003e\nTested-by: Ross Brattain \u003cross.b.brattain.@intel.com\u003e\nSigned-off-by: Jeff Kirsher \u003cjeffrey.t.kirsher@intel.com\u003e\n"
    },
    {
      "commit": "e5b646355770d34eab360ebae93c56c407dfe803",
      "tree": "ed43c57e5ecb4813e126a5f287443baa3af49b92",
      "parents": [
        "dc166e22ede5ffb46b5b18b99ba0321ae545f89b"
      ],
      "author": {
        "name": "John Fastabend",
        "email": "john.r.fastabend@intel.com",
        "time": "Tue Mar 08 03:44:52 2011 +0000"
      },
      "committer": {
        "name": "Jeff Kirsher",
        "email": "jeffrey.t.kirsher@intel.com",
        "time": "Sat Mar 12 04:11:29 2011 -0800"
      },
      "message": "ixgbe: DCB, use multiple Tx rings per traffic class\n\nThis enables multiple {Tx|Rx} rings per traffic class while in DCB\nmode. In order to get this working as expected the tc_to_tx net\ndevice mapping is configured as well as the prio_tc_map.\n\nskb priorities are mapped across a range of queue pairs to get\na distribution per traffic class. The maximum number of\nqueue pairs used while in DCB mode is capped at 64. The hardware\nmax is actually 128 queues but 64 is sufficient for now and\nallocating more seemed a bit excessive. It is easy enough to\nincrease the cap later if need be.\n\nTo get the 802.1Q priority tags inserted correctly ixgbe was\npreviously using the skb queue_mapping field to directly set\nthe 802.1Q priority. This no longer works because we have removed\nthe 1:1 mapping between queues and traffic class. Each ring\nis aligned with an 802.1Qaz traffic class so here we add an\nextra field to the ring struct to identify the 802.1Q traffic\nclass. This uses an extra byte of the ixgbe_ring struct\nfortunately there was a 2byte hole,\n\nstruct ixgbe_ring {\n        void *                     desc;                 /*     0     8 */\n        struct device *            dev;                  /*     8     8 */\n        struct net_device *        netdev;               /*    16     8 */\n        union {\n                struct ixgbe_tx_buffer * tx_buffer_info; /*           8 */\n                struct ixgbe_rx_buffer * rx_buffer_info; /*           8 */\n        };                                               /*    24     8 */\n        long unsigned int          state;                /*    32     8 */\n        u8                         atr_sample_rate;      /*    40     1 */\n        u8                         atr_count;            /*    41     1 */\n        u16                        count;                /*    42     2 */\n        u16                        rx_buf_len;           /*    44     2 */\n        u16                        next_to_use;          /*    46     2 */\n        u16                        next_to_clean;        /*    48     2 */\n        u8                         queue_index;          /*    50     1 */\n        u8                         reg_idx;              /*    51     1 */\n        u16                        work_limit;           /*    52     2 */\n\n        /* XXX 2 bytes hole, try to pack */\n\n        u8 *                       tail;                 /*    56     8 */\n        /* --- cacheline 1 boundary (64 bytes) --- */\n\nNow we can set the VLAN priority directly and it will be\ncorrect. User space can indicate the 802.1Qaz priority\nusing the SO_PRIORITY setsocket() option and QOS layer will\nsteer the skb to the correct rings. Additionally using\nthe multiq qdisc with a queue_mapping action works as\nwell.\n\nSigned-off-by: John Fastabend \u003cjohn.r.fastabend@intel.com\u003e\nTested-by: Ross Brattain \u003cross.b.brattain@intel.com\u003e\nSigned-off-by: Jeff Kirsher \u003cjeffrey.t.kirsher@intel.com\u003e\n"
    },
    {
      "commit": "dc166e22ede5ffb46b5b18b99ba0321ae545f89b",
      "tree": "7e83a3db691fae1502f49453888762e9325e76d7",
      "parents": [
        "f8628d404505e61bfc63638744656ede69227766"
      ],
      "author": {
        "name": "John Fastabend",
        "email": "john.r.fastabend@intel.com",
        "time": "Wed Feb 23 05:57:52 2011 +0000"
      },
      "committer": {
        "name": "Jeff Kirsher",
        "email": "jeffrey.t.kirsher@intel.com",
        "time": "Sat Mar 12 04:11:11 2011 -0800"
      },
      "message": "ixgbe: DCB remove ixgbe_fcoe_getapp routine\n\nRemove ixgbe_fcoe_getapp() and use the generic kernel\nroutine instead. Also add application priority to the\nkernel maintained list on setapp so applications and\nstacks can query the value.\n\nSigned-off-by: John Fastabend \u003cjohn.r.fastabend@intel.com\u003e\nTested-by: Ross Brattain \u003cross.b.brattain@intel.com\u003e\nSigned-off-by: Jeff Kirsher \u003cjeffrey.t.kirsher@intel.com\u003e\n"
    },
    {
      "commit": "f8628d404505e61bfc63638744656ede69227766",
      "tree": "934e57125f759ebb32cc196afeaa8518606bf5d5",
      "parents": [
        "3032309b49622497430ecd2b40ff51fb204c35e8"
      ],
      "author": {
        "name": "John Fastabend",
        "email": "john.r.fastabend@intel.com",
        "time": "Wed Feb 23 05:57:47 2011 +0000"
      },
      "committer": {
        "name": "Jeff Kirsher",
        "email": "jeffrey.t.kirsher@intel.com",
        "time": "Sat Mar 12 04:10:54 2011 -0800"
      },
      "message": "ixgbe: DCB, implement ieee_setapp dcbnl ops\n\nImplement ieee_setapp dcbnl ops in ixgbe. This is required\nto setup FCoE which requires dedicated resources. If the\napp data is not for FCoE then no action is taken in ixgbe\nexcept to add it to the dcb_app_list.\n\nSigned-off-by: John Fastabend \u003cjohn.r.fastabend@intel.com\u003e\nTested-by: Ross Brattain \u003cross.b.brattain@intel.com\u003e\nSigned-off-by: Jeff Kirsher \u003cjeffrey.t.kirsher@intel.com\u003e\n"
    },
    {
      "commit": "3032309b49622497430ecd2b40ff51fb204c35e8",
      "tree": "766e78c2334148421c80a213cecab5e4fe546da1",
      "parents": [
        "0d1fe82deacdcc90458558b5d6a4a5af5db9a6c6"
      ],
      "author": {
        "name": "John Fastabend",
        "email": "john.r.fastabend@intel.com",
        "time": "Tue Mar 01 05:25:35 2011 +0000"
      },
      "committer": {
        "name": "Jeff Kirsher",
        "email": "jeffrey.t.kirsher@intel.com",
        "time": "Sat Mar 12 04:10:31 2011 -0800"
      },
      "message": "ixgbe: DCB, implement capabilities flags\n\nThis implements dcbnl get and set capabilities ops. The\ndevices supported by ixgbe can be configured to run in\nIEEE or CEE modes but not both.\n\nWith the DCBX set capabilities bit we add an explicit\nsignal that must be used to toggle between these modes.\nThis patch adds logic to fail the CEE command set_hw_all()\nwhich programs the device with a CEE configuration if\nthe CEE caps bit is not set. Similarly, IEEE set\ncommands will fail if the IEEE caps bit is not set. We\nallow most CEE config set commands to occur because they\ndo not touch the hardware until set_hw_all() is called.\n\nThe one exception to the above is the {set|get}app routines.\nThese must always be protected by caps bits to ensure\nside effects do not corrupt the current configured mode.\n\nBy requiring the caps bit to be set correctly we can\nmaintain a consistent configuration in the hardware\nfor CEE or IEEE modes and prevent partial hardware\nconfigurations that may occur if user space does\nnot send a complete IEEE or CEE configurations.\n\nIt is expected that user space will signal a DCBX mode\nbefore programming device.\n\nSigned-off-by: John Fastabend \u003cjohn.r.fastabend@intel.com\u003e\nTested-by: Ross Brattain \u003cross.b.brattain@intel.com\u003e\nSigned-off-by: Jeff Kirsher \u003cjeffrey.t.kirsher@intel.com\u003e\n"
    },
    {
      "commit": "0d1fe82deacdcc90458558b5d6a4a5af5db9a6c6",
      "tree": "c6307f549977b67d0cfdea3622551ecfb91a6253",
      "parents": [
        "831ec0b4226cec7ea34f5c4c9810e78aeb2069bf"
      ],
      "author": {
        "name": "Carolyn Wyborny",
        "email": "carolyn.wyborny@intel.com",
        "time": "Fri Mar 11 20:58:19 2011 -0800"
      },
      "committer": {
        "name": "Jeff Kirsher",
        "email": "jeffrey.t.kirsher@intel.com",
        "time": "Sat Mar 12 04:10:13 2011 -0800"
      },
      "message": "igb: Bump version to 3.0.6\n\nThis patch updates igb version to 3.0.6.\n\nSigned-off-by: Carolyn Wyborny \u003ccarolyn.wyborny@intel.com\u003e\nTested-by: Jeff Pieper \u003cjeffrey.e.pieper@intel.com\u003e\nSigned-off-by: Jeff Kirsher \u003cjeffrey.t.kirsher@intel.com\u003e\n"
    },
    {
      "commit": "831ec0b4226cec7ea34f5c4c9810e78aeb2069bf",
      "tree": "3576b08f16304217c5353b5a6aa2fa5ba5350187",
      "parents": [
        "4322e561a93ec7ee034b603a6c610e7be90d4e8a"
      ],
      "author": {
        "name": "Carolyn Wyborny",
        "email": "carolyn.wyborny@intel.com",
        "time": "Fri Mar 11 20:43:54 2011 -0800"
      },
      "committer": {
        "name": "Jeff Kirsher",
        "email": "jeffrey.t.kirsher@intel.com",
        "time": "Sat Mar 12 04:09:55 2011 -0800"
      },
      "message": "igb: Add DMA Coalescing feature to driver\n\nThis patch add DMA Coalescing which is a power-saving feature that\ncoalesces DMA writes in order to stay in a low-power state as much\nas possible.  Feature is disabled by default.\n\nSigned-off-by: Carolyn Wyborny \u003ccarolyn.wyborny@intel.com\u003e\nTested-by: Jeff Pieper \u003cjeffrey.e.pieper@intel.com\u003e\nSigned-off-by: Jeff Kirsher \u003cjeffrey.t.kirsher@intel.com\u003e\n"
    },
    {
      "commit": "4322e561a93ec7ee034b603a6c610e7be90d4e8a",
      "tree": "a3260a88662c8a2b65233513bac17faffc0f64bf",
      "parents": [
        "09b068d45737abb49320ab25cb4ed2916017ace7"
      ],
      "author": {
        "name": "Carolyn Wyborny",
        "email": "carolyn.wyborny@intel.com",
        "time": "Fri Mar 11 20:43:18 2011 -0800"
      },
      "committer": {
        "name": "Jeff Kirsher",
        "email": "jeffrey.t.kirsher@intel.com",
        "time": "Sat Mar 12 04:09:37 2011 -0800"
      },
      "message": "igb: Update NVM functions to work with i350 devices\n\nThis patch adds functions and functions pointers to accommodate\ndifferences between NVM interfaces and options for i350 devices,\n82580 devices and the rest.\n\nSigned-off-by: Carolyn Wyborny \u003ccarolyn.wyborny@intel.com\u003e\nTested-by: Jeff Pieper \u003cjeffrey.e.pieper@intel.com\u003e\nSigned-off-by: Jeff Kirsher \u003cjeffrey.t.kirsher@intel.com\u003e\n"
    },
    {
      "commit": "09b068d45737abb49320ab25cb4ed2916017ace7",
      "tree": "489c503a733de2f1d632e27ac331a6be4bd7f41f",
      "parents": [
        "422e05d12af9c1063d57210074b4e6db36a0cf39"
      ],
      "author": {
        "name": "Carolyn Wyborny",
        "email": "carolyn.wyborny@intel.com",
        "time": "Fri Mar 11 20:42:13 2011 -0800"
      },
      "committer": {
        "name": "Jeff Kirsher",
        "email": "jeffrey.t.kirsher@intel.com",
        "time": "Sat Mar 12 04:09:20 2011 -0800"
      },
      "message": "igb: Add Energy Efficient Ethernet (EEE) for i350 devices.\n\nThis patch adds the EEE feature for i350 devices, enabled by default.\n\nSigned-off-by: Carolyn Wyborny \u003ccarolyn.wyborny@intel.com\u003e\nTested-by: Jeff Pieper \u003cjeffrey.e.pieper@intel.com\u003e\nSigned-off-by: Jeff Kirsher \u003cjeffrey.t.kirsher@intel.com\u003e\n"
    },
    {
      "commit": "422e05d12af9c1063d57210074b4e6db36a0cf39",
      "tree": "4cd1b858c1c3723ed2d05af40018b221b115b42f",
      "parents": [
        "a9f7c5363b7d2d836ad2be2d96fd4af3fd0d349a"
      ],
      "author": {
        "name": "Greg Rose",
        "email": "gregory.v.rose@intel.com",
        "time": "Sat Mar 12 02:01:29 2011 +0000"
      },
      "committer": {
        "name": "Jeff Kirsher",
        "email": "jeffrey.t.kirsher@intel.com",
        "time": "Sat Mar 12 04:09:06 2011 -0800"
      },
      "message": "ixgbevf: Fix Driver String\n\nChange the driver string to match the PF driver string format.\n\nSigned-off-by: Greg Rose \u003cgregory.v.rose@intel.com\u003e\nSigned-off-by: Jeff Kirsher \u003cjeffrey.t.kirsher@intel.com\u003e\n"
    },
    {
      "commit": "a9f7c5363b7d2d836ad2be2d96fd4af3fd0d349a",
      "tree": "69481cba4b411674fa45c1e5b34227b4d873f2ce",
      "parents": [
        "70d279a7e2a6e308530822ba2bf4134cc0f5c091"
      ],
      "author": {
        "name": "Greg Rose",
        "email": "gregory.v.rose@intel.com",
        "time": "Wed Mar 02 06:52:30 2011 +0000"
      },
      "committer": {
        "name": "Jeff Kirsher",
        "email": "jeffrey.t.kirsher@intel.com",
        "time": "Sat Mar 12 04:08:52 2011 -0800"
      },
      "message": "ixgbevf: Fix Version String\n\nThe kernel version string is off by a major version number since\nnew silicon was just introduced and also uses the wrong format for\nthe version postfix.\n\nSigned-off-by: Greg Rose \u003cgregory.v.rose@intel.com\u003e\nSigned-off-by: Jeff Kirsher \u003cjeffrey.t.kirsher@intel.com\u003e\n"
    },
    {
      "commit": "409ec36c320d580a036045e603f96286c362c609",
      "tree": "3dd9b3569799f7962b523a068052445e2d2c51aa",
      "parents": [
        "1b7fe59322bef9e7a2c05b64a07a66b875299736",
        "8d5eab5aa676378b4c9daa62d10d08a0bca04677"
      ],
      "author": {
        "name": "John W. Linville",
        "email": "linville@tuxdriver.com",
        "time": "Fri Mar 11 14:11:11 2011 -0500"
      },
      "committer": {
        "name": "John W. Linville",
        "email": "linville@tuxdriver.com",
        "time": "Fri Mar 11 14:11:11 2011 -0500"
      },
      "message": "Merge branch \u0027master\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless-next-2.6 into for-davem\n"
    },
    {
      "commit": "70d279a7e2a6e308530822ba2bf4134cc0f5c091",
      "tree": "9941f793703bc2944c7e1088cb24a390a13f6ec9",
      "parents": [
        "4a29e15515ea56b8ec78ebb77529b1ad5c268bb9"
      ],
      "author": {
        "name": "Bruce Allan",
        "email": "bruce.w.allan@intel.com",
        "time": "Sat Feb 26 03:12:19 2011 +0000"
      },
      "committer": {
        "name": "Jeff Kirsher",
        "email": "jeffrey.t.kirsher@intel.com",
        "time": "Fri Mar 11 02:25:09 2011 -0800"
      },
      "message": "e1000e: bump version number\n\nSigned-off-by: Bruce Allan \u003cbruce.w.allan@intel.com\u003e\nTested-by: Jeff Pieper \u003cjeffrey.e.pieper@intel.com\u003e\nSigned-off-by: Jeff Kirsher \u003cjeffrey.t.kirsher@intel.com\u003e\n"
    },
    {
      "commit": "4a29e15515ea56b8ec78ebb77529b1ad5c268bb9",
      "tree": "de83f15c260c4d3c5abdae208cef03b340f8c6fa",
      "parents": [
        "23e4f061306798dfb1941bd2f399949b705822c6"
      ],
      "author": {
        "name": "Bruce Allan",
        "email": "bruce.w.allan@intel.com",
        "time": "Fri Mar 04 09:07:01 2011 +0000"
      },
      "committer": {
        "name": "Jeff Kirsher",
        "email": "jeffrey.t.kirsher@intel.com",
        "time": "Fri Mar 11 02:24:15 2011 -0800"
      },
      "message": "e1000e: do not suggest the driver supports Wake-on-ARP\n\nThe driver doesn\u0027t support Wake-on-ARP, so don\u0027t advertise through ethtool\nthat it does.\n\nCleanup some coding style issues in the same functions.\n\nSigned-off-by: Bruce Allan \u003cbruce.w.allan@intel.com\u003e\nTested-by: Jeff Pieper \u003cjeffrey.e.pieper@intel.com\u003e\nSigned-off-by: Jeff Kirsher \u003cjeffrey.t.kirsher@intel.com\u003e\n"
    },
    {
      "commit": "23e4f061306798dfb1941bd2f399949b705822c6",
      "tree": "c5e5dcf8e64dffc9a5de9577f0cf78e85b5b3abe",
      "parents": [
        "6cc7aaed70c96c3933fbacbad582fc79b7d6e335"
      ],
      "author": {
        "name": "Bruce Allan",
        "email": "bruce.w.allan@intel.com",
        "time": "Fri Feb 25 07:44:51 2011 +0000"
      },
      "committer": {
        "name": "Jeff Kirsher",
        "email": "jeffrey.t.kirsher@intel.com",
        "time": "Fri Mar 11 02:23:21 2011 -0800"
      },
      "message": "e1000e: disable jumbo frames on 82579 when MACsec enabled in EEPROM\n\nIf/when an OEM enables MACsec in the 82579 EEPROM, disable jumbo frames\nsupport in the driver due to an interoperability issue in hardware that\nprevents jumbo packets from being transmitted or received.\n\nSigned-off-by: Bruce Allan \u003cbruce.w.allan@intel.com\u003e\nTested-by: Jeff Pieper \u003cjeffrey.e.pieper@intel.com\u003e\nSigned-off-by: Jeff Kirsher \u003cjeffrey.t.kirsher@intel.com\u003e\n"
    },
    {
      "commit": "6cc7aaed70c96c3933fbacbad582fc79b7d6e335",
      "tree": "b01610d2eb974637e20d96364bb6bc513f0a3da4",
      "parents": [
        "1effb45cca29e22e4b2209bb567770b7e20a3a2b"
      ],
      "author": {
        "name": "Bruce Allan",
        "email": "bruce.w.allan@intel.com",
        "time": "Fri Feb 25 06:25:18 2011 +0000"
      },
      "committer": {
        "name": "Jeff Kirsher",
        "email": "jeffrey.t.kirsher@intel.com",
        "time": "Fri Mar 11 02:14:56 2011 -0800"
      },
      "message": "e1000e: do not toggle LANPHYPC value bit when PHY reset is blocked\n\nWhen PHY reset is intentionally blocked on 82577/8/9, do not toggle the\nLANPHYPC value bit (essentially performing a hard power reset of the\ndevice) otherwise the PHY can be put into an unknown state.\n\nCleanup whitespace in the same function.\n\nSigned-off-by: Bruce Allan \u003cbruce.w.allan@intel.com\u003e\nTested-by: Jeff Pieper \u003cjeffrey.e.pieper@intel.com\u003e\nSigned-off-by: Jeff Kirsher \u003cjeffrey.t.kirsher@intel.com\u003e\n"
    },
    {
      "commit": "1effb45cca29e22e4b2209bb567770b7e20a3a2b",
      "tree": "32ea3837ac121d6d5777b673aa5ea8204134c1c2",
      "parents": [
        "5661aeb08edcef6799861f92817f593c1fd7b272"
      ],
      "author": {
        "name": "Bruce Allan",
        "email": "bruce.w.allan@intel.com",
        "time": "Fri Feb 25 06:58:03 2011 +0000"
      },
      "committer": {
        "name": "Jeff Kirsher",
        "email": "jeffrey.t.kirsher@intel.com",
        "time": "Fri Mar 11 02:05:26 2011 -0800"
      },
      "message": "e1000e: extend EEE LPI timer to prevent dropped link\n\nThe link can be unexpectedly dropped when the timer for entering EEE low-\npower-idle quiet state expires too soon.  The timer needs to be extended\nfrom 196usec to 200usec after every LCD (PHY) reset to prevent this from\nhappening.\n\nSigned-off-by: Bruce Allan \u003cbruce.w.allan@intel.com\u003e\nSigned-off-by: Jeff Kirsher \u003cjeffrey.t.kirsher@intel.com\u003e\n"
    },
    {
      "commit": "5661aeb08edcef6799861f92817f593c1fd7b272",
      "tree": "1cbf6d455075e98a03fdadf059c696693bcd2cb6",
      "parents": [
        "d8d5f8aebb857f979fbe9099c9acc2ed486706be"
      ],
      "author": {
        "name": "Bruce Allan",
        "email": "bruce.w.allan@intel.com",
        "time": "Fri Feb 25 06:36:25 2011 +0000"
      },
      "committer": {
        "name": "Jeff Kirsher",
        "email": "jeffrey.t.kirsher@intel.com",
        "time": "Fri Mar 11 02:03:35 2011 -0800"
      },
      "message": "e1000e: extend timeout for ethtool link test diagnostic\n\nWith some PHYs supported by this driver, link establishment can take a\nlittle longer when connected to certain switches.  Extend the timeout to\nreduce the number of false diagnostic failures, and cleanup a code style\nissue in the same function.\n\nSigned-off-by: Bruce Allan \u003cbruce.w.allan@intel.com\u003e\nTested-by: Jeff Pieper \u003cjeffrey.e.pieper@intel.com\u003e\nSigned-off-by: Jeff Kirsher \u003cjeffrey.t.kirsher@intel.com\u003e\n"
    },
    {
      "commit": "d8d5f8aebb857f979fbe9099c9acc2ed486706be",
      "tree": "9083c428cebef0efdb05014dcaaf4d9d8ea4fab0",
      "parents": [
        "ef5ab89cf7edc2e2cb996d62201a2b356d5e9286"
      ],
      "author": {
        "name": "Bruce Allan",
        "email": "bruce.w.allan@intel.com",
        "time": "Fri Feb 25 07:09:37 2011 +0000"
      },
      "committer": {
        "name": "Jeff Kirsher",
        "email": "jeffrey.t.kirsher@intel.com",
        "time": "Fri Mar 11 01:52:40 2011 -0800"
      },
      "message": "e1000e: magic number cleanup - ETH_ALEN\n\nSigned-off-by: Bruce Allan \u003cbruce.w.allan@intel.com\u003e\nTested-by: Jeff Pieper \u003cjeffrey.e.pieper@intel.com\u003e\nSigned-off-by: Jeff Kirsher \u003cjeffrey.t.kirsher@intel.com\u003e\n"
    },
    {
      "commit": "ef5ab89cf7edc2e2cb996d62201a2b356d5e9286",
      "tree": "f61fe87f93fd32c03a2f53a78a41f68aff5df49b",
      "parents": [
        "23633b13ff7e1e1380bd2e11c49eb5ddbdf37ea9"
      ],
      "author": {
        "name": "Bruce Allan",
        "email": "bruce.w.allan@intel.com",
        "time": "Thu Feb 10 08:17:21 2011 +0000"
      },
      "committer": {
        "name": "Jeff Kirsher",
        "email": "jeffrey.t.kirsher@intel.com",
        "time": "Fri Mar 11 01:51:58 2011 -0800"
      },
      "message": "e1000e: use dev_kfree_skb_irq() instead of dev_kfree_skb()\n\nBased on a report and patch originally submitted by Prasanna Panchamukhi.\n\nUse dev_kfree_skb_irq() in e1000_clean_jumbo_rx_irq() since this latter\nfunction is called only in interrupt context.  This avoids \"Warning:\nkfree_skb on hard IRQ\" messages.\n\nCc: \"Prasanna S. Panchamukhi\" \u003cprasanna.panchamukhi@riverbed.com\u003e\nSigned-off-by: Bruce Allan \u003cbruce.w.allan@intel.com\u003e\nTested-by: Jeff Pieper \u003cjeffrey.e.pieper@intel.com\u003e\nSigned-off-by: Jeff Kirsher \u003cjeffrey.t.kirsher@intel.com\u003e\n"
    },
    {
      "commit": "23633b13ff7e1e1380bd2e11c49eb5ddbdf37ea9",
      "tree": "4aec4b7b045b31f93dc96393da66ab6190ef1228",
      "parents": [
        "e9bce845c0cee1a492e5cee6a827ae71140fe8b3"
      ],
      "author": {
        "name": "Lior Levy",
        "email": "lior.levy@intel.com",
        "time": "Wed Mar 02 06:42:37 2011 +0000"
      },
      "committer": {
        "name": "Jeff Kirsher",
        "email": "jeffrey.t.kirsher@intel.com",
        "time": "Fri Mar 11 01:38:57 2011 -0800"
      },
      "message": "ixgbevf: remove Tx hang detection\n\nRemoved Tx hang detection mechanism from ixgbevf.\nThis mechanism has no affect and can cause false alarm messages in some\ncases. Especially when VF Tx rate limit is turned on.\n\nThe same mechanism was removed recently from igbvf.\n\nSigned-off-by: Lior Levy \u003clior.levy@intel.com\u003e\nSigned-off-by: Jeff Kirsher \u003cjeffrey.t.kirsher@intel.com\u003e\n"
    },
    {
      "commit": "e9bce845c0cee1a492e5cee6a827ae71140fe8b3",
      "tree": "57cfe50f8aa501062ecb7cca694a74eba4797efa",
      "parents": [
        "e2444d92083cc1ceb07487425897d6d51a13e9dd"
      ],
      "author": {
        "name": "Yi Zou",
        "email": "yi.zou@intel.com",
        "time": "Wed Mar 09 08:48:03 2011 +0000"
      },
      "committer": {
        "name": "Jeff Kirsher",
        "email": "jeffrey.t.kirsher@intel.com",
        "time": "Fri Mar 11 01:17:50 2011 -0800"
      },
      "message": "net: add proper documentation for previously added net_device_ops for FCoE\n\nAdd proper documentation for previously added net_device_ops ops for FCoE.\n\nSigned-off-by: Yi Zou \u003cyi.zou@intel.com\u003e\nSigned-off-by: Jeff Kirsher \u003cjeffrey.t.kirsher@intel.com\u003e\n"
    },
    {
      "commit": "e2444d92083cc1ceb07487425897d6d51a13e9dd",
      "tree": "0ef862edfb70906a0bedafd599943645303c3692",
      "parents": [
        "1b7fe59322bef9e7a2c05b64a07a66b875299736"
      ],
      "author": {
        "name": "Emil Tantilov",
        "email": "emil.s.tantilov@intel.com",
        "time": "Thu Jan 27 09:14:18 2011 +0000"
      },
      "committer": {
        "name": "Jeff Kirsher",
        "email": "jeffrey.t.kirsher@intel.com",
        "time": "Fri Mar 11 01:16:23 2011 -0800"
      },
      "message": "ixgb: convert to new VLAN model\n\nBased on a patch from Jesse Gross \u003cjesse@nicira.com\u003e\n\nThis switches the ixgb driver to use the new VLAN interfaces.\nIn doing this, it completes the work begun in\nae54496f9e8d40c89e5668205c181dccfa9ecda1 allowing the use of\nhardware VLAN insertion without having a VLAN group configured.\n\nCC: Jesse Gross \u003cjesse@nicira.com\u003e\nSigned-off-by: Emil Tantilov \u003cemil.s.tantilov@intel.com\u003e\nTested-by: Jeff Pieper \u003cjeffrey.e.pieper@intel.com\u003e\nSigned-off-by: Jeff Kirsher \u003cjeffrey.t.kirsher@intel.com\u003e\n"
    },
    {
      "commit": "1b7fe59322bef9e7a2c05b64a07a66b875299736",
      "tree": "1e3a1ca9931e41a7bf6bdec0ddbabe1f6c466b02",
      "parents": [
        "ff3fccb3d05756ec9fb44350b059d31a5e8e0fdc"
      ],
      "author": {
        "name": "David S. Miller",
        "email": "davem@davemloft.net",
        "time": "Thu Mar 10 17:01:16 2011 -0800"
      },
      "committer": {
        "name": "David S. Miller",
        "email": "davem@davemloft.net",
        "time": "Thu Mar 10 17:03:45 2011 -0800"
      },
      "message": "ipv4: Kill flowi arg to fib_select_multipath()\n\nCompletely unused.\n\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n"
    },
    {
      "commit": "ff3fccb3d05756ec9fb44350b059d31a5e8e0fdc",
      "tree": "a1b7f7d24e90ebc0f057843df9bd65bbd435a880",
      "parents": [
        "dbdd9a52e38a4a93adfa4d0278801cce4fad98eb"
      ],
      "author": {
        "name": "David S. Miller",
        "email": "davem@davemloft.net",
        "time": "Thu Mar 10 16:23:24 2011 -0800"
      },
      "committer": {
        "name": "David S. Miller",
        "email": "davem@davemloft.net",
        "time": "Thu Mar 10 17:01:01 2011 -0800"
      },
      "message": "ipv4: Remove unnecessary test from ip_mkroute_input()\n\nfl-\u003eoif will always be zero on the input path, so there is no reason\nto test for that.\n\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n"
    },
    {
      "commit": "dbdd9a52e38a4a93adfa4d0278801cce4fad98eb",
      "tree": "a223ba84f33976b0d2c17d3177cbe976a3c948fc",
      "parents": [
        "33175d84ee3fa29991adb80513683e010769e807"
      ],
      "author": {
        "name": "David S. Miller",
        "email": "davem@davemloft.net",
        "time": "Thu Mar 10 16:34:38 2011 -0800"
      },
      "committer": {
        "name": "David S. Miller",
        "email": "davem@davemloft.net",
        "time": "Thu Mar 10 16:37:26 2011 -0800"
      },
      "message": "ipv4: Remove redundant RCU locking in ip_check_mc().\n\nAll callers are under rcu_read_lock() protection already.\n\nRename to ip_check_mc_rcu() to make it even more clear.\n\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n"
    },
    {
      "commit": "33175d84ee3fa29991adb80513683e010769e807",
      "tree": "3731f61cf82451b6892cf1368701e57e35d92908",
      "parents": [
        "c5908939b2738bafe1b309bc2465cb9f2e6184c5",
        "6dfbd87a20a737641ef228230c77f4262434fa24"
      ],
      "author": {
        "name": "David S. Miller",
        "email": "davem@davemloft.net",
        "time": "Thu Mar 10 14:26:00 2011 -0800"
      },
      "committer": {
        "name": "David S. Miller",
        "email": "davem@davemloft.net",
        "time": "Thu Mar 10 14:26:00 2011 -0800"
      },
      "message": "Merge branch \u0027master\u0027 of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6\n\nConflicts:\n\tdrivers/net/bnx2x/bnx2x_cmn.c\n"
    },
    {
      "commit": "6dfbd87a20a737641ef228230c77f4262434fa24",
      "tree": "0ebffefdd7ded0a2919426c0b7b87bc63f3d321e",
      "parents": [
        "bef6e7e76868ab454d5e83635a4a7a1961c74fb5"
      ],
      "author": {
        "name": "stephen hemminger",
        "email": "shemminger@vyatta.com",
        "time": "Thu Mar 10 11:43:19 2011 +0000"
      },
      "committer": {
        "name": "David S. Miller",
        "email": "davem@davemloft.net",
        "time": "Thu Mar 10 14:18:48 2011 -0800"
      },
      "message": "ip6ip6: autoload ip6 tunnel\n\nAdd necessary alias to autoload ip6ip6 tunnel module.\n\nSigned-off-by: Stephen Hemminger \u003cshemminger@vyatta.com\u003e\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n"
    },
    {
      "commit": "bef6e7e76868ab454d5e83635a4a7a1961c74fb5",
      "tree": "1a7417b9dde942cc71f87c02688c6ac6b0e57a72",
      "parents": [
        "dcbcdf22f500ac6e4ec06485341024739b9dc241",
        "9179746652faf0aba07b8b7f770dcf29892a24c6"
      ],
      "author": {
        "name": "David S. Miller",
        "email": "davem@davemloft.net",
        "time": "Thu Mar 10 14:00:44 2011 -0800"
      },
      "committer": {
        "name": "David S. Miller",
        "email": "davem@davemloft.net",
        "time": "Thu Mar 10 14:00:44 2011 -0800"
      },
      "message": "Merge branch \u0027master\u0027 of /home/davem/src/GIT/linux-2.6/\n"
    },
    {
      "commit": "dcbcdf22f500ac6e4ec06485341024739b9dc241",
      "tree": "71492abd2ba95b51fb0d20e63e0164eb6c3f7a49",
      "parents": [
        "7343ff31ebf01691ea4515d3126467434b9d22d6"
      ],
      "author": {
        "name": "Randy Dunlap",
        "email": "randy.dunlap@oracle.com",
        "time": "Thu Mar 10 13:45:57 2011 -0800"
      },
      "committer": {
        "name": "David S. Miller",
        "email": "davem@davemloft.net",
        "time": "Thu Mar 10 13:45:57 2011 -0800"
      },
      "message": "net: bridge builtin vs. ipv6 modular\n\nWhen configs BRIDGE\u003dy and IPV6\u003dm, this build error occurs:\n\nbr_multicast.c:(.text+0xa3341): undefined reference to `ipv6_dev_get_saddr\u0027\n\nBRIDGE_IGMP_SNOOPING is boolean; if it were tristate, then adding\n\tdepends on IPV6 || IPV6\u003dn\nto BRIDGE_IGMP_SNOOPING would be a good fix.  As it is currently,\nmaking BRIDGE depend on the IPV6 config works.\n\nReported-by: Patrick Schaaf \u003cnetdev@bof.de\u003e\nSigned-off-by: Randy Dunlap \u003crandy.dunlap@oracle.com\u003e\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n"
    },
    {
      "commit": "9179746652faf0aba07b8b7f770dcf29892a24c6",
      "tree": "1e672acf04da22aafce3d1790d76eef4eaeb435b",
      "parents": [
        "4c418ba9695a24917a1fcfa48f7db3fd76337eb7",
        "a4e36e60a6f62db6282e718cc228bde1a4e31eba"
      ],
      "author": {
        "name": "Linus Torvalds",
        "email": "torvalds@linux-foundation.org",
        "time": "Thu Mar 10 13:22:10 2011 -0800"
      },
      "committer": {
        "name": "Linus Torvalds",
        "email": "torvalds@linux-foundation.org",
        "time": "Thu Mar 10 13:22:10 2011 -0800"
      },
      "message": "Merge branch \u0027media_fixes\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/mchehab/linux-2.6\n\n* \u0027media_fixes\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/mchehab/linux-2.6:\n  [media] mantis_pci: remove asm/pgtable.h include\n  [media] tda829x: fix regression in probe functions\n  [media] mceusb: don\u0027t claim multifunction device non-IR parts\n  [media] nuvoton-cir: fix wake from suspend\n  [media] cx18: Add support for Hauppauge HVR-1600 models with s5h1411\n  [media] ivtv: Fix corrective action taken upon DMA ERR interrupt to avoid hang\n  [media] cx25840: fix probing of cx2583x chips\n  [media] cx23885: Remove unused \u0027err:\u0027 labels to quiet compiler warning\n  [media] cx23885: Revert \"Check for slave nack on all transactions\"\n  [media] DiB7000M: add pid filtering\n  [media] Fix sysfs rc protocol lookup for rc-5-sz\n  [media] au0828: fix VBI handling when in V4L2 streaming mode\n  [media] ir-raw: Properly initialize the IR event (BZ#27202)\n  [media] s2255drv: firmware re-loading changes\n  [media] Fix double free of video_device in mem2mem_testdev\n  [media] DM04/QQBOX memcpy to const char fix\n"
    },
    {
      "commit": "4c418ba9695a24917a1fcfa48f7db3fd76337eb7",
      "tree": "7a8704fb09901f51f3e9dd8ea55930bfd5ca92ed",
      "parents": [
        "4afcc10a65bb1f30c4fa1dec2634df74160a8054"
      ],
      "author": {
        "name": "Doe, YiCheng",
        "email": "yicheng.doe@hp.com",
        "time": "Thu Mar 10 14:00:21 2011 -0600"
      },
      "committer": {
        "name": "Linus Torvalds",
        "email": "torvalds@linux-foundation.org",
        "time": "Thu Mar 10 13:21:16 2011 -0800"
      },
      "message": "ipmi: Fix IPMI errors due to timing problems\n\nThis patch fixes an issue in OpenIPMI module where sometimes an ABORT command\nis sent after sending an IPMI request to BMC causing the IPMI request to fail.\n\nSigned-off-by: YiCheng Doe \u003cyicheng.doe@hp.com\u003e\nSigned-off-by: Corey Minyard \u003ccminyard@mvista.com\u003e\nAcked-by: Tom Mingarelli \u003cthomas.mingarelli@hp.com\u003e\nTested-by: Andy Cress \u003candy.cress@us.kontron.com\u003e\nTested-by: Mika Lansirine \u003cMika.Lansirinne@stonesoft.com\u003e\nTested-by: Brian De Wolf \u003cbldewolf@csupomona.edu\u003e\nCc: Jean Michel Audet \u003cJean-Michel.Audet@ca.Kontron.com\u003e\nCc: Jozef Sudelsky \u003cjozef.sudolsky@elbiahosting.sk\u003e\nAcked-by: Matthew Garrett \u003cmjg@redhat.com\u003e\nSigned-off-by: Linus Torvalds \u003ctorvalds@linux-foundation.org\u003e\n"
    },
    {
      "commit": "4afcc10a65bb1f30c4fa1dec2634df74160a8054",
      "tree": "daeb6aefe8f60a717cdf50648e7a2a7eac89d4f8",
      "parents": [
        "b5562c9a55996735e219b154c1e0f19ec10ce67a",
        "d891eedbc3b1b0fade8a9ce60cc0eba1cccb59e5"
      ],
      "author": {
        "name": "Linus Torvalds",
        "email": "torvalds@linux-foundation.org",
        "time": "Thu Mar 10 13:16:01 2011 -0800"
      },
      "committer": {
        "name": "Linus Torvalds",
        "email": "torvalds@linux-foundation.org",
        "time": "Thu Mar 10 13:16:01 2011 -0800"
      },
      "message": "Merge branch \u0027for-linus\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs-2.6\n\n* \u0027for-linus\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs-2.6:\n  fs/dcache: allow d_obtain_alias() to return unhashed dentries\n  Check for immutable/append flag in fallocate path\n  sysctl: the include of rcupdate.h is only needed in the kernel\n  fat: fix d_revalidate oopsen on NFS exports\n  jfs: fix d_revalidate oopsen on NFS exports\n  ocfs2: fix d_revalidate oopsen on NFS exports\n  gfs2: fix d_revalidate oopsen on NFS exports\n  fuse: fix d_revalidate oopsen on NFS exports\n  ceph: fix d_revalidate oopsen on NFS exports\n  reiserfs xattr -\u003ed_revalidate() shouldn\u0027t care about RCU\n  /proc/self is never going to be invalidated...\n"
    },
    {
      "commit": "b5562c9a55996735e219b154c1e0f19ec10ce67a",
      "tree": "8bf5206f70ed428b22e6dd4541c46e7a549a438b",
      "parents": [
        "bf98f77888c92fa3aeb28791ba3b5c30675076f3",
        "5471262290a6695b3300903267e0a2584f721000"
      ],
      "author": {
        "name": "Linus Torvalds",
        "email": "torvalds@linux-foundation.org",
        "time": "Thu Mar 10 13:09:26 2011 -0800"
      },
      "committer": {
        "name": "Linus Torvalds",
        "email": "torvalds@linux-foundation.org",
        "time": "Thu Mar 10 13:09:26 2011 -0800"
      },
      "message": "Merge branch \u0027x86-fixes-for-linus\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip\n\n* \u0027x86-fixes-for-linus\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip:\n  x86, UV: Initialize the broadcast assist unit base destination node id properly\n  x86, numa: Fix numa_emulation code with memory-less node0\n  x86, build: Make sure mkpiggy fails on read error\n"
    },
    {
      "commit": "bf98f77888c92fa3aeb28791ba3b5c30675076f3",
      "tree": "88a25f66e0158028e5fa29d671ca4ec06283293f",
      "parents": [
        "d9597075fb6feb1b3dc71c352e334c5b0a37afde",
        "0c3b9168017cbad2c4af3dd65ec93fe646eeaa62"
      ],
      "author": {
        "name": "Linus Torvalds",
        "email": "torvalds@linux-foundation.org",
        "time": "Thu Mar 10 13:08:59 2011 -0800"
      },
      "committer": {
        "name": "Linus Torvalds",
        "email": "torvalds@linux-foundation.org",
        "time": "Thu Mar 10 13:08:59 2011 -0800"
      },
      "message": "Merge branch \u0027sched-fixes-for-linus\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip\n\n* \u0027sched-fixes-for-linus\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip:\n  sched: Fix sched rt group scheduling when hierachy is enabled\n"
    },
    {
      "commit": "d9597075fb6feb1b3dc71c352e334c5b0a37afde",
      "tree": "ee86d62282fe508c254f30ed26c3208482811a96",
      "parents": [
        "ba3820ade317ee36e496b9b40d2ec3987dd4aef0",
        "7ee235efe5f86f239ce73915fd2e15f4d14259c6"
      ],
      "author": {
        "name": "Linus Torvalds",
        "email": "torvalds@linux-foundation.org",
        "time": "Thu Mar 10 13:07:38 2011 -0800"
      },
      "committer": {
        "name": "Linus Torvalds",
        "email": "torvalds@linux-foundation.org",
        "time": "Thu Mar 10 13:07:38 2011 -0800"
      },
      "message": "Merge branch \u0027perf/urgent\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip\n\n* \u0027perf/urgent\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip:\n  perf symbols: Avoid resolving [kernel.kallsyms] to real path for buildid cache\n  perf symbols: Fix vmlinux path when not using --symfs\n"
    },
    {
      "commit": "ba3820ade317ee36e496b9b40d2ec3987dd4aef0",
      "tree": "be8082dc4aa46c14c231e7e3a5dc16f65da87d0d",
      "parents": [
        "35d34df711e8b44846e759d8cfddb4ec6877cccb"
      ],
      "author": {
        "name": "Takashi Iwai",
        "email": "tiwai@suse.de",
        "time": "Thu Mar 10 14:02:12 2011 +0100"
      },
      "committer": {
        "name": "Linus Torvalds",
        "email": "torvalds@linux-foundation.org",
        "time": "Thu Mar 10 13:06:57 2011 -0800"
      },
      "message": "drm/i915: Revive combination mode for backlight control\n\nThis reverts commit 951f3512dba5bd44cda3e5ee22b4b522e4bb09fb\n\n    drm/i915: Do not handle backlight combination mode specially\n\nsince this commit introduced other regressions due to untouched LBPC\nregister, e.g. the backlight dimmed after resume.\n\nIn addition to the revert, this patch includes a fix for the original\nissue (weird backlight levels) by removing the wrong bit shift for\ncomputing the current backlight level.\nAlso, including typo fixes (lpbc -\u003e lbpc).\n\nBugzilla: https://bugs.freedesktop.org/show_bug.cgi?id\u003d34524\nAcked-by: Indan Zupancic \u003cindan@nul.nu\u003e\nReviewed-by: Keith Packard \u003ckeithp@keithp.com\u003e\nReviewed-by: Jesse Barnes \u003cjbarnes@virtuousgeek.org\u003e\nCc: \u003cstable@kernel.org\u003e\nSigned-off-by: Takashi Iwai \u003ctiwai@suse.de\u003e\nSigned-off-by: Linus Torvalds \u003ctorvalds@linux-foundation.org\u003e\n"
    },
    {
      "commit": "d891eedbc3b1b0fade8a9ce60cc0eba1cccb59e5",
      "tree": "55dd6aa9e17cd763efda6291d740bafd7f05d802",
      "parents": [
        "1ca551c6caae7b52178555cdedea6ca26444be46"
      ],
      "author": {
        "name": "J. Bruce Fields",
        "email": "bfields@fieldses.org",
        "time": "Tue Jan 18 15:45:09 2011 -0500"
      },
      "committer": {
        "name": "Al Viro",
        "email": "viro@zeniv.linux.org.uk",
        "time": "Thu Mar 10 05:18:54 2011 -0500"
      },
      "message": "fs/dcache: allow d_obtain_alias() to return unhashed dentries\n\nWithout this patch, inodes are not promptly freed on last close of an\nunlinked file by an nfs client:\n\n\tclient$ mount -tnfs4 server:/export/ /mnt/\n\tclient$ tail -f /mnt/FOO\n\t...\n\tserver$ df -i /export\n\tserver$ rm /export/FOO\n\t(^C the tail -f)\n\tserver$ df -i /export\n\tserver$ echo 2 \u003e/proc/sys/vm/drop_caches\n\tserver$ df -i /export\n\nthe df\u0027s will show that the inode is not freed on the filesystem until\nthe last step, when it could have been freed after killing the client\u0027s\ntail -f. On-disk data won\u0027t be deallocated either, leading to possible\nspurious ENOSPC.\n\nThis occurs because when the client does the close, it arrives in a\ncompound with a putfh and a close, processed like:\n\n\t- putfh: look up the filehandle.  The only alias found for the\n\t  inode will be DCACHE_UNHASHED alias referenced by the filp\n\t  this, so it creates a new DCACHE_DISCONECTED dentry and\n\t  returns that instead.\n\t- close: closes the existing filp, which is destroyed\n\t  immediately by dput() since it\u0027s DCACHE_UNHASHED.\n\t- end of the compound: release the reference\n\t  to the current filehandle, and dput() the new\n\t  DCACHE_DISCONECTED dentry, which gets put on the\n\t  unused list instead of being destroyed immediately.\n\nNick Piggin suggested fixing this by allowing d_obtain_alias to return\nthe unhashed dentry that is referenced by the filp, instead of making it\ncreate a new dentry.\n\nLeave __d_find_alias() alone to avoid changing behavior of other\ncallers.\n\nAlso nfsd doesn\u0027t need all the checks of __d_find_alias(); any dentry,\nhashed or unhashed, disconnected or not, should work.\n\nSigned-off-by: J. Bruce Fields \u003cbfields@redhat.com\u003e\nSigned-off-by: Al Viro \u003cviro@zeniv.linux.org.uk\u003e\n"
    },
    {
      "commit": "c5908939b2738bafe1b309bc2465cb9f2e6184c5",
      "tree": "a5fc6b3fc3d0a79798185514e35a38c9cbb9edbc",
      "parents": [
        "e256f8a35179f3795a200912b79c369676ecb669"
      ],
      "author": {
        "name": "Matt Carlson",
        "email": "mcarlson@broadcom.com",
        "time": "Wed Mar 09 16:58:25 2011 +0000"
      },
      "committer": {
        "name": "David S. Miller",
        "email": "davem@davemloft.net",
        "time": "Thu Mar 10 01:56:14 2011 -0800"
      },
      "message": "tg3: Remove 5750 PCI code\n\nThe 5750 ASIC rev was never released as a PCI device.  It only exists as\na PCIe device.  This patch removes the code that supports the former\nconfiguration.\n\nSigned-off-by: Matt Carlson \u003cmcarlson@broadcom.com\u003e\nReviewed-by: Michael Chan \u003cmchan@broadcom.com\u003e\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n"
    },
    {
      "commit": "e256f8a35179f3795a200912b79c369676ecb669",
      "tree": "bd0d33470a32cbccfcc08a42b9185843f5241618",
      "parents": [
        "683644b74783725971e5ff61618bd932c5361c3f"
      ],
      "author": {
        "name": "Matt Carlson",
        "email": "mcarlson@broadcom.com",
        "time": "Wed Mar 09 16:58:24 2011 +0000"
      },
      "committer": {
        "name": "David S. Miller",
        "email": "davem@davemloft.net",
        "time": "Thu Mar 10 01:56:13 2011 -0800"
      },
      "message": "tg3: Move tg3_init_link_config to tg3_phy_probe\n\nThis patch moves the function that initializes the link configuration\ncloser to the place where the rest of the phy code is initialized.\n\nSigned-off-by: Matt Carlson \u003cmcarlson@broadcom.com\u003e\nReviewed-by: Michael Chan \u003cmchan@broadcom.com\u003e\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n"
    },
    {
      "commit": "683644b74783725971e5ff61618bd932c5361c3f",
      "tree": "cd38d85069a587c273fe14e20c0143a561811ee1",
      "parents": [
        "4143470c10ab5c2bbd0522efe92935416332c5e8"
      ],
      "author": {
        "name": "Matt Carlson",
        "email": "mcarlson@broadcom.com",
        "time": "Wed Mar 09 16:58:23 2011 +0000"
      },
      "committer": {
        "name": "David S. Miller",
        "email": "davem@davemloft.net",
        "time": "Thu Mar 10 01:56:13 2011 -0800"
      },
      "message": "tg3: Refine VAux decision process\n\nIn the near future, the VAux switching decision process is going to get\nmore complicated.  This patch refines and consolidates the existing\nalgorithm in anticipation of the new scheme.\n\nSigned-off-by: Matt Carlson \u003cmcarlson@broadcom.com\u003e\nReviewed-by: Michael Chan \u003cmchan@broadcom.com\u003e\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n"
    },
    {
      "commit": "4143470c10ab5c2bbd0522efe92935416332c5e8",
      "tree": "8b8db1af8e25ac73b36f995c17ff3e92815ca61b",
      "parents": [
        "d4894f3ea7375dd9492b5d3d2ecb0b6e4bdb604e"
      ],
      "author": {
        "name": "Matt Carlson",
        "email": "mcarlson@broadcom.com",
        "time": "Wed Mar 09 16:58:22 2011 +0000"
      },
      "committer": {
        "name": "David S. Miller",
        "email": "davem@davemloft.net",
        "time": "Thu Mar 10 01:56:12 2011 -0800"
      },
      "message": "tg3: cleanup pci device table vars\n\nCommit 895950c2a6565d9eefda4a38b00fa28537e39fcb, entitled\n\"tg3: Use DEFINE_PCI_DEVICE_TABLE\" moved two pci device tables into the\nglobal address space, but didn\u0027t declare them static and didn\u0027t prefix\nthem with \"tg3_\".  This patch fixes those problems.\n\nSigned-off-by: Matt Carlson \u003cmcarlson@broadcom.com\u003e\nReviewed-by: Michael Chan \u003cmchan@broadcom.com\u003e\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n"
    },
    {
      "commit": "d4894f3ea7375dd9492b5d3d2ecb0b6e4bdb604e",
      "tree": "a538179ac50d080a4240f7f9da77655d4b40160c",
      "parents": [
        "01c3a3920f9f78866420b2004602944fca45083a"
      ],
      "author": {
        "name": "Matt Carlson",
        "email": "mcarlson@broadcom.com",
        "time": "Wed Mar 09 16:58:21 2011 +0000"
      },
      "committer": {
        "name": "David S. Miller",
        "email": "davem@davemloft.net",
        "time": "Thu Mar 10 01:56:12 2011 -0800"
      },
      "message": "tg3: Add code to verify RODATA checksum of VPD\n\nThis patch adds code to verify the checksum stored in the \"RV\" info\nkeyword of the RODATA VPD section.\n\nSigned-off-by: Matt Carlson \u003cmcarlson@broadcom.com\u003e\nReviewed-by: Michael Chan \u003cmchan@broadcom.com\u003e\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n"
    },
    {
      "commit": "01c3a3920f9f78866420b2004602944fca45083a",
      "tree": "d7b8a9106ee61835510b09ce66b3e705df7df487",
      "parents": [
        "bb18bb942a31411954021ad036ca7bace642c3c0"
      ],
      "author": {
        "name": "Matt Carlson",
        "email": "mcarlson@broadcom.com",
        "time": "Wed Mar 09 16:58:20 2011 +0000"
      },
      "committer": {
        "name": "David S. Miller",
        "email": "davem@davemloft.net",
        "time": "Thu Mar 10 01:56:11 2011 -0800"
      },
      "message": "tg3: Fix NVRAM selftest\n\nThe tg3 NVRAM selftest actually fails when validating the checksum of\nthe legacy NVRAM format.  However, the test still reported success\nbecause the last update of the return code was a success from the NVRAM\nreads.  This patch fixes the code so that the error return code defaults\nto a failure status.  Then the patch fixes the reason why the checsum\nvalidation failed.\n\nSigned-off-by: Matt Carlson \u003cmcarlson@broadcom.com\u003e\nReviewed-by: Michael Chan \u003cmchan@broadcom.com\u003e\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n"
    },
    {
      "commit": "bb18bb942a31411954021ad036ca7bace642c3c0",
      "tree": "1b50dd35cb678248f3f95abe3c811c255d95b40c",
      "parents": [
        "a252bebe22155313ccdadc20b79f67a239dc9ecb"
      ],
      "author": {
        "name": "Matt Carlson",
        "email": "mcarlson@broadcom.com",
        "time": "Wed Mar 09 16:58:19 2011 +0000"
      },
      "committer": {
        "name": "David S. Miller",
        "email": "davem@davemloft.net",
        "time": "Thu Mar 10 01:56:11 2011 -0800"
      },
      "message": "tg3: Add missed 5719 workaround change\n\nCommit 2866d956fe0ad8fc8d8a7c54104ccc879b49406d, entitled\n\"tg3: Expand 5719 workaround\" extended a 5719 A0 workaround to all\nrevisions of the chip.  There was a change that should have been a\npart of that patch that was missed.  This patch adds the missing\npiece.\n\nSigned-off-by: Matt Carlson \u003cmcarlson@broadcom.com\u003e\nReviewed-by: Michael Chan \u003cmchan@broadcom.com\u003e\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n"
    },
    {
      "commit": "1ca551c6caae7b52178555cdedea6ca26444be46",
      "tree": "cbe1a838712a092f7abe49920a09188ec2403578",
      "parents": [
        "991ac30d8b30ab6051dff5a7b07d84e6f5efa3a6"
      ],
      "author": {
        "name": "Marco Stornelli",
        "email": "marco.stornelli@gmail.com",
        "time": "Sat Mar 05 11:10:19 2011 +0100"
      },
      "committer": {
        "name": "Al Viro",
        "email": "viro@zeniv.linux.org.uk",
        "time": "Thu Mar 10 04:22:15 2011 -0500"
      },
      "message": "Check for immutable/append flag in fallocate path\n\nIn the fallocate path the kernel doesn\u0027t check for the immutable/append\nflag. It\u0027s possible to have a race condition in this scenario: an\napplication open a file in read/write and it does something, meanwhile\nroot set the immutable flag on the file, the application at that point\ncan call fallocate with success. In addition, we don\u0027t allow to do any\nunreserve operation on an append only file but only the reserve one.\n\nSigned-off-by: Marco Stornelli \u003cmarco.stornelli@gmail.com\u003e\nSigned-off-by: Al Viro \u003cviro@zeniv.linux.org.uk\u003e\n"
    },
    {
      "commit": "991ac30d8b30ab6051dff5a7b07d84e6f5efa3a6",
      "tree": "9a7bdd23fe3fa8bc4fc345e43aa393e1c821686b",
      "parents": [
        "9177ada99d5e69fe91950b3ef5c23f2bcd109987"
      ],
      "author": {
        "name": "Stephen Rothwell",
        "email": "sfr@canb.auug.org.au",
        "time": "Thu Mar 10 11:25:43 2011 +1100"
      },
      "committer": {
        "name": "Al Viro",
        "email": "viro@zeniv.linux.org.uk",
        "time": "Thu Mar 10 04:19:56 2011 -0500"
      },
      "message": "sysctl: the include of rcupdate.h is only needed in the kernel\n\nFixes this built error:\n\ninclude/linux/sysctl.h:28: included file \u0027linux/rcupdate.h\u0027 is not exported\n\nSigned-off-by: Stephen Rothwell \u003csfr@canb.auug.org.au\u003e\nAcked-by: Al Viro \u003cviro@zeniv.linux.org.uk\u003e\nSigned-off-by: Al Viro \u003cviro@zeniv.linux.org.uk\u003e\n"
    },
    {
      "commit": "9177ada99d5e69fe91950b3ef5c23f2bcd109987",
      "tree": "4de42636f1c2dd2f6a230d48c6c5ef507026ec7c",
      "parents": [
        "8ce84eeb5b40da21f20174dd25891a8409534237"
      ],
      "author": {
        "name": "Al Viro",
        "email": "viro@zeniv.linux.org.uk",
        "time": "Thu Mar 10 03:45:49 2011 -0500"
      },
      "committer": {
        "name": "Al Viro",
        "email": "viro@zeniv.linux.org.uk",
        "time": "Thu Mar 10 03:45:49 2011 -0500"
      },
      "message": "fat: fix d_revalidate oopsen on NFS exports\n\ncan\u0027t blindly check nd-\u003eflags in -\u003ed_revalidate()\n\nSigned-off-by: Al Viro \u003cviro@zeniv.linux.org.uk\u003e\n"
    },
    {
      "commit": "8ce84eeb5b40da21f20174dd25891a8409534237",
      "tree": "a375dc92bc563655976d90ccfa6d794ab551f47a",
      "parents": [
        "4714e63731a8a641b5e0ed5e2e2191c13bf2d71a"
      ],
      "author": {
        "name": "Al Viro",
        "email": "viro@zeniv.linux.org.uk",
        "time": "Thu Mar 10 03:45:28 2011 -0500"
      },
      "committer": {
        "name": "Al Viro",
        "email": "viro@zeniv.linux.org.uk",
        "time": "Thu Mar 10 03:45:28 2011 -0500"
      },
      "message": "jfs: fix d_revalidate oopsen on NFS exports\n\ncan\u0027t blindly check nd-\u003eflags in -\u003ed_revalidate()\n\nSigned-off-by: Al Viro \u003cviro@zeniv.linux.org.uk\u003e\n"
    },
    {
      "commit": "4714e63731a8a641b5e0ed5e2e2191c13bf2d71a",
      "tree": "b857a67b96e602835db64abd1e883c16691e5921",
      "parents": [
        "53fe924161ff18d24c5c1c256549e9c1b9874827"
      ],
      "author": {
        "name": "Al Viro",
        "email": "viro@zeniv.linux.org.uk",
        "time": "Thu Mar 10 03:45:07 2011 -0500"
      },
      "committer": {
        "name": "Al Viro",
        "email": "viro@zeniv.linux.org.uk",
        "time": "Thu Mar 10 03:45:07 2011 -0500"
      },
      "message": "ocfs2: fix d_revalidate oopsen on NFS exports\n\ncan\u0027t blindly check nd-\u003eflags in -\u003ed_revalidate()\n\nSigned-off-by: Al Viro \u003cviro@zeniv.linux.org.uk\u003e\n"
    },
    {
      "commit": "53fe924161ff18d24c5c1c256549e9c1b9874827",
      "tree": "4447ddc370f8138952146e54c515675cc026a2ee",
      "parents": [
        "529c5f958f9e60abaa7407986034b17d17536bf2"
      ],
      "author": {
        "name": "Al Viro",
        "email": "viro@zeniv.linux.org.uk",
        "time": "Thu Mar 10 03:44:48 2011 -0500"
      },
      "committer": {
        "name": "Al Viro",
        "email": "viro@zeniv.linux.org.uk",
        "time": "Thu Mar 10 03:44:48 2011 -0500"
      },
      "message": "gfs2: fix d_revalidate oopsen on NFS exports\n\ncan\u0027t blindly check nd-\u003eflags in -\u003ed_revalidate()\n\nSigned-off-by: Al Viro \u003cviro@zeniv.linux.org.uk\u003e\n"
    },
    {
      "commit": "529c5f958f9e60abaa7407986034b17d17536bf2",
      "tree": "3e946687f07c6738b9695224fd6492ceb8236e1e",
      "parents": [
        "0eb980e31770cfeff6e27760b4692d595b8dbf28"
      ],
      "author": {
        "name": "Al Viro",
        "email": "viro@zeniv.linux.org.uk",
        "time": "Thu Mar 10 03:44:31 2011 -0500"
      },
      "committer": {
        "name": "Al Viro",
        "email": "viro@zeniv.linux.org.uk",
        "time": "Thu Mar 10 03:44:31 2011 -0500"
      },
      "message": "fuse: fix d_revalidate oopsen on NFS exports\n\ncan\u0027t blindly check nd-\u003eflags in -\u003ed_revalidate()\n\nSigned-off-by: Al Viro \u003cviro@zeniv.linux.org.uk\u003e\n"
    },
    {
      "commit": "0eb980e31770cfeff6e27760b4692d595b8dbf28",
      "tree": "62ce6d994beb41f1276169de643ebc9e343daeaa",
      "parents": [
        "c78f4cc5e7d642c7009089817c12d8984e7ba872"
      ],
      "author": {
        "name": "Al Viro",
        "email": "viro@zeniv.linux.org.uk",
        "time": "Thu Mar 10 03:44:05 2011 -0500"
      },
      "committer": {
        "name": "Al Viro",
        "email": "viro@zeniv.linux.org.uk",
        "time": "Thu Mar 10 03:44:05 2011 -0500"
      },
      "message": "ceph: fix d_revalidate oopsen on NFS exports\n\ncan\u0027t blindly check nd-\u003eflags in -\u003ed_revalidate()\n\nSigned-off-by: Al Viro \u003cviro@zeniv.linux.org.uk\u003e\n"
    },
    {
      "commit": "c78f4cc5e7d642c7009089817c12d8984e7ba872",
      "tree": "15fec47edc3e047865e98b5f8c233b1d8d2e063a",
      "parents": [
        "ae50adcb0ac4cde67a7aec8ae67249d1b2be2948"
      ],
      "author": {
        "name": "Al Viro",
        "email": "viro@zeniv.linux.org.uk",
        "time": "Wed Feb 16 10:14:56 2011 -0500"
      },
      "committer": {
        "name": "Al Viro",
        "email": "viro@zeniv.linux.org.uk",
        "time": "Thu Mar 10 03:42:01 2011 -0500"
      },
      "message": "reiserfs xattr -\u003ed_revalidate() shouldn\u0027t care about RCU\n\n... it returns an error unconditionally\n\nSigned-off-by: Al Viro \u003cviro@zeniv.linux.org.uk\u003e\n"
    },
    {
      "commit": "ae50adcb0ac4cde67a7aec8ae67249d1b2be2948",
      "tree": "757ea609da68ae08471bc2d0f689aa287ee89cbf",
      "parents": [
        "3979491701cfb2aa7477f5baf40553355391418b"
      ],
      "author": {
        "name": "Al Viro",
        "email": "viro@zeniv.linux.org.uk",
        "time": "Wed Feb 16 10:04:50 2011 -0500"
      },
      "committer": {
        "name": "Al Viro",
        "email": "viro@zeniv.linux.org.uk",
        "time": "Thu Mar 10 03:41:53 2011 -0500"
      },
      "message": "/proc/self is never going to be invalidated...\n\nSigned-off-by: Al Viro \u003cviro@zeniv.linux.org.uk\u003e\n"
    },
    {
      "commit": "a252bebe22155313ccdadc20b79f67a239dc9ecb",
      "tree": "d0563c42cfa57029e3020fdae5afb458c9673dae",
      "parents": [
        "cc7e17ea0427a5df319e43606a3d6c53b13a6e9c"
      ],
      "author": {
        "name": "Stephen Hemminger",
        "email": "shemminger@vyatta.com",
        "time": "Thu Mar 10 00:40:17 2011 -0800"
      },
      "committer": {
        "name": "David S. Miller",
        "email": "davem@davemloft.net",
        "time": "Thu Mar 10 00:40:17 2011 -0800"
      },
      "message": "tcp: mark tcp_congestion_ops read_mostly\n\nSigned-off-by: Stephen Hemminger \u003cshemminger@vyatta.com\u003e\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n"
    },
    {
      "commit": "cc7e17ea0427a5df319e43606a3d6c53b13a6e9c",
      "tree": "3a4030df19e212619ce4437c2100a23a35e759dd",
      "parents": [
        "67e28ffd864eebbaf48b404d0a8cb4edd2bdc924"
      ],
      "author": {
        "name": "David S. Miller",
        "email": "davem@davemloft.net",
        "time": "Wed Mar 09 20:57:50 2011 -0800"
      },
      "committer": {
        "name": "David S. Miller",
        "email": "davem@davemloft.net",
        "time": "Wed Mar 09 20:57:50 2011 -0800"
      },
      "message": "ipv4: Optimize flow initialization in fib_validate_source().\n\nLike in commit 44713b67db10c774f14280c129b0d5fd13c70cf2\n(\"ipv4: Optimize flow initialization in output route lookup.\"\nwe can optimize the on-stack flow setup to only initialize\nthe members which are actually used.\n\nOtherwise we bzero the entire structure, then initialize\nexplicitly the first half of it.\n\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n"
    },
    {
      "commit": "67e28ffd864eebbaf48b404d0a8cb4edd2bdc924",
      "tree": "acd2328f3d45db16b45841e796c23815570748f6",
      "parents": [
        "2f4e1b3970973bbb57cc3a3b9d67e67c1c648c37"
      ],
      "author": {
        "name": "David S. Miller",
        "email": "davem@davemloft.net",
        "time": "Wed Mar 09 20:42:07 2011 -0800"
      },
      "committer": {
        "name": "David S. Miller",
        "email": "davem@davemloft.net",
        "time": "Wed Mar 09 20:42:07 2011 -0800"
      },
      "message": "ipv4: Optimize flow initialization in input route lookup.\n\nLike in commit 44713b67db10c774f14280c129b0d5fd13c70cf2\n(\"ipv4: Optimize flow initialization in output route lookup.\"\nwe can optimize the on-stack flow setup to only initialize\nthe members which are actually used.\n\nOtherwise we bzero the entire structure, then initialize\nexplicitly the first half of it.\n\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n"
    },
    {
      "commit": "7343ff31ebf01691ea4515d3126467434b9d22d6",
      "tree": "13c8180b8aeb82363c1e7b576372c23fa2d5f955",
      "parents": [
        "03a14ab134f4811ab1475f07b1305ccaf38b690f"
      ],
      "author": {
        "name": "David S. Miller",
        "email": "davem@davemloft.net",
        "time": "Wed Mar 09 19:55:25 2011 -0800"
      },
      "committer": {
        "name": "David S. Miller",
        "email": "davem@davemloft.net",
        "time": "Wed Mar 09 19:55:25 2011 -0800"
      },
      "message": "ipv6: Don\u0027t create clones of host routes.\n\nAddresses https://bugzilla.kernel.org/show_bug.cgi?id\u003d29252\nAddresses https://bugzilla.kernel.org/show_bug.cgi?id\u003d30462\n\nIn commit d80bc0fd262ef840ed4e82593ad6416fa1ba3fc4 (\"ipv6: Always\nclone offlink routes.\") we forced the kernel to always clone offlink\nroutes.\n\nThe reason we do that is to make sure we never bind an inetpeer to a\nprefixed route.\n\nThe logic turned on here has existed in the tree for many years,\nbut was always off due to a protecting CPP define.  So perhaps\nit\u0027s no surprise that there is a logic bug here.\n\nThe problem is that we canot clone a route that is already a\nhost route (ie. has DST_HOST set).  Because if we do, an identical\nentry already exists in the routing tree and therefore the\nip6_rt_ins() call is going to fail.\n\nThis sets off a series of failures and high cpu usage, because when\nip6_rt_ins() fails we loop retrying this operation a few times in\norder to handle a race between two threads trying to clone and insert\nthe same host route at the same time.\n\nFix this by simply using the route as-is when DST_HOST is set.\n\nReported-by: slash@ac.auone-net.jp\nReported-by: Ernst Sjöstrand \u003cernstp@gmail.com\u003e\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n"
    },
    {
      "commit": "35d34df711e8b44846e759d8cfddb4ec6877cccb",
      "tree": "6ee37bcc2594add1050a77fdb272eda4414fe6c8",
      "parents": [
        "ab02a9540541dd7b2012f32f5e311c3cbd772387",
        "36e8695ca5dcf48c837a6efe6f780c47ac9ec808"
      ],
      "author": {
        "name": "Linus Torvalds",
        "email": "torvalds@linux-foundation.org",
        "time": "Wed Mar 09 16:46:06 2011 -0800"
      },
      "committer": {
        "name": "Linus Torvalds",
        "email": "torvalds@linux-foundation.org",
        "time": "Wed Mar 09 16:46:06 2011 -0800"
      },
      "message": "Merge branch \u0027merge\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/benh/powerpc\n\n* \u0027merge\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/benh/powerpc:\n  powerpc/pseries: Disable VPNH feature\n  powerpc/iseries: Fix early init access to lppaca\n"
    },
    {
      "commit": "ab02a9540541dd7b2012f32f5e311c3cbd772387",
      "tree": "47b2795e160b0f095840ded0bb7f4c7af237eb41",
      "parents": [
        "684adca4f84365ca327e06dba696b62de7a79eca",
        "8909c9ad8ff03611c9c96c9a92656213e4bb495b"
      ],
      "author": {
        "name": "Linus Torvalds",
        "email": "torvalds@linux-foundation.org",
        "time": "Wed Mar 09 16:45:02 2011 -0800"
      },
      "committer": {
        "name": "Linus Torvalds",
        "email": "torvalds@linux-foundation.org",
        "time": "Wed Mar 09 16:45:02 2011 -0800"
      },
      "message": "Merge branch \u0027for-linus\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/jmorris/security-testing-2.6\n\n* \u0027for-linus\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/jmorris/security-testing-2.6:\n  net: don\u0027t allow CAP_NET_ADMIN to load non-netdev kernel modules\n"
    },
    {
      "commit": "684adca4f84365ca327e06dba696b62de7a79eca",
      "tree": "a6ca09edf0ab8c99158cc25a94c2cbbe34916c5a",
      "parents": [
        "3979491701cfb2aa7477f5baf40553355391418b"
      ],
      "author": {
        "name": "Stephen Rothwell",
        "email": "sfr@canb.auug.org.au",
        "time": "Thu Mar 10 11:14:17 2011 +1100"
      },
      "committer": {
        "name": "Linus Torvalds",
        "email": "torvalds@linux-foundation.org",
        "time": "Wed Mar 09 16:43:24 2011 -0800"
      },
      "message": "sysctl: the include of rcupdate.h is only needed in the kernel\n\nFixes this build-check error:\n\n  include/linux/sysctl.h:28: included file \u0027linux/rcupdate.h\u0027 is not exported\n\nSigned-off-by: Stephen Rothwell \u003csfr@canb.auug.org.au\u003e\nSigned-off-by: Linus Torvalds \u003ctorvalds@linux-foundation.org\u003e\n"
    },
    {
      "commit": "8909c9ad8ff03611c9c96c9a92656213e4bb495b",
      "tree": "10b023c05503a9f6a165a23b8e65d8f3e70fd42d",
      "parents": [
        "a5abba989deceb731047425812d268daf7536575"
      ],
      "author": {
        "name": "Vasiliy Kulikov",
        "email": "segoon@openwall.com",
        "time": "Wed Mar 02 00:33:13 2011 +0300"
      },
      "committer": {
        "name": "James Morris",
        "email": "jmorris@namei.org",
        "time": "Thu Mar 10 10:25:19 2011 +1100"
      },
      "message": "net: don\u0027t allow CAP_NET_ADMIN to load non-netdev kernel modules\n\nSince a8f80e8ff94ecba629542d9b4b5f5a8ee3eb565c any process with\nCAP_NET_ADMIN may load any module from /lib/modules/.  This doesn\u0027t mean\nthat CAP_NET_ADMIN is a superset of CAP_SYS_MODULE as modules are\nlimited to /lib/modules/**.  However, CAP_NET_ADMIN capability shouldn\u0027t\nallow anybody load any module not related to networking.\n\nThis patch restricts an ability of autoloading modules to netdev modules\nwith explicit aliases.  This fixes CVE-2011-1019.\n\nArnd Bergmann suggested to leave untouched the old pre-v2.6.32 behavior\nof loading netdev modules by name (without any prefix) for processes\nwith CAP_SYS_MODULE to maintain the compatibility with network scripts\nthat use autoloading netdev modules by aliases like \"eth0\", \"wlan0\".\n\nCurrently there are only three users of the feature in the upstream\nkernel: ipip, ip_gre and sit.\n\n    root@albatros:~# capsh --drop\u003d$(seq -s, 0 11),$(seq -s, 13 34) --\n    root@albatros:~# grep Cap /proc/$$/status\n    CapInh:\t0000000000000000\n    CapPrm:\tfffffff800001000\n    CapEff:\tfffffff800001000\n    CapBnd:\tfffffff800001000\n    root@albatros:~# modprobe xfs\n    FATAL: Error inserting xfs\n    (/lib/modules/2.6.38-rc6-00001-g2bf4ca3/kernel/fs/xfs/xfs.ko): Operation not permitted\n    root@albatros:~# lsmod | grep xfs\n    root@albatros:~# ifconfig xfs\n    xfs: error fetching interface information: Device not found\n    root@albatros:~# lsmod | grep xfs\n    root@albatros:~# lsmod | grep sit\n    root@albatros:~# ifconfig sit\n    sit: error fetching interface information: Device not found\n    root@albatros:~# lsmod | grep sit\n    root@albatros:~# ifconfig sit0\n    sit0      Link encap:IPv6-in-IPv4\n\t      NOARP  MTU:1480  Metric:1\n\n    root@albatros:~# lsmod | grep sit\n    sit                    10457  0\n    tunnel4                 2957  1 sit\n\nFor CAP_SYS_MODULE module loading is still relaxed:\n\n    root@albatros:~# grep Cap /proc/$$/status\n    CapInh:\t0000000000000000\n    CapPrm:\tffffffffffffffff\n    CapEff:\tffffffffffffffff\n    CapBnd:\tffffffffffffffff\n    root@albatros:~# ifconfig xfs\n    xfs: error fetching interface information: Device not found\n    root@albatros:~# lsmod | grep xfs\n    xfs                   745319  0\n\nReference: https://lkml.org/lkml/2011/2/24/203\n\nSigned-off-by: Vasiliy Kulikov \u003csegoon@openwall.com\u003e\nSigned-off-by: Michael Tokarev \u003cmjt@tls.msk.ru\u003e\nAcked-by: David S. Miller \u003cdavem@davemloft.net\u003e\nAcked-by: Kees Cook \u003ckees.cook@canonical.com\u003e\nSigned-off-by: James Morris \u003cjmorris@namei.org\u003e\n"
    },
    {
      "commit": "36e8695ca5dcf48c837a6efe6f780c47ac9ec808",
      "tree": "8959a20737350fa91854c0f9d6dc1dda00aa5e79",
      "parents": [
        "f2f6dad6ca3b06ae35a2e7b63f38158242c01531"
      ],
      "author": {
        "name": "Benjamin Herrenschmidt",
        "email": "benh@kernel.crashing.org",
        "time": "Wed Mar 09 13:00:14 2011 +0000"
      },
      "committer": {
        "name": "Benjamin Herrenschmidt",
        "email": "benh@kernel.crashing.org",
        "time": "Thu Mar 10 10:06:41 2011 +1100"
      },
      "message": "powerpc/pseries: Disable VPNH feature\n\nThis feature triggers nasty races in the scheduler between the\nrebuilding of the topology and the load balancing code, causing\nthe machine to hang.\n\nDisable it for now until the races are fixed.\n\nSigned-off-by: Benjamin Herrenschmidt \u003cbenh@kernel.crashing.org\u003e\n"
    },
    {
      "commit": "f2f6dad6ca3b06ae35a2e7b63f38158242c01531",
      "tree": "50bc536dc5345d0d184e6dc5fbba2447c2ac101f",
      "parents": [
        "a5abba989deceb731047425812d268daf7536575"
      ],
      "author": {
        "name": "Benjamin Herrenschmidt",
        "email": "benh@kernel.crashing.org",
        "time": "Sun Mar 06 18:02:31 2011 +0000"
      },
      "committer": {
        "name": "Benjamin Herrenschmidt",
        "email": "benh@kernel.crashing.org",
        "time": "Thu Mar 10 10:06:02 2011 +1100"
      },
      "message": "powerpc/iseries: Fix early init access to lppaca\n\nThe combination of commit\n\n8154c5d22d91cd16bd9985b0638c8957e4688d0e and\n93c22703efa72c7527dbd586d1951c1f4a85fd70\n\nBroke boot on iSeries.\n\nThe problem is that iSeries very early boot code, which generates\nthe device-tree and runs before our normal early initializations\ndoes need access the lppaca\u0027s very early, before the PACA array is\ninitialized, and in fact even before the boot PACA has been\ninitialized (it contains all 0\u0027s at this stage).\n\nHowever, the first patch above makes that code use the new\nllpaca_of(cpu) accessor, which itself is changed by the second patch to\nuse the PACA array.\n\nWe fix that by reverting iSeries to directly dereferencing the array. In\naddition, we fix all iterators in the iSeries code to always skip CPU\nwhose number is above 63 which is the maximum size of that array and\nthe maximum number of supported CPUs on these machines.\n\nAdditionally, we make sure the boot_paca is properly initialized\nin our early startup code.\n\nSigned-off-by: Benjamin Herrenschmidt \u003cbenh@kernel.crashing.org\u003e\n"
    },
    {
      "commit": "3979491701cfb2aa7477f5baf40553355391418b",
      "tree": "4eafd59af4fd75e646598e581abb4d41e030fef2",
      "parents": [
        "6b684cd5799cd1e691024ca3a688d1cdec9d4824",
        "3ec07aa9522e3d5e9d5ede7bef946756e623a0a0"
      ],
      "author": {
        "name": "Linus Torvalds",
        "email": "torvalds@linux-foundation.org",
        "time": "Wed Mar 09 14:52:09 2011 -0800"
      },
      "committer": {
        "name": "Linus Torvalds",
        "email": "torvalds@linux-foundation.org",
        "time": "Wed Mar 09 14:52:09 2011 -0800"
      },
      "message": "Merge branch \u0027for-2.6.38\u0027 of git://linux-nfs.org/~bfields/linux\n\n* \u0027for-2.6.38\u0027 of git://linux-nfs.org/~bfields/linux:\n  nfsd: wrong index used in inner loop\n  nfsd4: fix bad pointer on failure to find delegation\n  NFSD: fix decode_cb_sequence4resok\n"
    },
    {
      "commit": "03a14ab134f4811ab1475f07b1305ccaf38b690f",
      "tree": "8ab4ffe226131afdafc944f9699835f5fe83a225",
      "parents": [
        "6c91afe1a984d43f922a6a70c7c390b7fb8de45e"
      ],
      "author": {
        "name": "Daniel Turull",
        "email": "daniel.turull@gmail.com",
        "time": "Wed Mar 09 14:11:00 2011 -0800"
      },
      "committer": {
        "name": "David S. Miller",
        "email": "davem@davemloft.net",
        "time": "Wed Mar 09 14:11:00 2011 -0800"
      },
      "message": "pktgen: fix errata in show results\n\nThe units in show_results in pktgen were not correct.\nThe results are in usec but it was displayed nsec.\n\nReported-by: Jong-won Lee \u003cljw@handong.edu\u003e\nSigned-off-by: Daniel Turull \u003cdaniel.turull@gmail.com\u003e\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n"
    },
    {
      "commit": "2f4e1b3970973bbb57cc3a3b9d67e67c1c648c37",
      "tree": "d7b4d7d64ed8a02c3cd10064eb9d8e177d2be5c3",
      "parents": [
        "ee3f1aaf930b7cfbf3d34eff1e5e076393227e90"
      ],
      "author": {
        "name": "Mario Schuknecht",
        "email": "m.schuknecht@dresearch.de",
        "time": "Wed Mar 09 14:08:09 2011 -0800"
      },
      "committer": {
        "name": "David S. Miller",
        "email": "davem@davemloft.net",
        "time": "Wed Mar 09 14:08:09 2011 -0800"
      },
      "message": "tcp: ioctl type SIOCOUTQNSD returns amount of data not sent\n\nIn contrast to SIOCOUTQ which returns the amount of data sent\nbut not yet acknowledged plus data not yet sent this patch only\nreturns the data not sent.\n\nFor various methods of live streaming bitrate control it may\nbe helpful to know how much data are in the tcp outqueue are\nnot sent yet.\n\nSigned-off-by: Mario Schuknecht \u003cm.schuknecht@dresearch.de\u003e\nSigned-off-by: Steffen Sledz \u003csledz@dresearch.de\u003e\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n"
    },
    {
      "commit": "ee3f1aaf930b7cfbf3d34eff1e5e076393227e90",
      "tree": "814621b53a1a26f00acd05e83f4b7be297abd607",
      "parents": [
        "bd33acc3cc525972ac779067e98efb26516c5b94"
      ],
      "author": {
        "name": "David S. Miller",
        "email": "davem@davemloft.net",
        "time": "Wed Mar 09 14:06:20 2011 -0800"
      },
      "committer": {
        "name": "David S. Miller",
        "email": "davem@davemloft.net",
        "time": "Wed Mar 09 14:06:20 2011 -0800"
      },
      "message": "ipv4: Lookup multicast routes by rtable using helper.\n\nCreate a common helper for this operation, since we do\nit identically in three spots.\n\nSuggested by Eric Dumazet.\n\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n"
    },
    {
      "commit": "6b684cd5799cd1e691024ca3a688d1cdec9d4824",
      "tree": "02fde30c141438b2b7fb96e141fbe5ceb17c4e96",
      "parents": [
        "1b7e7e6ffc08b3a8fb27bccd8fc740d77758db5b",
        "d406577526a611e6be1f6b1cfeaf094dd95fa439"
      ],
      "author": {
        "name": "Linus Torvalds",
        "email": "torvalds@linux-foundation.org",
        "time": "Wed Mar 09 14:04:40 2011 -0800"
      },
      "committer": {
        "name": "Linus Torvalds",
        "email": "torvalds@linux-foundation.org",
        "time": "Wed Mar 09 14:04:40 2011 -0800"
      },
      "message": "Merge git://git.kernel.org/pub/scm/linux/kernel/git/wim/linux-2.6-watchdog\n\n* git://git.kernel.org/pub/scm/linux/kernel/git/wim/linux-2.6-watchdog:\n  watchdog: sbc_fitpc2_wdt, fix crash on systems without DMI_BOARD_NAME\n"
    },
    {
      "commit": "1b7e7e6ffc08b3a8fb27bccd8fc740d77758db5b",
      "tree": "7d1592cccc0125171245931b9a8dd2bf5a7a665c",
      "parents": [
        "fbf855d7c709e991ff5445d4bac432a08b942baa",
        "6dbc2f35ab457770d121d119788fc89c79124734"
      ],
      "author": {
        "name": "Linus Torvalds",
        "email": "torvalds@linux-foundation.org",
        "time": "Wed Mar 09 14:03:59 2011 -0800"
      },
      "committer": {
        "name": "Linus Torvalds",
        "email": "torvalds@linux-foundation.org",
        "time": "Wed Mar 09 14:03:59 2011 -0800"
      },
      "message": "Merge branch \u0027for-2639-rc7/i2c-fixes\u0027 of git://git.fluff.org/bjdooks/linux\n\n* \u0027for-2639-rc7/i2c-fixes\u0027 of git://git.fluff.org/bjdooks/linux:\n  i2c-eg20t: include slab.h for memory allocations\n  i2c-ocores: Fix pointer type mismatch error\n  i2c-omap: Program I2C_WE on OMAP4 to enable i2c wakeup\n"
    },
    {
      "commit": "fbf855d7c709e991ff5445d4bac432a08b942baa",
      "tree": "792ddb7f44897b364c57e905fbcdbec77575bbae",
      "parents": [
        "cfd80652467717ca7346857d6d8c94503d74f3a3"
      ],
      "author": {
        "name": "Matt Turner",
        "email": "mattst88@gmail.com",
        "time": "Wed Mar 09 11:15:13 2011 -0500"
      },
      "committer": {
        "name": "Linus Torvalds",
        "email": "torvalds@linux-foundation.org",
        "time": "Wed Mar 09 14:03:00 2011 -0800"
      },
      "message": "alpha: fix compile error from IRQ clean up\n\nSigned-off-by: Matt Turner \u003cmattst88@gmail.com\u003e\nSigned-off-by: Linus Torvalds \u003ctorvalds@linux-foundation.org\u003e\n"
    },
    {
      "commit": "cfd80652467717ca7346857d6d8c94503d74f3a3",
      "tree": "ff4264e19c7b73b78fe45470830d4d4bd1442c0d",
      "parents": [
        "687530b44de7e0fe70fabb4200d4cabce3af1a0c",
        "1f858ef2fbabdc5e645644010a31a40c32e397c9"
      ],
      "author": {
        "name": "Linus Torvalds",
        "email": "torvalds@linux-foundation.org",
        "time": "Wed Mar 09 14:01:42 2011 -0800"
      },
      "committer": {
        "name": "Linus Torvalds",
        "email": "torvalds@linux-foundation.org",
        "time": "Wed Mar 09 14:01:42 2011 -0800"
      },
      "message": "Merge branch \u0027fixes\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/davej/cpufreq\n\n* \u0027fixes\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/davej/cpufreq:\n  [CPUFREQ] pcc-cpufreq: don\u0027t load driver if get_freq fails during init.\n"
    },
    {
      "commit": "687530b44de7e0fe70fabb4200d4cabce3af1a0c",
      "tree": "0ffb4bedbd51c89c1456fc38319c598ecb203df0",
      "parents": [
        "78833dd70602be6b71ef34225f708b1e500947dc",
        "bad3babace2ee4d1763b4016a662a5c660ab92e9"
      ],
      "author": {
        "name": "Linus Torvalds",
        "email": "torvalds@linux-foundation.org",
        "time": "Wed Mar 09 14:00:44 2011 -0800"
      },
      "committer": {
        "name": "Linus Torvalds",
        "email": "torvalds@linux-foundation.org",
        "time": "Wed Mar 09 14:00:44 2011 -0800"
      },
      "message": "Merge branch \u0027for-linus\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/cjb/mmc\n\n* \u0027for-linus\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/cjb/mmc:\n  mmc: fix CONFIG_MMC_UNSAFE_RESUME regression\n"
    },
    {
      "commit": "78833dd70602be6b71ef34225f708b1e500947dc",
      "tree": "807050f760ccc7305b194d7568ebf98737076a40",
      "parents": [
        "a5abba989deceb731047425812d268daf7536575",
        "b306419ae08d9def53f2142a37cc0a58622307a8"
      ],
      "author": {
        "name": "Linus Torvalds",
        "email": "torvalds@linux-foundation.org",
        "time": "Wed Mar 09 13:55:51 2011 -0800"
      },
      "committer": {
        "name": "Linus Torvalds",
        "email": "torvalds@linux-foundation.org",
        "time": "Wed Mar 09 13:55:51 2011 -0800"
      },
      "message": "Merge branch \u0027for-linus\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs-2.6\n\n* \u0027for-linus\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs-2.6:\n  nd-\u003einode is not set on the second attempt in path_walk()\n  unfuck proc_sysctl -\u003ed_compare()\n  minimal fix for do_filp_open() race\n"
    },
    {
      "commit": "d406577526a611e6be1f6b1cfeaf094dd95fa439",
      "tree": "9b4e97d33a9e18ce003eda0e3446dac9c6ec1828",
      "parents": [
        "a5abba989deceb731047425812d268daf7536575"
      ],
      "author": {
        "name": "Jiri Slaby",
        "email": "jslaby@suse.cz",
        "time": "Mon Feb 28 10:16:29 2011 +0100"
      },
      "committer": {
        "name": "Wim Van Sebroeck",
        "email": "wim@iguana.be",
        "time": "Wed Mar 09 21:33:37 2011 +0000"
      },
      "message": "watchdog: sbc_fitpc2_wdt, fix crash on systems without DMI_BOARD_NAME\n\nSome systems don\u0027t provide DMI_BOARD_NAME in their DMI tables. Avoid\ncrash in such situations in fitpc2_wdt_init.\n\nThe fix is to check if the dmi_get_system_info return value is NULL.\n\nThe oops:\nBUG: unable to handle kernel NULL pointer dereference at           (null)\nIP: [\u003cffffffff81253ae6\u003e] strstr+0x26/0xa0\nPGD 3966e067 PUD 39605067 PMD 0\nOops: 0000 [#1] SMP\nlast sysfs file: /sys/devices/system/cpu/cpu1/cache/index2/shared_cpu_map\nCPU 1\nModules linked in: ...\nPid: 1748, comm: modprobe Not tainted 2.6.37-22-default #1 /Bochs\nRIP: 0010:[\u003cffffffff81253ae6\u003e]  [\u003cffffffff81253ae6\u003e] strstr+0x26/0xa0\nRSP: 0018:ffff88003ad73f18  EFLAGS: 00010206\nRAX: 0000000000000000 RBX: 00000000ffffffed RCX: 00000000ffffffff\nRDX: ffffffffa003f4cc RSI: ffffffffa003f4c2 RDI: 0000000000000000\n...\nCR2: 0000000000000000 CR3: 000000003b7ac000 CR4: 00000000000006e0\n...\nProcess modprobe (pid: 1748, threadinfo ffff88003ad72000, task ffff88002e6365c0)\nStack: ...\nCall Trace:\n [\u003cffffffffa004201f\u003e] fitpc2_wdt_init+0x1f/0x13c [sbc_fitpc2_wdt]\n [\u003cffffffff810002da\u003e] do_one_initcall+0x3a/0x170\n...\nCode: f3 c3 0f 1f 00 80 3e 00 53 48 89 f8 74 1b 48 89 f2 0f 1f 40 00 48 83 c2 01 80 3a 00 75 f7 49 89 d0 48 89 f8 49 29 f0 75 02 5b c3 \u003c80\u003e 3f 00 74 0e 0f 1f 44 00 00 48 83 c0 01 80 38 00 75 f7 49 89\n\nSigned-off-by: Jiri Slaby \u003cjslaby@suse.cz\u003e\nSigned-off-by: Wim Van Sebroeck \u003cwim@iguana.be\u003e\n\n"
    },
    {
      "commit": "bd33acc3cc525972ac779067e98efb26516c5b94",
      "tree": "ba11a65bb14001f390abe15644c7397c7ffc4935",
      "parents": [
        "a015f6f49968c330b236ca2f6c2170820414f922"
      ],
      "author": {
        "name": "Amerigo Wang",
        "email": "amwang@redhat.com",
        "time": "Sun Mar 06 21:58:46 2011 +0000"
      },
      "committer": {
        "name": "David S. Miller",
        "email": "davem@davemloft.net",
        "time": "Wed Mar 09 13:32:17 2011 -0800"
      },
      "message": "bonding: move procfs code into bond_procfs.c\n\nV2: Move #ifdef CONFIG_PROC_FS into bonding.h, as suggested by David.\n\nbond_main.c is bloating, separate the procfs code out,\nmove them to bond_procfs.c\n\nSigned-off-by: WANG Cong \u003camwang@redhat.com\u003e\nReviewed-by: Jiri Pirko \u003cjpirko@redhat.com\u003e\nSigned-off-by: Andy Gospodarek \u003candy@greyhouse.net\u003e\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n"
    },
    {
      "commit": "6c91afe1a984d43f922a6a70c7c390b7fb8de45e",
      "tree": "0c04726d20503aaea4560d5c3fa9e10f41de1951",
      "parents": [
        "e380688217feba40db450253d16e9fb2c59a625a"
      ],
      "author": {
        "name": "David S. Miller",
        "email": "davem@davemloft.net",
        "time": "Wed Mar 09 13:27:16 2011 -0800"
      },
      "committer": {
        "name": "David S. Miller",
        "email": "davem@davemloft.net",
        "time": "Wed Mar 09 13:27:16 2011 -0800"
      },
      "message": "ipv4: Fix erroneous uses of ifa_address.\n\nIn usual cases ifa_address \u003d\u003d ifa_local, but in the case where\nSIOCSIFDSTADDR sets the destination address on a point-to-point\nlink, ifa_address gets set to that destination address.\n\nTherefore we should use ifa_local when we want the local interface\naddress.\n\nThere were two cases where the selection was done incorrectly:\n\n1) When devinet_ioctl() does matching, it checks ifa_address even\n   though gifconf correct reported ifa_local to the user\n\n2) IN_DEV_ARP_NOTIFY handling sends a gratuitous ARP using\n   ifa_address instead of ifa_local.\n\nReported-by: Julian Anastasov \u003cja@ssi.bg\u003e\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n"
    },
    {
      "commit": "8d5eab5aa676378b4c9daa62d10d08a0bca04677",
      "tree": "6d149cbd7c714486cc87616357349cc332fec712",
      "parents": [
        "23ffaa89df16e55578318cfd852f23dcb37bf37b"
      ],
      "author": {
        "name": "Daniel Halperin",
        "email": "dhalperi@cs.washington.edu",
        "time": "Wed Mar 09 03:10:18 2011 -0800"
      },
      "committer": {
        "name": "John W. Linville",
        "email": "linville@tuxdriver.com",
        "time": "Wed Mar 09 16:10:58 2011 -0500"
      },
      "message": "mac80211: update minstrel_ht sample rate when probe is set\n\nWaiting until the status is received can cause the same rate to be\nprobed multiple times consecutively.\n\nCc: Felix Fietkau \u003cnbd@openwrt.org\u003e\nSigned-off-by: Daniel Halperin \u003cdhalperi@cs.washington.edu\u003e\nSigned-off-by: John W. Linville \u003clinville@tuxdriver.com\u003e\n"
    },
    {
      "commit": "23ffaa89df16e55578318cfd852f23dcb37bf37b",
      "tree": "b17317a8b16a3e7a70cfffffc89be0f6cc607162",
      "parents": [
        "4d9d88d121fdd01dd859717909ea3c90173f143a"
      ],
      "author": {
        "name": "John W. Linville",
        "email": "linville@tuxdriver.com",
        "time": "Tue Mar 08 16:36:00 2011 -0500"
      },
      "committer": {
        "name": "John W. Linville",
        "email": "linville@tuxdriver.com",
        "time": "Wed Mar 09 16:10:57 2011 -0500"
      },
      "message": "ath5k: restrict AR5K_TX_QUEUE_ID_DATA_MAX to reflect the [0,3] range\n\nThis just matches reality...\n\nSigned-off-by: John W. Linville \u003clinville@tuxdriver.com\u003e\nAcked-by: Bob Copeland \u003cme@bobcopeland.com\u003e\n"
    },
    {
      "commit": "4d9d88d121fdd01dd859717909ea3c90173f143a",
      "tree": "46f08bf9ab7c84a0978d3bc5a6202b0af15a308a",
      "parents": [
        "80751e2b8ffcbbe065e850d943301aa1ab219599"
      ],
      "author": {
        "name": "Scott James Remnant",
        "email": "keybuk@google.com",
        "time": "Tue Mar 08 10:45:30 2011 -0800"
      },
      "committer": {
        "name": "John W. Linville",
        "email": "linville@tuxdriver.com",
        "time": "Wed Mar 09 16:10:57 2011 -0500"
      },
      "message": "net/wireless: add COUNTRY to to regulatory device uevent\n\nRegulatory devices issue change uevents to inform userspace of a need\nto call the crda tool; however these can often be sent before udevd is\nrunning, and were not previously included in the results of\nudevadm trigger (which requests a new change event using the /uevent\nattribute of the sysfs object).\n\nAdd a uevent function to the device type which includes the COUNTRY\ninformation from the last request if it has yet to be processed, the\ncase of multiple requests is already handled in the code by checking\nwhether an unprocessed one is queued in the same manner and refusing\nto queue a new one.\n\nThe existing udev rule continues to work as before.\n\nSigned-off-by: Scott James Remnant \u003ckeybuk@google.com\u003e\nAcked-By: Kay Sievers \u003ckay.sievers@vrfy.org\u003e\nAcked-by: Greg Kroah-Hartman \u003cgregkh@suse.de\u003e\nSigned-off-by: John W. Linville \u003clinville@tuxdriver.com\u003e\n"
    },
    {
      "commit": "80751e2b8ffcbbe065e850d943301aa1ab219599",
      "tree": "454176f57e0765986809009c71076ff483160ce4",
      "parents": [
        "b9ede5f1dc03f96949dcaa8f8b3483766c047260"
      ],
      "author": {
        "name": "Bing Zhao",
        "email": "bzhao@marvell.com",
        "time": "Mon Mar 07 11:14:23 2011 -0800"
      },
      "committer": {
        "name": "John W. Linville",
        "email": "linville@tuxdriver.com",
        "time": "Wed Mar 09 16:10:56 2011 -0500"
      },
      "message": "ieee80211: add IEEE80211_COUNTRY_STRING_LEN definition\n\nand make use of it in wireless drivers\n\nSigned-off-by: Bing Zhao \u003cbzhao@marvell.com\u003e\nSigned-off-by: John W. Linville \u003clinville@tuxdriver.com\u003e\n"
    },
    {
      "commit": "b9ede5f1dc03f96949dcaa8f8b3483766c047260",
      "tree": "8b33c42e345cdaa5d9954043ed1b001e125714cd",
      "parents": [
        "d07bfd8b6f20a81d7ec65c50f35b053d9e3aa740"
      ],
      "author": {
        "name": "Shan Wei",
        "email": "shanwei@cn.fujitsu.com",
        "time": "Tue Mar 08 11:02:03 2011 +0800"
      },
      "committer": {
        "name": "John W. Linville",
        "email": "linville@tuxdriver.com",
        "time": "Wed Mar 09 16:10:45 2011 -0500"
      },
      "message": "mwl8k: use kcalloc instead of kmalloc \u0026 memset\n\nUse kcalloc or kzalloc rather than the combination of kmalloc and memset.\n\nThanks coccicheck for detecting this.\n(http://coccinelle.lip6.fr/)\n\nSigned-off-by: Shan Wei \u003cshanwei@cn.fujitsu.com\u003e\nSigned-off-by: John W. Linville \u003clinville@tuxdriver.com\u003e\n"
    },
    {
      "commit": "a015f6f49968c330b236ca2f6c2170820414f922",
      "tree": "8370664c7d17ae1d1290622fa7b302919b13f4fe",
      "parents": [
        "297edb6003268c1d60da8c21eb76bf39b6428213"
      ],
      "author": {
        "name": "Rémi Denis-Courmont",
        "email": "remi.denis-courmont@nokia.com",
        "time": "Tue Mar 08 22:44:13 2011 +0000"
      },
      "committer": {
        "name": "David S. Miller",
        "email": "davem@davemloft.net",
        "time": "Wed Mar 09 11:59:33 2011 -0800"
      },
      "message": "Phonet: kill the ST-Ericsson pipe controller Kconfig\n\nThis is now a run-time choice so that a single kernel can support both\nold and new generation ISI modems. Support for manually enabling the\npipe flow is removed as it did not work properly, does not fit well\nwith the socket API, and I am not aware of any use at the moment.\n\nSigned-off-by: Rémi Denis-Courmont \u003cremi.denis-courmont@nokia.com\u003e\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n"
    },
    {
      "commit": "297edb6003268c1d60da8c21eb76bf39b6428213",
      "tree": "b17c7544eed3430ed89a56e54a3de14fe9755c3c",
      "parents": [
        "acaf7df610ff3faf1778ce40d601fc3dd4a41b40"
      ],
      "author": {
        "name": "Rémi Denis-Courmont",
        "email": "remi.denis-courmont@nokia.com",
        "time": "Tue Mar 08 22:44:12 2011 +0000"
      },
      "committer": {
        "name": "David S. Miller",
        "email": "davem@davemloft.net",
        "time": "Wed Mar 09 11:59:33 2011 -0800"
      },
      "message": "Phonet: support active connection without pipe controller on modem\n\nThis provides support for newer ISI modems with no need for the\nearlier experimental compile-time alternative choice. With this,\nwe can now use the same kernel and userspace with both types of\nmodems.\n\nThis also avoids confusing two different and incompatible state\nmachines, actively connected vs accepted sockets, and adds\nconnection response error handling (processing \"SYN/RST\" of sorts).\n\nSigned-off-by: Rémi Denis-Courmont \u003cremi.denis-courmont@nokia.com\u003e\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n"
    },
    {
      "commit": "acaf7df610ff3faf1778ce40d601fc3dd4a41b40",
      "tree": "a6ed66e7314b43d253dceb5930da6b5fc40d051f",
      "parents": [
        "f7ae8d59f66154df0424fd94035c89981fed3379"
      ],
      "author": {
        "name": "Rémi Denis-Courmont",
        "email": "remi.denis-courmont@nokia.com",
        "time": "Tue Mar 08 22:44:11 2011 +0000"
      },
      "committer": {
        "name": "David S. Miller",
        "email": "davem@davemloft.net",
        "time": "Wed Mar 09 11:59:32 2011 -0800"
      },
      "message": "Phonet: provide pipe socket option to retrieve the pipe identifier\n\nUser-space sometimes needs this information. In particular, the GPRS\ncontext or the AT commands pipe setups may use the pipe handle as a\nreference.\n\nThis removes the settable pipe handle with CONFIG_PHONET_PIPECTRLR.\nIt did not handle error cases correctly. Furthermore, the kernel\n*could* implement a smart scheme for allocating handles (if ever\nneeded), but userspace really cannot.\n\nSigned-off-by: Rémi Denis-Courmont \u003cremi.denis-courmont@nokia.com\u003e\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n"
    }
  ],
  "next": "f7ae8d59f66154df0424fd94035c89981fed3379"
}
