)]}' { "log": [ { "commit": "175face2ba31025b0dcd6da4e711fca7764287fa", "tree": "8da146e3a923614defe47d78e0e262a1671b7f1a", "parents": [ "e766d7b55e10f93c7bab298135a4e90dcc46620d" ], "author": { "name": "Alex Elder", "email": "elder@inktank.com", "time": "Fri Mar 08 13:35:36 2013 -0600" }, "committer": { "name": "Sage Weil", "email": "sage@inktank.com", "time": "Wed May 01 21:17:02 2013 -0700" }, "message": "libceph: let osd ops determine request data length\n\nThe length of outgoing data in an osd request is dependent on the\nosd ops that are embedded in that request. Each op is encoded into\na request message using osd_req_encode_op(), so that should be used\nto determine the amount of outgoing data implied by the op as it\nis encoded.\n\nHave osd_req_encode_op() return the number of bytes of outgoing data\nimplied by the op being encoded, and accumulate and use that in\nceph_osdc_build_request().\n\nAs a result, ceph_osdc_build_request() no longer requires its \"len\"\nparameter, so get rid of it.\n\nUsing the sum of the op lengths rather than the length provided is\na valid change because:\n - The only callers of osd ceph_osdc_build_request() are\n rbd and the osd client (in ceph_osdc_new_request() on\n behalf of the file system).\n - When rbd calls it, the length provided is only non-zero for\n write requests, and in that case the single op has the\n same length value as what was passed here.\n - When called from ceph_osdc_new_request(), (it\u0027s not all that\n easy to see, but) the length passed is also always the same\n as the extent length encoded in its (single) write op if\n present.\n\nThis resolves:\n http://tracker.ceph.com/issues/4406\n\nSigned-off-by: Alex Elder \u003celder@inktank.com\u003e\nReviewed-by: Josh Durgin \u003cjosh.durgin@inktank.com\u003e\n" }, { "commit": "e766d7b55e10f93c7bab298135a4e90dcc46620d", "tree": "0b3bebb5ee06c1a63d2155c6ba3ce52f83d63fe7", "parents": [ "6aaa4511deb4b0fd776d1153dc63a89cdc024fb8" ], "author": { "name": "Alex Elder", "email": "elder@inktank.com", "time": "Thu Mar 07 15:38:28 2013 -0600" }, "committer": { "name": "Sage Weil", "email": "sage@inktank.com", "time": "Wed May 01 21:17:01 2013 -0700" }, "message": "libceph: implement pages array cursor\n\nImplement and use cursor routines for page array message data items\nfor outbound message data.\n\nSigned-off-by: Alex Elder \u003celder@inktank.com\u003e\nReviewed-by: Josh Durgin \u003cjosh.durgin@inktank.com\u003e\n" }, { "commit": "6aaa4511deb4b0fd776d1153dc63a89cdc024fb8", "tree": "455fb4334de3518e411daaa7e3ff1d9aef187cd8", "parents": [ "7fe1e5e57b84eab98ff352519aa66e86dac5bf61" ], "author": { "name": "Alex Elder", "email": "elder@inktank.com", "time": "Wed Mar 06 23:39:39 2013 -0600" }, "committer": { "name": "Sage Weil", "email": "sage@inktank.com", "time": "Wed May 01 21:16:59 2013 -0700" }, "message": "libceph: implement bio message data item cursor\n\nImplement and use cursor routines for bio message data items for\noutbound message data.\n\n(See the previous commit for reasoning in support of the changes\nin out_msg_pos_next().)\n\nSigned-off-by: Alex Elder \u003celder@inktank.com\u003e\nReviewed-by: Josh Durgin \u003cjosh.durgin@inktank.com\u003e\n" }, { "commit": "dd236fcb65d7b6b80c408cb5f66aab55f4594284", "tree": "426afba9ffbe61535085b76066c08db217b3a12d", "parents": [ "fe38a2b67bc6b3a60da82a23e9082256a30e39d9" ], "author": { "name": "Alex Elder", "email": "elder@inktank.com", "time": "Wed Mar 06 23:39:39 2013 -0600" }, "committer": { "name": "Sage Weil", "email": "sage@inktank.com", "time": "Wed May 01 21:16:57 2013 -0700" }, "message": "libceph: prepare for other message data item types\n\nThis just inserts some infrastructure in preparation for handling\nother types of ceph message data items. No functional changes,\njust trying to simplify review by separating out some noise.\n\nSigned-off-by: Alex Elder \u003celder@inktank.com\u003e\nReviewed-by: Josh Durgin \u003cjosh.durgin@inktank.com\u003e\n" }, { "commit": "fe38a2b67bc6b3a60da82a23e9082256a30e39d9", "tree": "956555bf1b5ea405d77045bd9d7743879d60438e", "parents": [ "437945094fed0deb1810e8da95465c8f26bc6f80" ], "author": { "name": "Alex Elder", "email": "elder@inktank.com", "time": "Wed Mar 06 23:39:39 2013 -0600" }, "committer": { "name": "Sage Weil", "email": "sage@inktank.com", "time": "Wed May 01 21:16:56 2013 -0700" }, "message": "libceph: start defining message data cursor\n\nThis patch lays out the foundation for using generic routines to\nmanage processing items of message data.\n\nFor simplicity, we\u0027ll start with just the trail portion of a\nmessage, because it stands alone and is only present for outgoing\ndata.\n\nFirst some basic concepts. We\u0027ll use the term \"data item\" to\nrepresent one of the ceph_msg_data structures associated with a\nmessage. There are currently four of those, with single-letter\nfield names p, l, b, and t. A data item is further broken into\n\"pieces\" which always lie in a single page. A data item will\ninclude a \"cursor\" that will track state as the memory defined by\nthe item is consumed by sending data from or receiving data into it.\n\nWe define three routines to manipulate a data item\u0027s cursor: the\n\"init\" routine; the \"next\" routine; and the \"advance\" routine. The\n\"init\" routine initializes the cursor so it points at the beginning\nof the first piece in the item. The \"next\" routine returns the\npage, page offset, and length (limited by both the page and item\nsize) of the next unconsumed piece in the item. It also indicates\nto the caller whether the piece being returned is the last one in\nthe data item.\n\nThe \"advance\" routine consumes the requested number of bytes in the\nitem (advancing the cursor). This is used to record the number of\nbytes from the current piece that were actually sent or received by\nthe network code. It returns an indication of whether the result\nmeans the current piece has been fully consumed. This is used by\nthe message send code to determine whether it should calculate the\nCRC for the next piece processed.\n\nThe trail of a message is implemented as a ceph pagelist. The\nroutines defined for it will be usable for non-trail pagelist data\nas well.\n\nSigned-off-by: Alex Elder \u003celder@inktank.com\u003e\nReviewed-by: Josh Durgin \u003cjosh.durgin@inktank.com\u003e\n" }, { "commit": "437945094fed0deb1810e8da95465c8f26bc6f80", "tree": "afd9e83b01b06bcad1e8933df3b990479bd558fa", "parents": [ "f9e15777afd87585f2222dfd446c2e52deb65eba" ], "author": { "name": "Alex Elder", "email": "elder@inktank.com", "time": "Fri Mar 01 18:00:16 2013 -0600" }, "committer": { "name": "Sage Weil", "email": "sage@inktank.com", "time": "Wed May 01 21:16:55 2013 -0700" }, "message": "libceph: abstract message data\n\nGroup the types of message data into an abstract structure with a\ntype indicator and a union containing fields appropriate to the\ntype of data it represents. Use this to represent the pages,\npagelist, bio, and trail in a ceph message.\n\nVerify message data is of type NONE in ceph_msg_data_set_*()\nroutines. Since information about message data of type NONE really\nshould not be interpreted, get rid of the other assertions in those\nfunctions.\n\nSigned-off-by: Alex Elder \u003celder@inktank.com\u003e\nReviewed-by: Josh Durgin \u003cjosh.durgin@inktank.com\u003e\n" }, { "commit": "f9e15777afd87585f2222dfd446c2e52deb65eba", "tree": "d7f3d460c4384d502a8a7b16bcd530f803a54192", "parents": [ "97fb1c7f6637ee61c90b8bc186d464cfd426b063" ], "author": { "name": "Alex Elder", "email": "elder@inktank.com", "time": "Fri Mar 01 18:00:16 2013 -0600" }, "committer": { "name": "Sage Weil", "email": "sage@inktank.com", "time": "Wed May 01 21:16:54 2013 -0700" }, "message": "libceph: be explicit about message data representation\n\nA ceph message has a data payload portion. The memory for that data\n(either the source of data to send or the location to place data\nthat is received) is specified in several ways. The ceph_msg\nstructure includes fields for all of those ways, but this\nmispresents the fact that not all of them are used at a time.\n\nSpecifically, the data in a message can be in:\n - an array of pages\n - a list of pages\n - a list of Linux bios\n - a second list of pages (the \"trail\")\n(The two page lists are currently only ever used for outgoing data.)\n\nImpose more structure on the ceph message, making the grouping of\nsome of these fields explicit. Shorten the name of the\n\"page_alignment\" field.\n\nSigned-off-by: Alex Elder \u003celder@inktank.com\u003e\nReviewed-by: Josh Durgin \u003cjosh.durgin@inktank.com\u003e\n" }, { "commit": "97fb1c7f6637ee61c90b8bc186d464cfd426b063", "tree": "561715682d70fb55c43acbd0fcedca33d0597237", "parents": [ "35b6280899424a0faf5410ce1ee86f9682528e6c" ], "author": { "name": "Alex Elder", "email": "elder@inktank.com", "time": "Fri Mar 01 18:00:16 2013 -0600" }, "committer": { "name": "Sage Weil", "email": "sage@inktank.com", "time": "Wed May 01 21:16:53 2013 -0700" }, "message": "libceph: define ceph_msg_has_*() data macros\n\nDefine and use macros ceph_msg_has_*() to determine whether to\noperate on the pages, pagelist, bio, and trail fields of a message.\n\nSigned-off-by: Alex Elder \u003celder@inktank.com\u003e\nReviewed-by: Josh Durgin \u003cjosh.durgin@inktank.com\u003e\n" }, { "commit": "4a73ef27ad04f1b8ea23eb55e50b20fcc0530a6f", "tree": "5a0a127ca9b3b51a3f388c980f49229245fed361", "parents": [ "ebf18f47093e968105767eed4a0aa155e86b224e" ], "author": { "name": "Alex Elder", "email": "elder@inktank.com", "time": "Thu Mar 07 15:38:26 2013 -0600" }, "committer": { "name": "Sage Weil", "email": "sage@inktank.com", "time": "Wed May 01 21:16:42 2013 -0700" }, "message": "libceph: record message data byte length\n\nRecord the number of bytes of data in a page array rather than the\nnumber of pages in the array. It can be assumed that the page array\nis of sufficient size to hold the number of bytes indicated (and\noffset by the indicated alignment).\n\nSigned-off-by: Alex Elder \u003celder@inktank.com\u003e\nReviewed-by: Josh Durgin \u003cjosh.durgin@inktank.com\u003e\n" }, { "commit": "27fa83852ba275361eaa1a1283cf6704fa8191a6", "tree": "b3a939253a63d3d3d64b339017008733e659108b", "parents": [ "f1baeb2b9fc1c2c87ec02f1bf8cb88e108d4fbce" ], "author": { "name": "Alex Elder", "email": "elder@inktank.com", "time": "Thu Feb 14 12:16:43 2013 -0600" }, "committer": { "name": "Sage Weil", "email": "sage@inktank.com", "time": "Wed May 01 21:16:40 2013 -0700" }, "message": "libceph: isolate other message data fields\n\nDefine ceph_msg_data_set_pagelist(), ceph_msg_data_set_bio(), and\nceph_msg_data_set_trail() to clearly abstract the assignment of the\nremaining data-related fields in a ceph message structure. Use the\nnew functions in the osd client and mds client.\n\nThis partially resolves:\n http://tracker.ceph.com/issues/4263\n\nSigned-off-by: Alex Elder \u003celder@inktank.com\u003e\nReviewed-by: Josh Durgin \u003cjosh.durgin@inktank.com\u003e\n" }, { "commit": "f1baeb2b9fc1c2c87ec02f1bf8cb88e108d4fbce", "tree": "5ca6b72adeeea2423367ea3313902cf61fd45980", "parents": [ "02afca6ca00b7972887c5cc77068356f33bdfc18" ], "author": { "name": "Alex Elder", "email": "elder@inktank.com", "time": "Thu Mar 07 15:38:26 2013 -0600" }, "committer": { "name": "Sage Weil", "email": "sage@inktank.com", "time": "Wed May 01 21:16:39 2013 -0700" }, "message": "libceph: set page info with byte length\n\nWhen setting page array information for message data, provide the\nbyte length rather than the page count ceph_msg_data_set_pages().\n\nSigned-off-by: Alex Elder \u003celder@inktank.com\u003e\nReviewed-by: Josh Durgin \u003cjosh.durgin@inktank.com\u003e\n" }, { "commit": "02afca6ca00b7972887c5cc77068356f33bdfc18", "tree": "a335532b314d8da309bb7313cc84ae973d3f5ab0", "parents": [ "e0c594878e3211b09208c779df5f996f0b831d9e" ], "author": { "name": "Alex Elder", "email": "elder@inktank.com", "time": "Thu Feb 14 12:16:43 2013 -0600" }, "committer": { "name": "Sage Weil", "email": "sage@inktank.com", "time": "Wed May 01 21:16:38 2013 -0700" }, "message": "libceph: isolate message page field manipulation\n\nDefine a function ceph_msg_data_set_pages(), which more clearly\nabstracts the assignment page-related fields for data in a ceph\nmessage structure. Use this new function in the osd client and mds\nclient.\n\nIdeally, these fields would never be set more than once (with\nBUG_ON() calls to guarantee that). At the moment though the osd\nclient sets these every time it receives a message, and in the event\nof a communication problem this can happen more than once. (This\nwill be resolved shortly, but setting up these helpers first makes\nit all a bit easier to work with.)\n\nRearrange the field order in a ceph_msg structure to group those\nthat are used to define the possible data payloads.\n\nThis partially resolves:\n http://tracker.ceph.com/issues/4263\n\nSigned-off-by: Alex Elder \u003celder@inktank.com\u003e\nReviewed-by: Josh Durgin \u003cjosh.durgin@inktank.com\u003e\n" }, { "commit": "e0c594878e3211b09208c779df5f996f0b831d9e", "tree": "4418813382a61eafd7f3216b8efbc63a1d253f37", "parents": [ "9516e45b25d9967c35d2e798496ec5e590aaa24f" ], "author": { "name": "Alex Elder", "email": "elder@inktank.com", "time": "Thu Mar 07 15:38:25 2013 -0600" }, "committer": { "name": "Sage Weil", "email": "sage@inktank.com", "time": "Wed May 01 21:16:36 2013 -0700" }, "message": "libceph: record byte count not page count\n\nRecord the byte count for an osd request rather than the page count.\nThe number of pages can always be derived from the byte count (and\nalignment/offset) but the reverse is not true.\n\nSigned-off-by: Alex Elder \u003celder@inktank.com\u003e\nReviewed-by: Josh Durgin \u003cjosh.durgin@inktank.com\u003e\n" }, { "commit": "7b11ba37585595034a91df8869414f732466b800", "tree": "7ed58d6ffe58456be69c2c3597426c5c1a5740e0", "parents": [ "4137577ae398837b0d5e47d4d9365320584efdad" ], "author": { "name": "Alex Elder", "email": "elder@inktank.com", "time": "Fri Mar 08 18:51:03 2013 -0600" }, "committer": { "name": "Sage Weil", "email": "sage@inktank.com", "time": "Wed May 01 21:16:29 2013 -0700" }, "message": "libceph: define CEPH_MSG_MAX_MIDDLE_LEN\n\nThis is probably unnecessary but the code read as if it were wrong\nin read_partial_message().\n\nSigned-off-by: Alex Elder \u003celder@inktank.com\u003e\nReviewed-by: Josh Durgin \u003cjosh.durgin@inktank.com\u003e\n" }, { "commit": "0fff87ec798abdb4a99f01cbb0197266bb68c5dc", "tree": "33c853319e28ed9dd20835c1f3f066be404b50a1", "parents": [ "2ac2b7a6d4976bd6b5dc0751aa77d12d48d3ac4c" ], "author": { "name": "Alex Elder", "email": "elder@inktank.com", "time": "Thu Feb 14 12:16:43 2013 -0600" }, "committer": { "name": "Sage Weil", "email": "sage@inktank.com", "time": "Wed May 01 21:16:27 2013 -0700" }, "message": "libceph: separate read and write data\n\nAn osd request defines information about where data to be read\nshould be placed as well as where data to write comes from.\nCurrently these are represented by common fields.\n\nKeep information about data for writing separate from data to be\nread by splitting these into data_in and data_out fields.\n\nThis is the key patch in this whole series, in that it actually\nidentifies which osd requests generate outgoing data and which\ngenerate incoming data. It\u0027s less obvious (currently) that an osd\nCALL op generates both outgoing and incoming data; that\u0027s the focus\nof some upcoming work.\n\nThis resolves:\n http://tracker.ceph.com/issues/4127\n\nSigned-off-by: Alex Elder \u003celder@inktank.com\u003e\nReviewed-by: Josh Durgin \u003cjosh.durgin@inktank.com\u003e\n" }, { "commit": "2ac2b7a6d4976bd6b5dc0751aa77d12d48d3ac4c", "tree": "af95ff579ab1719871e8678ef530db46514c0eb7", "parents": [ "2794a82a11cfeae0890741b18b0049ddb55ce646" ], "author": { "name": "Alex Elder", "email": "elder@inktank.com", "time": "Thu Feb 14 12:16:43 2013 -0600" }, "committer": { "name": "Sage Weil", "email": "sage@inktank.com", "time": "Wed May 01 21:16:25 2013 -0700" }, "message": "libceph: distinguish page and bio requests\n\nAn osd request uses either pages or a bio list for its data. Use a\nunion to record information about the two, and add a data type\ntag to select between them.\n\nSigned-off-by: Alex Elder \u003celder@inktank.com\u003e\nReviewed-by: Josh Durgin \u003cjosh.durgin@inktank.com\u003e\n" }, { "commit": "2794a82a11cfeae0890741b18b0049ddb55ce646", "tree": "9dc71c4a7d95fceed3942418586c5ced230ecdc2", "parents": [ "153e5167e0e237faaefb7adf82db5748c1452d73" ], "author": { "name": "Alex Elder", "email": "elder@inktank.com", "time": "Thu Feb 14 12:16:43 2013 -0600" }, "committer": { "name": "Sage Weil", "email": "sage@inktank.com", "time": "Wed May 01 21:16:24 2013 -0700" }, "message": "libceph: separate osd request data info\n\nPull the fields in an osd request structure that define the data for\nthe request out into a separate structure.\n\nSigned-off-by: Alex Elder \u003celder@inktank.com\u003e\nReviewed-by: Josh Durgin \u003cjosh.durgin@inktank.com\u003e\n" }, { "commit": "153e5167e0e237faaefb7adf82db5748c1452d73", "tree": "fa0e5ec90ef466cb7100f64ee4d2b9bf7c4ad69d", "parents": [ "3a42b6c43e4ef65d0edd7d9e5c4366002b4e951d" ], "author": { "name": "Alex Elder", "email": "elder@inktank.com", "time": "Fri Mar 01 18:00:15 2013 -0600" }, "committer": { "name": "Sage Weil", "email": "sage@inktank.com", "time": "Wed May 01 21:16:23 2013 -0700" }, "message": "libceph: don\u0027t assign page info in ceph_osdc_new_request()\n\nCurrently ceph_osdc_new_request() assigns an osd request\u0027s\nr_num_pages and r_alignment fields. The only thing it does\nafter that is call ceph_osdc_build_request(), and that doesn\u0027t\nneed those fields to be assigned.\n\nMove the assignment of those fields out of ceph_osdc_new_request()\nand into its caller. As a result, the page_align parameter is no\nlonger used, so get rid of it.\n\nNote that in ceph_sync_write(), the value for req-\u003er_num_pages had\nalready been calculated earlier (as num_pages, and fortunately\nit was computed the same way). So don\u0027t bother recomputing it,\nbut because it\u0027s not needed earlier, move that calculation after the\ncall to ceph_osdc_new_request(). Hold off making the assignment to\nr_alignment, doing it instead r_pages and r_num_pages are\ngetting set.\n\nSimilarly, in start_read(), nr_pages already holds the number of\npages in the array (and is calculated the same way), so there\u0027s no\nneed to recompute it. Move the assignment of the page alignment\ndown with the others there as well.\n\nThis and the next few patches are preparation work for:\n http://tracker.ceph.com/issues/4127\n\nSigned-off-by: Alex Elder \u003celder@inktank.com\u003e\nReviewed-by: Josh Durgin \u003cjosh.durgin@inktank.com\u003e\n" }, { "commit": "41766f87f54cc8bef023b4b0550f48753959345a", "tree": "58d11a1e3fcb0aef8d97b6cdc48bcf5811d32001", "parents": [ "ec02a2f2ffae13e038453ae89592a8c6210f7f4d" ], "author": { "name": "Alex Elder", "email": "elder@inktank.com", "time": "Fri Mar 01 18:00:15 2013 -0600" }, "committer": { "name": "Sage Weil", "email": "sage@inktank.com", "time": "Wed May 01 21:16:17 2013 -0700" }, "message": "libceph: rename ceph_calc_object_layout()\n\nThe purpose of ceph_calc_object_layout() is to fill in the pool\nnumber and seed for a ceph_pg structure provided, based on a given\nosd map and target object id.\n\nCurrently that function takes a file layout parameter, but the only\nthing used out of that is its pool number.\n\nChange the function so it takes a pool number rather than the full\nfile layout structure. Only update the ceph_pg if the pool is found\nin the osd map. Get rid of few useless lines of code from the\nfunction while there.\n\nSince the function now very clearly just fills in the ceph_pg\nstructure it\u0027s provided, rename it ceph_calc_ceph_pg().\n\nSigned-off-by: Alex Elder \u003celder@inktank.com\u003e\nReviewed-by: Josh Durgin \u003cjosh.durgin@inktank.com\u003e\n" }, { "commit": "ec02a2f2ffae13e038453ae89592a8c6210f7f4d", "tree": "9c9d59d61ec2b5516ccfd7da02caf5372bf72e8c", "parents": [ "2a24d1f4bd7995de133c857bfdc77ac82c842300" ], "author": { "name": "Alex Elder", "email": "elder@inktank.com", "time": "Fri Mar 01 18:00:15 2013 -0600" }, "committer": { "name": "Sage Weil", "email": "sage@inktank.com", "time": "Wed May 01 21:16:16 2013 -0700" }, "message": "libceph: kill ceph_msg-\u003epagelist_count\n\nThe pagelist_count field is never actually used, so get rid of it.\n\nSigned-off-by: Alex Elder \u003celder@inktank.com\u003e\nReviewed-by: Josh Durgin \u003cjosh.durgin@inktank.com\u003e\n" }, { "commit": "2a24d1f4bd7995de133c857bfdc77ac82c842300", "tree": "33d1fa3029e7009f041043ef96cba3c782e475db", "parents": [ "8f63ca2d23c7922b24d7b95e54740ec29c859379" ], "author": { "name": "Alex Elder", "email": "elder@inktank.com", "time": "Fri Mar 01 18:00:15 2013 -0600" }, "committer": { "name": "Sage Weil", "email": "sage@inktank.com", "time": "Wed May 01 21:16:15 2013 -0700" }, "message": "libceph: use (void *) for untyped data in osd ops\n\nTwo of the fields defining osd operations are defined using (char *)\nwhile the data they represent are really untyped, not character\nstrings. Change them to have type (void *).\n\nSigned-off-by: Alex Elder \u003celder@inktank.com\u003e\nReviewed-by: Josh Durgin \u003cjosh.durgin@inktank.com\u003e\n" }, { "commit": "0d5af1643535508f82d6bcc2b9b93b180e8c3f4b", "tree": "723493b46491da26aa66cc60604f11e701d32858", "parents": [ "3f99969f42300e52779ae0656678c2534097f2ea" ], "author": { "name": "Alex Elder", "email": "elder@inktank.com", "time": "Wed Feb 27 10:26:25 2013 -0600" }, "committer": { "name": "Sage Weil", "email": "sage@inktank.com", "time": "Wed May 01 21:16:12 2013 -0700" }, "message": "libceph: complete lingering requests only once\n\nAn osd request marked to linger will be re-submitted in the event\na connection to the target osd gets dropped. Currently, if there\nis a callback function associated with a request it will be called\neach time a request is submitted--which for lingering requests can\nbe more than once.\n\nChange it so a request--including lingering ones--will get completed\n(from the perspective of the user of the osd client) exactly once.\n\nThis resolves:\n http://tracker.ceph.com/issues/3967\n\nSigned-off-by: Alex Elder \u003celder@inktank.com\u003e\nReviewed-by: Josh Durgin \u003cjosh.durgin@inktank.com\u003e\n" }, { "commit": "d4b515fa10dd52a2aef88df7299e9f3a8ab0957a", "tree": "0110566b4e00aeb5215b1b967ff64695cd45eb10", "parents": [ "60cf5992d96dd5b97baf74cd400d6e05f7f2c93e" ], "author": { "name": "Alex Elder", "email": "elder@inktank.com", "time": "Mon Feb 25 17:35:46 2013 -0600" }, "committer": { "name": "Sage Weil", "email": "sage@inktank.com", "time": "Wed May 01 21:14:28 2013 -0700" }, "message": "libceph: distinguish page array and pagelist count\n\nUse distinct fields for tracking the number of pages in a message\u0027s\npage array and in a message\u0027s page list. Currently only one or the\nother is used at a time, but that will be changing soon.\n\nSigned-off-by: Alex Elder \u003celder@inktank.com\u003e\nReviewed-by: Josh Durgin \u003cjosh.durgin@inktank.com\u003e\n" }, { "commit": "07c09b725543ff2958c11522d583f90f7fdba735", "tree": "e59ccdb0798fb56c4d2d34bbe1952b1de9cfdf6c", "parents": [ "3ff5f385b1449a07372d51fb89ca94dbfb6a3be2" ], "author": { "name": "Alex Elder", "email": "elder@inktank.com", "time": "Fri Feb 15 22:10:17 2013 -0600" }, "committer": { "name": "Sage Weil", "email": "sage@inktank.com", "time": "Wed May 01 21:14:23 2013 -0700" }, "message": "libceph: make ceph_msg-\u003ebio_seg be unsigned\n\nThe bio_seg field is used by the ceph messenger in iterating through\na bio. It should never have a negative value, so make it an\nunsigned. (I contemplated making it unsigned short to match the\nstruct bio definition, but it offered no benefit.)\n\nChange variables used to hold bio_seg values to all be unsigned as\nwell. Change two variable names in init_bio_iter() to match the\nconvention used everywhere else.\n\nSigned-off-by: Alex Elder \u003celder@inktank.com\u003e\nReviewed-by: Josh Durgin \u003cjosh.durgin@inktank.com\u003e\n" }, { "commit": "830ac8524f301da8867400777d5c19e6d01ec525", "tree": "8d8588c66e9d424973304a84e6857d1a87695eaa", "parents": [ "db93f8b42036bd60d95e8d28ee98b308d5846b9f", "157752d84f5df47e01577970f9c5f61a0b9f4546" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Sat Apr 20 18:40:36 2013 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Sat Apr 20 18:40:36 2013 -0700" }, "message": "Merge branch \u0027x86-kdump-for-linus\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip\n\nPull kdump fixes from Peter Anvin:\n \"The kexec/kdump people have found several problems with the support\n for loading over 4 GiB that was introduced in this merge cycle. This\n is partly due to a number of design problems inherent in the way the\n various pieces of kdump fit together (it is pretty horrifically manual\n in many places.)\n\n After a *lot* of iterations this is the patchset that was agreed upon,\n but of course it is now very late in the cycle. However, because it\n changes both the syntax and semantics of the crashkernel option, it\n would be desirable to avoid a stable release with the broken\n interfaces.\"\n\nI\u0027m not happy with the timing, since originally the plan was to release\nthe final 3.9 tomorrow. But apparently I\u0027m doing an -rc8 instead...\n\n* \u0027x86-kdump-for-linus\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip:\n kexec: use Crash kernel for Crash kernel low\n x86, kdump: Change crashkernel_high/low\u003d to crashkernel\u003d,high/low\n x86, kdump: Retore crashkernel\u003d to allocate under 896M\n x86, kdump: Set crashkernel_low automatically\n" }, { "commit": "db93f8b42036bd60d95e8d28ee98b308d5846b9f", "tree": "e98018a262346250f9bf8ff68b80132a94fd18ab", "parents": [ "8c3a13c84b90f2551b646ff2956ac68bef69a810", "c0a9f451e4e7ecd2ad1a6c27ea5c31d0226bdddf" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Sat Apr 20 18:38:48 2013 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Sat Apr 20 18:38:48 2013 -0700" }, "message": "Merge branch \u0027x86-urgent-for-linus\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip\n\nPull x86 fixes from Peter Anvin:\n \"Three groups of fixes:\n\n 1. Make sure we don\u0027t execute the early microcode patching if family\n \u003c 6, since it would touch MSRs which don\u0027t exist on those\n families, causing crashes.\n\n 2. The Xen partial emulation of HyperV can be dealt with more\n gracefully than just disabling the driver.\n\n 3. More EFI variable space magic. In particular, variables hidden\n from runtime code need to be taken into account too.\"\n\n* \u0027x86-urgent-for-linus\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip:\n x86, microcode: Verify the family before dispatching microcode patching\n x86, hyperv: Handle Xen emulation of Hyper-V more gracefully\n x86,efi: Implement efi_no_storage_paranoia parameter\n efi: Export efi_query_variable_store() for efivars.ko\n x86/Kconfig: Make EFI select UCS2_STRING\n efi: Distinguish between \"remaining space\" and actually used space\n efi: Pass boot services variable info to runtime code\n Move utf16 functions to kernel core and rename\n x86,efi: Check max_size only if it is non-zero.\n x86, efivars: firmware bug workarounds should be in platform code\n" }, { "commit": "c437d888c72a9dd5b7bf212ec3ecc824307e846c", "tree": "90f319823c124794e51409c5105d7c9152d6663b", "parents": [ "f068f5e158a9daf568aac97e89dcdbc0a38d8a83", "83f1b4ba917db5dc5a061a44b3403ddb6e783494" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Sat Apr 20 18:21:05 2013 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Sat Apr 20 18:21:05 2013 -0700" }, "message": "Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net\n\nPull networking updates from David Miller:\n\n 1) ax88796 does 64-bit divides which causes link errors on ARM, fix\n from Arnd Bergmann.\n\n 2) Once an improper offload setting is detected on an SKB we don\u0027t rate\n limit the log message so we can very easily live lock. From Ben\n Greear.\n\n 3) Openvswitch cannot report vport configuration changes reliably\n because it didn\u0027t preallocate the netlink notification message\n before changing state. From Jesse Gross.\n\n 4) The effective UID/GID SCM credentials fix, from Linus.\n\n 5) When a user explicitly asks for wireless authentication, cfg80211\n isn\u0027t told about the AP detachment leaving inconsistent state. Fix\n from Johannes Berg.\n\n 6) Fix self-MAC checks in batman-adv on multi-mesh nodes, from Antonio\n Quartulli.\n\n 7) Revert build_skb() change sin IGB driver, can result in memory\n corruption. From Alexander Duyck.\n\n 8) Fix setting VLANs on virtual functions in IXGBE, from Greg Rose.\n\n 9) Fix TSO races in qlcnic driver, from Sritej Velaga.\n\n10) In bnx2x the kernel driver and UNDI firmware can try to program the\n chip at the same time, resulting in corruption. Add proper\n synchronization. From Dmitry Kravkov.\n\n11) Fix corruption of status block in firmware ram in bxn2x, from Ariel\n Elior.\n\n12) Fix load balancing hash regression of bonding driver in forwarding\n configurations, from Eric Dumazet.\n\n13) Fix TS ECR regression in TCP by calling tcp_replace_ts_recent() in\n all the right spots, from Eric Dumazet.\n\n14) Fix several bonding bugs having to do with address manintainence,\n including not removing address when configuration operations\n encounter errors, missed locking on the address lists, missing\n refcounting on VLAN objects, etc. All from Nikolay Aleksandrov.\n\n15) Add workarounds for firmware bugs in LTE qmi_wwan devices, wherein\n the devices fail to add a proper ethernet header while on LTE\n networks but otherwise properly do so on 2G and 3G ones. From Bjørn\n Mork.\n\n* git://git.kernel.org/pub/scm/linux/kernel/git/davem/net: (38 commits)\n net: fix incorrect credentials passing\n net: rate-limit warn-bad-offload splats.\n net: ax88796: avoid 64 bit arithmetic\n qlge: Update version to 1.00.00.32.\n qlge: Fix ethtool autoneg advertising.\n qlge: Fix receive path to drop error frames\n net: qmi_wwan: prevent duplicate mac address on link (firmware bug workaround)\n net: qmi_wwan: fixup destination address (firmware bug workaround)\n net: qmi_wwan: fixup missing ethernet header (firmware bug workaround)\n bonding: in bond_mc_swap() bond\u0027s mc addr list is walked without lock\n bonding: disable netpoll on enslave failure\n bonding: primary_slave \u0026 curr_active_slave are not cleaned on enslave failure\n bonding: vlans don\u0027t get deleted on enslave failure\n bonding: mc addresses don\u0027t get deleted on enslave failure\n pkt_sched: fix error return code in fw_change_attrs()\n irda: small read past the end of array in debug code\n tcp: call tcp_replace_ts_recent() from tcp_ack()\n netfilter: xt_rpfilter: skip locally generated broadcast/multicast, too\n netfilter: ipset: bitmap:ip,mac: fix listing with timeout\n bonding: fix l23 and l34 load balancing in forwarding path\n ...\n" }, { "commit": "c0a9f451e4e7ecd2ad1a6c27ea5c31d0226bdddf", "tree": "dcb22c46c33a994db115ec8925093f91f6463f15", "parents": [ "74c3e3fcf350b2e7e3eaf9550528ee3f74e44b37", "8c58bf3eec3b8fc8162fe557e9361891c20758f2" ], "author": { "name": "H. Peter Anvin", "email": "hpa@linux.intel.com", "time": "Fri Apr 19 17:09:03 2013 -0700" }, "committer": { "name": "H. Peter Anvin", "email": "hpa@linux.intel.com", "time": "Fri Apr 19 17:09:03 2013 -0700" }, "message": "Merge remote-tracking branch \u0027efi/urgent\u0027 into x86/urgent\n\nMatt Fleming (1):\n x86, efivars: firmware bug workarounds should be in platform\n code\n\nMatthew Garrett (3):\n Move utf16 functions to kernel core and rename\n efi: Pass boot services variable info to runtime code\n efi: Distinguish between \"remaining space\" and actually used\n space\n\nRichard Weinberger (2):\n x86,efi: Check max_size only if it is non-zero.\n x86,efi: Implement efi_no_storage_paranoia parameter\n\nSergey Vlasov (2):\n x86/Kconfig: Make EFI select UCS2_STRING\n efi: Export efi_query_variable_store() for efivars.ko\n\nSigned-off-by: H. Peter Anvin \u003chpa@linux.intel.com\u003e\n" }, { "commit": "5a22483e5a2109cf678580d2bf769b0e69966a24", "tree": "a07f98966dee600511efa37ef1671b5f36ab0c9b", "parents": [ "ea2f2fa143ead1a9bf5ce87a3abe403694fe6d78", "f09a878511997c25a76bf111a32f6b8345a701a5" ], "author": { "name": "John W. Linville", "email": "linville@tuxdriver.com", "time": "Thu Apr 18 15:01:30 2013 -0400" }, "committer": { "name": "John W. Linville", "email": "linville@tuxdriver.com", "time": "Thu Apr 18 15:01:30 2013 -0400" }, "message": "Merge branch \u0027master\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless into for-davem\n" }, { "commit": "0a82a8d132b26d438eb90b3ab35a7016e7227a1d", "tree": "ee01c8dd1db41aaa1d2acfd47330e488f8573c9b", "parents": [ "5c51543b0ae45967cfa99ca16748dc72888cc265" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Thu Apr 18 09:00:26 2013 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Thu Apr 18 09:00:26 2013 -0700" }, "message": "Revert \"block: add missing block_bio_complete() tracepoint\"\n\nThis reverts commit 3a366e614d0837d9fc23f78cdb1a1186ebc3387f.\n\nWanlong Gao reports that it causes a kernel panic on his machine several\nminutes after boot. Reverting it removes the panic.\n\nJens says:\n \"It\u0027s not quite clear why that is yet, so I think we should just revert\n the commit for 3.9 final (which I\u0027m assuming is pretty close).\n\n The wifi is crap at the LSF hotel, so sending this email instead of\n queueing up a revert and pull request.\"\n\nReported-by: Wanlong Gao \u003cgaowanlong@cn.fujitsu.com\u003e\nRequested-by: Jens Axboe \u003caxboe@kernel.dk\u003e\nCc: Tejun Heo \u003ctj@kernel.org\u003e\nCc: Steven Rostedt \u003crostedt@goodmis.org\u003e\nSigned-off-by: Linus Torvalds \u003ctorvalds@linux-foundation.org\u003e\n" }, { "commit": "55a20ee7804ab64ac90bcdd4e2868a42829e2784", "tree": "ae8701054b3da8ac5d46d1cbdbb9c67a5ebd0591", "parents": [ "c729de8fcea37a1c444e81857eace12494c804a9" ], "author": { "name": "Yinghai Lu", "email": "yinghai@kernel.org", "time": "Mon Apr 15 22:23:47 2013 -0700" }, "committer": { "name": "H. Peter Anvin", "email": "hpa@linux.intel.com", "time": "Wed Apr 17 12:35:33 2013 -0700" }, "message": "x86, kdump: Retore crashkernel\u003d to allocate under 896M\n\nVivek found old kexec-tools does not work new kernel anymore.\n\nSo change back crashkernel\u003d back to old behavoir, and add crashkernel_high\u003d\nto let user decide if buffer could be above 4G, and also new kexec-tools will\nbe needed.\n\n-v2: let crashkernel\u003dX override crashkernel_high\u003d\n update description about _high will be ignored by crashkernel\u003dX\n-v3: update description about kernel-parameters.txt according to Vivek.\n\nSigned-off-by: Yinghai Lu \u003cyinghai@kernel.org\u003e\nLink: http://lkml.kernel.org/r/1366089828-19692-4-git-send-email-yinghai@kernel.org\nAcked-by: Vivek Goyal \u003cvgoyal@redhat.com\u003e\nSigned-off-by: H. Peter Anvin \u003chpa@linux.intel.com\u003e\n" }, { "commit": "c729de8fcea37a1c444e81857eace12494c804a9", "tree": "9400f7626dcbb7038b524ac2ea73315e6a0b6e55", "parents": [ "41ef2d5678d83af030125550329b6ae8b74618fa" ], "author": { "name": "Yinghai Lu", "email": "yinghai@kernel.org", "time": "Mon Apr 15 22:23:45 2013 -0700" }, "committer": { "name": "H. Peter Anvin", "email": "hpa@linux.intel.com", "time": "Wed Apr 17 12:35:32 2013 -0700" }, "message": "x86, kdump: Set crashkernel_low automatically\n\nChao said that kdump does does work well on his system on 3.8\nwithout extra parameter, even iommu does not work with kdump.\nAnd now have to append crashkernel_low\u003dY in first kernel to make\nkdump work.\n\nWe have now modified crashkernel\u003dX to allocate memory beyong 4G (if\navailable) and do not allocate low range for crashkernel if the user\ndoes not specify that with crashkernel_low\u003dY. This causes regression\nif iommu is not enabled. Without iommu, swiotlb needs to be setup in\nfirst 4G and there is no low memory available to second kernel.\n\nSet crashkernel_low automatically if the user does not specify that.\n\nFor system that does support IOMMU with kdump properly, user could\nspecify crashkernel_low\u003d0 to save that 72M low ram.\n\n-v3: add swiotlb_size() according to Konrad.\n-v4: add comments what 8M is for according to hpa.\n also update more crashkernel_low\u003d in kernel-parameters.txt\n-v5: update changelog according to Vivek.\n-v6: Change description about swiotlb referring according to HATAYAMA.\n\nReported-by: WANG Chao \u003cchaowang@redhat.com\u003e\nTested-by: WANG Chao \u003cchaowang@redhat.com\u003e\nSigned-off-by: Yinghai Lu \u003cyinghai@kernel.org\u003e\nLink: http://lkml.kernel.org/r/1366089828-19692-2-git-send-email-yinghai@kernel.org\nAcked-by: Vivek Goyal \u003cvgoyal@redhat.com\u003e\nSigned-off-by: H. Peter Anvin \u003chpa@linux.intel.com\u003e\n" }, { "commit": "fca83168aae6fa0c36a923ef99311587ad5b54f2", "tree": "b6118d7d0fc56cf819ca69c63983aea999109ee4", "parents": [ "4f2e29031e6c67802e7370292dd050fd62f337ee", "361cd29cf9363505c2a35bbf9a034a22feebfb07" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Wed Apr 17 08:50:59 2013 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Wed Apr 17 08:50:59 2013 -0700" }, "message": "Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net\n\nPull networking fixes from David Miller:\n\n 1) Fix erroneous netfilter drop of SIP packets generated by some Cisco\n phones, from Patrick McHardy.\n\n 2) Fix netfilter IPSET refcounting in list_set_add(), from Jozsef\n Kadlecsik.\n\n 3) Fix TCP syncookies route lookup key, we don\u0027t use the same values we\n would use for the usual SYN receive processing, from Dmitry Popov.\n\n 4) Fix NULL deref in bond_slave_netdev_event(), from Nikolay\n Aleksandrov.\n\n 5) When bonding enslave fails, we can forget to clear the IFF_BONDING\n bit, fix also from Nikolay Aleksandrov.\n\n 6) skb-\u003ecsum_start is 16-bits, which is almost always just fine. But\n if we reallocate the headroom of an SKB this can push the\n skb-\u003ecsum_start value outside of it\u0027s valid range. This can easily\n happen when collapsing multiple SKBs from the retransmit queue\n together.\n\n Fix from Thomas Graf.\n\n 7) Fix NULL deref in be2net driver due to missing check of\n __vlan_put_tag() return value, from Ivan Vecera.\n\n 8) tun_set_iff() returns zero instead of error code on failure, fix\n from Wei Yongjun.\n\n 9) Like GARP, 802 MRP needs to hold the app-\u003elock when adding MAD\n events and queueing PDUs. Fix from David Ward.\n\n10) Build fix, MVMDIO needs PHYLIB, from Thomas Petazzoni..\n\n11) Fix mac80211 static with ipv6 modular build, from Cong Wang.\n\n12) If userland specifies a path cost explicitly, do not override it\n when the carrier state changes. From Stephen Hemminger.\n\n13) mvnets calculates the TX queue to use incorrectly resulting in\n garbage pointer derefs and crashes, fix from Willy Tarreau.\n\n14) cdc_mbim does erroneous sizeof(ETH_HLEN). Fix from Bjorn Mork.\n\n15) IP fragmentation can leak a refcount-less route out from an RCU\n protected section. This results in crashes and all sorts of hard to\n diagnose behavior. Fix from Eric Dumazet.\n\n* git://git.kernel.org/pub/scm/linux/kernel/git/davem/net: (24 commits)\n qlcnic: fix beaconing test for 82xx adapter\n net: drop dst before queueing fragments\n net: fec: fix regression in link change accounting\n net: cdc_mbim: remove bogus sizeof()\n drivers: net: ethernet: cpsw: get slave VLAN id from slave node instead of cpsw node\n net: mvneta: fix improper tx queue usage in mvneta_tx()\n esp4: fix error return code in esp_output()\n bridge: make user modified path cost sticky\n ipv6: statically link register_inet6addr_notifier()\n net: mvmdio: add select PHYLIB\n net/802/mrp: fix possible race condition when calling mrp_pdu_queue()\n tuntap: fix error return code in tun_set_iff()\n be2net: take care of __vlan_put_tag return value\n can: sja1000: fix handling on dt properties on little endian systems\n can: mcp251x: add missing IRQF_ONESHOT to request_threaded_irq\n netfilter: nf_nat: fix race when unloading protocol modules\n tcp: Reallocate headroom if it would overflow csum_start\n stmmac: prevent interrupt loop with MMC RX IPC Counter\n bonding: IFF_BONDING is not stripped on enslave failure\n bonding: fix netdev event NULL pointer dereference\n ...\n" }, { "commit": "b4cbb197c7e7a68dbad0d491242e3ca67420c13e", "tree": "7837f65dc0b03d8e84ed5aa6af02bc26e5a210f1", "parents": [ "bb33db7a076f4719dc68c235e187dd4bfb16b621" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Tue Apr 16 13:45:37 2013 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Tue Apr 16 16:45:45 2013 -0700" }, "message": "vm: add vm_iomap_memory() helper function\n\nVarious drivers end up replicating the code to mmap() their memory\nbuffers into user space, and our core memory remapping function may be\nvery flexible but it is unnecessarily complicated for the common cases\nto use.\n\nOur internal VM uses pfn\u0027s (\"page frame numbers\") which simplifies\nthings for the VM, and allows us to pass physical addresses around in a\ndenser and more efficient format than passing a \"phys_addr_t\" around,\nand having to shift it up and down by the page size. But it just means\nthat drivers end up doing that shifting instead at the interface level.\n\nIt also means that drivers end up mucking around with internal VM things\nlike the vma details (vm_pgoff, vm_start/end) way more than they really\nneed to.\n\nSo this just exports a function to map a certain physical memory range\ninto user space (using a phys_addr_t based interface that is much more\nnatural for a driver) and hides all the complexity from the driver.\nSome drivers will still end up tweaking the vm_page_prot details for\nthings like prefetching or cacheability etc, but that\u0027s actually\nrelevant to the driver, rather than caring about what the page offset of\nthe mapping is into the particular IO memory region.\n\nAcked-by: Greg Kroah-Hartman \u003cgregkh@linuxfoundation.org\u003e\nSigned-off-by: Linus Torvalds \u003ctorvalds@linux-foundation.org\u003e\n" }, { "commit": "0635eb8a54cf0fea64b174bb68bc36b9c3d622db", "tree": "9430096d286e5da9044ab7e6cb85bdaca07c9717", "parents": [ "7791c8423f1f7f4dad94e753bae67461d5b80be8" ], "author": { "name": "Matthew Garrett", "email": "matthew.garrett@nebula.com", "time": "Mon Apr 15 13:09:45 2013 -0700" }, "committer": { "name": "Matt Fleming", "email": "matt.fleming@intel.com", "time": "Mon Apr 15 21:23:03 2013 +0100" }, "message": "Move utf16 functions to kernel core and rename\n\nWe want to be able to use the utf16 functions that are currently present\nin the EFI variables code in platform-specific code as well. Move them to\nthe kernel core, and in the process rename them to accurately describe what\nthey do - they don\u0027t handle UTF16, only UCS2.\n\nSigned-off-by: Matthew Garrett \u003cmatthew.garrett@nebula.com\u003e\nSigned-off-by: Matt Fleming \u003cmatt.fleming@intel.com\u003e\n" }, { "commit": "bb33db7a076f4719dc68c235e187dd4bfb16b621", "tree": "495a618502af9a6a0df4dd8d410a850e744af60b", "parents": [ "41ef2d5678d83af030125550329b6ae8b74618fa", "84cc8fd2fe65866e49d70b38b3fdf7219dd92fe0", "bad9a43a20372a3b41e15e8aa03b918c76f360f0", "f2530dc71cf0822f90bb63ea4600caaef33a66bb" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Mon Apr 15 07:03:01 2013 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Mon Apr 15 07:03:01 2013 -0700" }, "message": "Merge branches \u0027timers-urgent-for-linus\u0027, \u0027irq-urgent-for-linus\u0027 and \u0027core-urgent-for-linus\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip\n\nPull {timer,irq,core} fixes from Thomas Gleixner:\n\n - timer: bug fix for a cpu hotplug race.\n\n - irq: single bugfix for a wrong return value, which prevents the\n calling function to invoke the software fallback.\n\n - core: bugfix which plugs two race confitions which can cause hotplug\n per cpu threads to end up on the wrong cpu.\n\n* \u0027timers-urgent-for-linus\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip:\n hrtimer: Don\u0027t reinitialize a cpu_base lock on CPU_UP\n\n* \u0027irq-urgent-for-linus\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip:\n irqchip: gic: fix irq_trigger return\n\n* \u0027core-urgent-for-linus\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip:\n kthread: Prevent unpark race which puts threads on the wrong cpu\n" }, { "commit": "3c91930f0cbd54d522d8844b221c36199a2dc11e", "tree": "b505e2c70afd0dcf8704bfdd91e3d5011f7ccc46", "parents": [ "935d8aabd4331f47a89c3e1daa5779d23cf244ee", "7f49ef69db6bbf756c0abca7e9b65b32e999eec8" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Sun Apr 14 10:50:55 2013 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Sun Apr 14 10:50:55 2013 -0700" }, "message": "Merge tag \u0027trace-fixes-v3.9-rc-v3\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/rostedt/linux-trace\n\nPull ftrace fixes from Steven Rostedt:\n \"Namhyung Kim found and fixed a bug that can crash the kernel by simply\n doing: echo 1234 | tee -a /sys/kernel/debug/tracing/set_ftrace_pid\n\n Luckily, this can only be done by root, but still is a nasty bug.\"\n\n* tag \u0027trace-fixes-v3.9-rc-v3\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/rostedt/linux-trace:\n ftrace: Move ftrace_filter_lseek out of CONFIG_DYNAMIC_FTRACE section\n tracing: Fix possible NULL pointer dereferences\n" }, { "commit": "935d8aabd4331f47a89c3e1daa5779d23cf244ee", "tree": "8fff6fba14f11a55cea7a9fd3adc2e8d418b4ee1", "parents": [ "5b55d708335a9e3e4f61f2dadf7511502205ccd1" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Sun Apr 14 10:06:31 2013 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Sun Apr 14 10:06:31 2013 -0700" }, "message": "Add file_ns_capable() helper function for open-time capability checking\n\nNothing is using it yet, but this will allow us to delay the open-time\nchecks to use time, without breaking the normal UNIX permission\nsemantics where permissions are determined by the opener (and the file\ndescriptor can then be passed to a different process, or the process can\ndrop capabilities).\n\nSigned-off-by: Linus Torvalds \u003ctorvalds@linux-foundation.org\u003e\n" }, { "commit": "7f49ef69db6bbf756c0abca7e9b65b32e999eec8", "tree": "a98bda9589c09a84bedf6346e2acdae605fc9fb9", "parents": [ "6a76f8c0ab19f215af2a3442870eeb5f0e81998d" ], "author": { "name": "Steven Rostedt (Red Hat)", "email": "rostedt@goodmis.org", "time": "Fri Apr 12 16:40:13 2013 -0400" }, "committer": { "name": "Steven Rostedt", "email": "rostedt@goodmis.org", "time": "Fri Apr 12 17:12:41 2013 -0400" }, "message": "ftrace: Move ftrace_filter_lseek out of CONFIG_DYNAMIC_FTRACE section\n\nAs ftrace_filter_lseek is now used with ftrace_pid_fops, it needs to\nbe moved out of the #ifdef CONFIG_DYNAMIC_FTRACE section as the\nftrace_pid_fops is defined when DYNAMIC_FTRACE is not.\n\nCc: stable@vger.kernel.org\nCc: Namhyung Kim \u003cnamhyung@kernel.org\u003e\nSigned-off-by: Steven Rostedt \u003crostedt@goodmis.org\u003e\n" }, { "commit": "6a76f8c0ab19f215af2a3442870eeb5f0e81998d", "tree": "551f1c13779323e06b8ef906192ba7a5d87aa7b6", "parents": [ "83e03b3fe4daffdebbb42151d5410d730ae50bd1" ], "author": { "name": "Namhyung Kim", "email": "namhyung.kim@lge.com", "time": "Thu Apr 11 15:55:01 2013 +0900" }, "committer": { "name": "Steven Rostedt", "email": "rostedt@goodmis.org", "time": "Fri Apr 12 14:43:34 2013 -0400" }, "message": "tracing: Fix possible NULL pointer dereferences\n\nCurrently set_ftrace_pid and set_graph_function files use seq_lseek\nfor their fops. However seq_open() is called only for FMODE_READ in\nthe fops-\u003eopen() so that if an user tries to seek one of those file\nwhen she open it for writing, it sees NULL seq_file and then panic.\n\nIt can be easily reproduced with following command:\n\n $ cd /sys/kernel/debug/tracing\n $ echo 1234 | sudo tee -a set_ftrace_pid\n\nIn this example, GNU coreutils\u0027 tee opens the file with fopen(, \"a\")\nand then the fopen() internally calls lseek().\n\nLink: http://lkml.kernel.org/r/1365663302-2170-1-git-send-email-namhyung@kernel.org\n\nCc: Frederic Weisbecker \u003cfweisbec@gmail.com\u003e\nCc: Ingo Molnar \u003cmingo@kernel.org\u003e\nCc: Namhyung Kim \u003cnamhyung.kim@lge.com\u003e\nCc: stable@vger.kernel.org\nSigned-off-by: Namhyung Kim \u003cnamhyung@kernel.org\u003e\nSigned-off-by: Steven Rostedt \u003crostedt@goodmis.org\u003e\n" }, { "commit": "8b5b8c29909b94a4f2969629722264b7ca947329", "tree": "b29c2de6d0903f6dc4d31dddd6491aa0c2c518dc", "parents": [ "50bceae9bd3569d56744882f3012734d48a1d413", "c2d421e171868586939c328dfb91bab840fe4c49" ], "author": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Fri Apr 12 14:26:39 2013 -0400" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Fri Apr 12 14:26:39 2013 -0400" }, "message": "Merge branch \u0027master\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/pablo/nf into netfilter\n\nPablo Neira Ayuso says:\n\n\u003d\u003d\u003d\u003d\u003d\u003d\u003d\u003d\u003d\u003d\u003d\u003d\u003d\u003d\u003d\u003d\u003d\u003d\u003d\u003d\nThe following patchset contains late netfilter fixes for your net\ntree, they are:\n\n* Don\u0027t drop segmented TCP packets in the SIP helper, we\u0027ve got reports\n from users that this was breaking communications when the SIP phone\n messages are larger than the MTU, from Patrick McHardy.\n\n* Fix refcount leak in the ipset list set, from Jozsef Kadlecsik.\n\n* On hash set resizing, the nomatch flag was lost, thus entirely inverting\n the logic of the set matching, from Jozsef Kadlecsik.\n\n* Fix crash on NAT modules removal. Timer expiration may race with the\n module cleanup exit path while deleting conntracks, from Florian\n Westphal.\n\u003d\u003d\u003d\u003d\u003d\u003d\u003d\u003d\u003d\u003d\u003d\u003d\u003d\u003d\u003d\u003d\u003d\u003d\u003d\u003d\n\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "f2530dc71cf0822f90bb63ea4600caaef33a66bb", "tree": "182473ca3a295cdbd907826aa22bae94c52fa486", "parents": [ "cfb63bafdb87bbcdc5d6dbbca623d3f69475f118" ], "author": { "name": "Thomas Gleixner", "email": "tglx@linutronix.de", "time": "Tue Apr 09 09:33:34 2013 +0200" }, "committer": { "name": "Thomas Gleixner", "email": "tglx@linutronix.de", "time": "Fri Apr 12 14:18:43 2013 +0200" }, "message": "kthread: Prevent unpark race which puts threads on the wrong cpu\n\nThe smpboot threads rely on the park/unpark mechanism which binds per\ncpu threads on a particular core. Though the functionality is racy:\n\nCPU0\t \t \tCPU1 \t \t CPU2\nunpark(T)\t\t\t\t wake_up_process(T)\n clear(SHOULD_PARK)\tT runs\n\t\t\tleave parkme() due to !SHOULD_PARK \n bind_to(CPU2)\t\tBUG_ON(wrong CPU)\t\t\t\t\t\t \n\nWe cannot let the tasks move themself to the target CPU as one of\nthose tasks is actually the migration thread itself, which requires\nthat it starts running on the target cpu right away.\n\nThe solution to this problem is to prevent wakeups in park mode which\nare not from unpark(). That way we can guarantee that the association\nof the task to the target cpu is working correctly.\n\nAdd a new task state (TASK_PARKED) which prevents other wakeups and\nuse this state explicitly for the unpark wakeup.\n\nPeter noticed: Also, since the task state is visible to userspace and\nall the parked tasks are still in the PID space, its a good hint in ps\nand friends that these tasks aren\u0027t really there for the moment.\n\nThe migration thread has another related issue.\n\nCPU0\t \t \t CPU1\nBring up CPU2\ncreate_thread(T)\npark(T)\n wait_for_completion()\n\t\t\t parkme()\n\t\t\t complete()\nsched_set_stop_task()\n\t\t\t schedule(TASK_PARKED)\n\nThe sched_set_stop_task() call is issued while the task is on the\nrunqueue of CPU1 and that confuses the hell out of the stop_task class\non that cpu. So we need the same synchronizaion before\nsched_set_stop_task().\n\nReported-by: Dave Jones \u003cdavej@redhat.com\u003e\nReported-and-tested-by: Dave Hansen \u003cdave@sr71.net\u003e\nReported-and-tested-by: Borislav Petkov \u003cbp@alien8.de\u003e\nAcked-by: Peter Ziljstra \u003cpeterz@infradead.org\u003e\nCc: Srivatsa S. Bhat \u003csrivatsa.bhat@linux.vnet.ibm.com\u003e\nCc: dhillf@gmail.com\nCc: Ingo Molnar \u003cmingo@kernel.org\u003e\nCc: stable@vger.kernel.org\nLink: http://lkml.kernel.org/r/alpine.LFD.2.02.1304091635430.21884@ionos\nSigned-off-by: Thomas Gleixner \u003ctglx@linutronix.de\u003e\n\n" }, { "commit": "fe2971a01762963c62e9872bfcf0632546342c0f", "tree": "eb4b2442b5fa5b1a98de7c3f7509c9749133a90a", "parents": [ "eb02db38ee6da074628685971042b847dee05d43", "6b07a24fc38476e04f591cc17594bc1835b9efdd" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Wed Apr 10 14:15:27 2013 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Wed Apr 10 14:15:27 2013 -0700" }, "message": "Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net\n\nPull networking fixes from David Miller:\n\n 1) cfg80211_conn_scan() must be called with the sched_scan_mutex, fix\n from Artem Savkov.\n\n 2) Fix regression in TCP ICMPv6 processing, we do not want to treat\n redirects as socket errors, from Christoph Paasch.\n\n 3) Fix several recvmsg() msg_name kernel memory leaks into userspace,\n in ATM, AX25, Bluetooth, CAIF, IRDA, s390 IUCV, L2TP, LLC, Netrom,\n NFC, Rose, TIPC, and VSOCK. From Mathias Krause and Wei Yongjun.\n\n 4) Fix AF_IUCV handling of segmented SKBs in recvmsg(), from Ursula\n Braun and Eric Dumazet.\n\n 5) CAN gw.c code does kfree() on SLAB cache memory, use\n kmem_cache_free() instead. Fix from Wei Yongjun.\n\n 6) Fix LSM regression on TCP SYN/ACKs, some LSMs such as SELINUX want\n an skb-\u003esk socket context available for these packets, but nothing\n else requires it. From Eric Dumazet and Paul Moore.\n\n 7) Fix ipv4 address lifetime processing so that we don\u0027t perform\n sleepable acts inside of rcu_read_lock() sections, do them in an\n rtnl_lock() section instead. From Jiri Pirko.\n\n 8) mvneta driver accidently sets HW features after device registry, it\n should do so beforehand. Fix from Willy Tarreau.\n\n 9) Fix bonding unload races more correctly, from Nikolay Aleksandrov\n and Veaceslav Falico.\n\n10) rtnl_dump_ifinfo() and rtnl_calcit() invoke nlmsg_parse() with wrong\n header size argument. Fix from Michael Riesch.\n\n* git://git.kernel.org/pub/scm/linux/kernel/git/davem/net: (44 commits)\n lsm: add the missing documentation for the security_skb_owned_by() hook\n bnx2x: Prevent null pointer dereference in AFEX mode\n e100: Add dma mapping error check\n selinux: add a skb_owned_by() hook\n can: gw: use kmem_cache_free() instead of kfree()\n netrom: fix invalid use of sizeof in nr_recvmsg()\n qeth: fix qeth_wait_for_threads() deadlock for OSN devices\n af_iucv: fix recvmsg by replacing skb_pull() function\n rtnetlink: Call nlmsg_parse() with correct header length\n bonding: fix bonding_masters race condition in bond unloading\n Revert \"bonding: remove sysfs before removing devices\"\n net: mvneta: enable features before registering the driver\n hyperv: Fix RNDIS send_completion code path\n hyperv: Fix a kernel warning from netvsc_linkstatus_callback()\n net: ipv4: fix schedule while atomic bug in check_lifetime()\n net: ipv4: reset check_lifetime_work after changing lifetime\n bnx2x: Fix KR2 rapid link flap\n sctp: remove \u0027sridhar\u0027 from maintainers list\n VSOCK: Fix missing msg_namelen update in vsock_stream_recvmsg()\n VSOCK: vmci - fix possible info leak in vmci_transport_dgram_dequeue()\n ...\n" }, { "commit": "6b07a24fc38476e04f591cc17594bc1835b9efdd", "tree": "6c8cb322a5782f7b6fae5e4c1bd7f7c2c55ec165", "parents": [ "fea75645342c7ad574214497a78e562db12dfd7b" ], "author": { "name": "Paul Moore", "email": "pmoore@redhat.com", "time": "Wed Apr 10 15:34:14 2013 -0400" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Wed Apr 10 15:40:39 2013 -0400" }, "message": "lsm: add the missing documentation for the security_skb_owned_by() hook\n\nUnfortunately we didn\u0027t catch the missing comments earlier when the\npatch was merged.\n\nSigned-off-by: Paul Moore \u003cpmoore@redhat.com\u003e\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "46fc4c909339f5a84d1679045297d9d2fb596987", "tree": "361fe36ee6dfe478112d10688d1bad7db49640bd", "parents": [ "25b5632fb35ca61b8ae3eee235edcdc2883f7a5e" ], "author": { "name": "Rafał Miłecki", "email": "zajec5@gmail.com", "time": "Tue Apr 02 15:57:26 2013 +0200" }, "committer": { "name": "John W. Linville", "email": "linville@tuxdriver.com", "time": "Wed Apr 10 10:31:26 2013 -0400" }, "message": "ssb: implement spurious tone avoidance\n\nAnd make use of it in b43. This fixes a regression introduced with\n49d55cef5b1925a5c1efb6aaddaa40fc7c693335\nb43: N-PHY: implement spurious tone avoidance\nThis commit made BCM4322 use only MCS 0 on channel 13, which of course\nresulted in performance drop (down to 0.7Mb/s).\n\nReported-by: Stefan Brüns \u003cstefan.bruens@rwth-aachen.de\u003e\nSigned-off-by: Rafał Miłecki \u003czajec5@gmail.com\u003e\nCc: Stable \u003cstable@vger.kernel.org\u003e\nSigned-off-by: John W. Linville \u003clinville@tuxdriver.com\u003e\n" }, { "commit": "e8f2b548de7ae65e17ee911e54712a3f26f69c60", "tree": "0b332c254088effc61d832f9e95d65861251214e", "parents": [ "43ecdb0d31cf63d99d060af0585bf59be7fafcb2", "e9c5d8a562f01b211926d70443378eb14b29a676" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Tue Apr 09 12:22:49 2013 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Tue Apr 09 12:22:49 2013 -0700" }, "message": "Merge branch \u0027for-linus\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs\n\nPull vfs fixes from Al Viro:\n \"A nasty bug in fs/namespace.c caught by Andrey + a couple of less\n serious unpleasantness - ecryptfs misc device playing hopeless games\n with try_module_get() and palinfo procfs support being... not quite\n correctly done, to be polite.\"\n\n* \u0027for-linus\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs:\n mnt: release locks on error path in do_loopback\n palinfo fixes\n procfs: add proc_remove_subtree()\n ecryptfs: close rmmod race\n" }, { "commit": "6eb4c7e96e19fd2c38a103472048fc0e0e0a3ec3", "tree": "b1a7a2ef0b8ec7771722beb75187199c04f31ebe", "parents": [ "02f815cb6d3f57914228be84df9613ee5a01c2e6" ], "author": { "name": "Jozsef Kadlecsik", "email": "kadlec@blackhole.kfki.hu", "time": "Tue Apr 09 08:57:20 2013 +0000" }, "committer": { "name": "Pablo Neira Ayuso", "email": "pablo@netfilter.org", "time": "Tue Apr 09 21:04:16 2013 +0200" }, "message": "netfilter: ipset: hash:*net*: nomatch flag not excluded on set resize\n\nIf a resize is triggered the nomatch flag is not excluded at hashing,\nwhich leads to the element missed at lookup in the resized set.\n\nSigned-off-by: Jozsef Kadlecsik \u003ckadlec@blackhole.kfki.hu\u003e\nSigned-off-by: Pablo Neira Ayuso \u003cpablo@netfilter.org\u003e\n" }, { "commit": "8ce584c7416d8a85a6f3edc17d1cddefe331e87e", "tree": "4fe64bd588ba8e2239cfa893e1bddb3e3b30c232", "parents": [ "52f21999c7b921a0390708b66ed286282c2e4bee" ], "author": { "name": "Al Viro", "email": "viro@zeniv.linux.org.uk", "time": "Sat Mar 30 20:13:46 2013 -0400" }, "committer": { "name": "Al Viro", "email": "viro@zeniv.linux.org.uk", "time": "Tue Apr 09 14:09:17 2013 -0400" }, "message": "procfs: add proc_remove_subtree()\n\njust what it sounds like; do that only to procfs subtrees you\u0027ve\ncreated - doing that to something shared with another driver is\nnot only antisocial, but might cause interesting races with\nproc_create() and its ilk.\n\nSigned-off-by: Al Viro \u003cviro@zeniv.linux.org.uk\u003e\n" }, { "commit": "386afc91144b36b42117b0092893f15bc8798a80", "tree": "1323fff10c28d7d802bb57d7e11e11907afe7cc0", "parents": [ "3e2e0d2c222bdf5bafd722dec1618fa6073ef372" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Tue Apr 09 10:48:33 2013 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Tue Apr 09 10:48:33 2013 -0700" }, "message": "spinlocks and preemption points need to be at least compiler barriers\n\nIn UP and non-preempt respectively, the spinlocks and preemption\ndisable/enable points are stubbed out entirely, because there is no\nregular code that can ever hit the kind of concurrency they are meant to\nprotect against.\n\nHowever, while there is no regular code that can cause scheduling, we\n_do_ end up having some exceptional (literally!) code that can do so,\nand that we need to make sure does not ever get moved into the critical\nregion by the compiler.\n\nIn particular, get_user() and put_user() is generally implemented as\ninline asm statements (even if the inline asm may then make a call\ninstruction to call out-of-line), and can obviously cause a page fault\nand IO as a result. If that inline asm has been scheduled into the\nmiddle of a preemption-safe (or spinlock-protected) code region, we\nobviously lose.\n\nNow, admittedly this is *very* unlikely to actually ever happen, and\nwe\u0027ve not seen examples of actual bugs related to this. But partly\nexactly because it\u0027s so hard to trigger and the resulting bug is so\nsubtle, we should be extra careful to get this right.\n\nSo make sure that even when preemption is disabled, and we don\u0027t have to\ngenerate any actual *code* to explicitly tell the system that we are in\na preemption-disabled region, we need to at least tell the compiler not\nto move things around the critical region.\n\nThis patch grew out of the same discussion that caused commits\n79e5f05edcbf (\"ARC: Add implicit compiler barrier to raw_local_irq*\nfunctions\") and 3e2e0d2c222b (\"tile: comment assumption about\n__insn_mtspr for \u003casm/irqflags.h\u003e\") to come about.\n\nNote for stable: use discretion when/if applying this. As mentioned,\nthis bug may never have actually bitten anybody, and gcc may never have\ndone the required code motion for it to possibly ever trigger in\npractice.\n\nCc: stable@vger.kernel.org\nCc: Steven Rostedt \u003csrostedt@redhat.com\u003e\nCc: Peter Zijlstra \u003cpeterz@infradead.org\u003e\nSigned-off-by: Linus Torvalds \u003ctorvalds@linux-foundation.org\u003e\n" }, { "commit": "ca10b9e9a8ca7342ee07065289cbe74ac128c169", "tree": "33842f41a127f9da904ddd5d61839590e986e420", "parents": [ "c802d759623acbd6e1ee9fbdabae89159a513913" ], "author": { "name": "Eric Dumazet", "email": "edumazet@google.com", "time": "Mon Apr 08 17:58:11 2013 +0000" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Tue Apr 09 13:23:11 2013 -0400" }, "message": "selinux: add a skb_owned_by() hook\n\nCommit 90ba9b1986b5ac (tcp: tcp_make_synack() can use alloc_skb())\nbroke certain SELinux/NetLabel configurations by no longer correctly\nassigning the sock to the outgoing SYNACK packet.\n\nCost of atomic operations on the LISTEN socket is quite big,\nand we would like it to happen only if really needed.\n\nThis patch introduces a new security_ops-\u003eskb_owned_by() method,\nthat is a void operation unless selinux is active.\n\nReported-by: Miroslav Vadkerti \u003cmvadkert@redhat.com\u003e\nDiagnosed-by: Paul Moore \u003cpmoore@redhat.com\u003e\nSigned-off-by: Eric Dumazet \u003cedumazet@google.com\u003e\nCc: \"David S. Miller\" \u003cdavem@davemloft.net\u003e\nCc: linux-security-module@vger.kernel.org\nAcked-by: James Morris \u003cjames.l.morris@oracle.com\u003e\nTested-by: Paul Moore \u003cpmoore@redhat.com\u003e\nAcked-by: Paul Moore \u003cpmoore@redhat.com\u003e\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "a6e4d5a03e9e3587e88aba687d8f225f4f04c792", "tree": "5159dd594f8c70ef964ec0fef74a6e8482f2606e", "parents": [ "ca0ba26fbbd2d81c43085df49ce0abfe34535a90" ], "author": { "name": "Matt Fleming", "email": "matt.fleming@intel.com", "time": "Mon Mar 25 09:14:30 2013 +0000" }, "committer": { "name": "Matt Fleming", "email": "matt.fleming@intel.com", "time": "Tue Apr 09 11:34:05 2013 +0100" }, "message": "x86, efivars: firmware bug workarounds should be in platform code\n\nLet\u0027s not burden ia64 with checks in the common efivars code that we\u0027re not\nwriting too much data to the variable store. That kind of thing is an x86\nfirmware bug, plain and simple.\n\nefi_query_variable_store() provides platforms with a wrapper in which they can\nperform checks and workarounds for EFI variable storage bugs.\n\nCc: H. Peter Anvin \u003chpa@zytor.com\u003e\nCc: Matthew Garrett \u003cmjg59@srcf.ucam.org\u003e\nSigned-off-by: Matt Fleming \u003cmatt.fleming@intel.com\u003e\n" }, { "commit": "f465d40d85fa49dd247035c87f519c7c949fbe1d", "tree": "d57fb3cfe2497afc01300e6dd0c23223d57a3ab7", "parents": [ "5f2f280f87fe9755dba915f1ade149840885fd91", "6d3bfc7be6f80d0c6ee6800d58d573343bf6e260" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Mon Apr 08 15:15:22 2013 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Mon Apr 08 15:15:22 2013 -0700" }, "message": "Merge tag \u0027upstream-linus\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/jgarzik/libata-dev\n\nPull libata fixes from Jeff Garzik:\n \"The HDIO_DRIVE_* fix is really the biggie.\n\n 1) Fix ATAPI regression, noticed mainly on tape drives, due to a\n commit which mistakenly changed an \u0027int\u0027 return type to a \u0027bool\u0027.\n Broken by commit 4dce8ba94c75 (\"libata: Use \u0027bool\u0027 return value for\n ata_id_XXX\")\n\n 2) Add Slimtype DVD A DS8A8SH ATAPI quirk\n\n 3) ata_piix: Intel Haswell platform quirk\n\n 4) Avoid DMA\u0027ing to stack buffer, when obtaining DEVSLP timings. IMO\n a mild regression, given that libata previously did not DMA to a\n stack buffer. Broken by commit commit 803739d25c23 (\"[libata]\n replace sata_settings with devslp_timing\")\n\n 5) Fix regression impacting SMART and smartd, broken by commit\n 84a9a8cd9d0a (\"[libata] Set proper SK when CK_COND is set\")\"\n\n* tag \u0027upstream-linus\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/jgarzik/libata-dev:\n [libata] Fix HDIO_DRIVE_* ioctl() Linux 3.9 regression\n libata: fix DMA to stack in reading devslp_timing parameters\n ata_piix: Fix DVD not dectected at some Haswell platforms\n libata: Set max sector to 65535 for Slimtype DVD A DS8A8SH drive\n libata: Use integer return value for atapi_command_packet_set\n" }, { "commit": "5f2f280f87fe9755dba915f1ade149840885fd91", "tree": "31c8564dfd1fcb0ea0023a23c3aefd8108d7b2de", "parents": [ "31880c37c11e28cb81c70757e38392b42e695dc6", "395b97a3aeff0b8d949ee3e67bf8c11c5ffd6861" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Mon Apr 08 15:14:11 2013 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Mon Apr 08 15:14:11 2013 -0700" }, "message": "Merge tag \u0027trace-fixes-3.9-rc6\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/rostedt/linux-trace\n\nPull tracing fixes from Steven Rostedt:\n \"This includes three fixes. Two fix features added in 3.9 and one\n fixes a long time minor bug.\n\n The first patch fixes a race that can happen if the user switches from\n the irqsoff tracer to another tracer. If a irqs off latency is\n detected, it will try to use the snapshot buffer, but the new tracer\n wont have it allocated. There\u0027s a nasty warning that gets printed and\n the trace is ignored. Nothing crashes, just a nasty WARN_ON is shown.\n\n The second patch fixes an issue where if the sysctl is used to disable\n and enable function tracing, it can put the function tracing into an\n unstable state.\n\n The third patch fixes an issue with perf using the function tracer.\n An update was done, where the stub function could be called during the\n perf function tracing, and that stub function wont have the \"control\"\n flag set and cause a nasty warning when running perf.\"\n\n* tag \u0027trace-fixes-3.9-rc6\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/rostedt/linux-trace:\n ftrace: Do not call stub functions in control loop\n ftrace: Consistently restore trace function on sysctl enabling\n tracing: Fix race with update_max_tr_single and changing tracers\n" }, { "commit": "395b97a3aeff0b8d949ee3e67bf8c11c5ffd6861", "tree": "719c1519cc536a5ec0118b107f0edc90bd312fe6", "parents": [ "5000c418840b309251c5887f0b56503aae30f84c" ], "author": { "name": "Steven Rostedt (Red Hat)", "email": "rostedt@goodmis.org", "time": "Wed Mar 27 09:31:28 2013 -0400" }, "committer": { "name": "Steven Rostedt", "email": "rostedt@rostedt.homelinux.com", "time": "Mon Apr 08 12:24:23 2013 -0400" }, "message": "ftrace: Do not call stub functions in control loop\n\nThe function tracing control loop used by perf spits out a warning\nif the called function is not a control function. This is because\nthe control function references a per cpu allocated data structure\non struct ftrace_ops that is not allocated for other types of\nfunctions.\n\ncommit 0a016409e42 \"ftrace: Optimize the function tracer list loop\"\n\nHad an optimization done to all function tracing loops to optimize\nfor a single registered ops. Unfortunately, this allows for a slight\nrace when tracing starts or ends, where the stub function might be\ncalled after the current registered ops is removed. In this case we\nget the following dump:\n\nroot# perf stat -e ftrace:function sleep 1\n[ 74.339105] WARNING: at include/linux/ftrace.h:209 ftrace_ops_control_func+0xde/0xf0()\n[ 74.349522] Hardware name: PRIMERGY RX200 S6\n[ 74.357149] Modules linked in: sg igb iTCO_wdt ptp pps_core iTCO_vendor_support i7core_edac dca lpc_ich i2c_i801 coretemp edac_core crc32c_intel mfd_core ghash_clmulni_intel dm_multipath acpi_power_meter pcspk\nr microcode vhost_net tun macvtap macvlan nfsd kvm_intel kvm auth_rpcgss nfs_acl lockd sunrpc uinput xfs libcrc32c sd_mod crc_t10dif sr_mod cdrom mgag200 i2c_algo_bit drm_kms_helper ttm qla2xxx mptsas ahci drm li\nbahci scsi_transport_sas mptscsih libata scsi_transport_fc i2c_core mptbase scsi_tgt dm_mirror dm_region_hash dm_log dm_mod\n[ 74.446233] Pid: 1377, comm: perf Tainted: G W 3.9.0-rc1 #1\n[ 74.453458] Call Trace:\n[ 74.456233] [\u003cffffffff81062e3f\u003e] warn_slowpath_common+0x7f/0xc0\n[ 74.462997] [\u003cffffffff810fbc60\u003e] ? rcu_note_context_switch+0xa0/0xa0\n[ 74.470272] [\u003cffffffff811041a2\u003e] ? __unregister_ftrace_function+0xa2/0x1a0\n[ 74.478117] [\u003cffffffff81062e9a\u003e] warn_slowpath_null+0x1a/0x20\n[ 74.484681] [\u003cffffffff81102ede\u003e] ftrace_ops_control_func+0xde/0xf0\n[ 74.491760] [\u003cffffffff8162f400\u003e] ftrace_call+0x5/0x2f\n[ 74.497511] [\u003cffffffff8162f400\u003e] ? ftrace_call+0x5/0x2f\n[ 74.503486] [\u003cffffffff8162f400\u003e] ? ftrace_call+0x5/0x2f\n[ 74.509500] [\u003cffffffff810fbc65\u003e] ? synchronize_sched+0x5/0x50\n[ 74.516088] [\u003cffffffff816254d5\u003e] ? _cond_resched+0x5/0x40\n[ 74.522268] [\u003cffffffff810fbc65\u003e] ? synchronize_sched+0x5/0x50\n[ 74.528837] [\u003cffffffff811041a2\u003e] ? __unregister_ftrace_function+0xa2/0x1a0\n[ 74.536696] [\u003cffffffff816254d5\u003e] ? _cond_resched+0x5/0x40\n[ 74.542878] [\u003cffffffff8162402d\u003e] ? mutex_lock+0x1d/0x50\n[ 74.548869] [\u003cffffffff81105c67\u003e] unregister_ftrace_function+0x27/0x50\n[ 74.556243] [\u003cffffffff8111eadf\u003e] perf_ftrace_event_register+0x9f/0x140\n[ 74.563709] [\u003cffffffff816254d5\u003e] ? _cond_resched+0x5/0x40\n[ 74.569887] [\u003cffffffff8162402d\u003e] ? mutex_lock+0x1d/0x50\n[ 74.575898] [\u003cffffffff8111e94e\u003e] perf_trace_destroy+0x2e/0x50\n[ 74.582505] [\u003cffffffff81127ba9\u003e] tp_perf_event_destroy+0x9/0x10\n[ 74.589298] [\u003cffffffff811295d0\u003e] free_event+0x70/0x1a0\n[ 74.595208] [\u003cffffffff8112a579\u003e] perf_event_release_kernel+0x69/0xa0\n[ 74.602460] [\u003cffffffff816254d5\u003e] ? _cond_resched+0x5/0x40\n[ 74.608667] [\u003cffffffff8112a640\u003e] put_event+0x90/0xc0\n[ 74.614373] [\u003cffffffff8112a740\u003e] perf_release+0x10/0x20\n[ 74.620367] [\u003cffffffff811a3044\u003e] __fput+0xf4/0x280\n[ 74.625894] [\u003cffffffff811a31de\u003e] ____fput+0xe/0x10\n[ 74.631387] [\u003cffffffff81083697\u003e] task_work_run+0xa7/0xe0\n[ 74.637452] [\u003cffffffff81014981\u003e] do_notify_resume+0x71/0xb0\n[ 74.643843] [\u003cffffffff8162fa92\u003e] int_signal+0x12/0x17\n\nTo fix this a new ftrace_ops flag is added that denotes the ftrace_list_end\nftrace_ops stub as just that, a stub. This flag is now checked in the\ncontrol loop and the function is not called if the flag is set.\n\nThanks to Jovi for not just reporting the bug, but also pointing out\nwhere the bug was in the code.\n\nLink: http://lkml.kernel.org/r/514A8855.7090402@redhat.com\nLink: http://lkml.kernel.org/r/1364377499-1900-15-git-send-email-jovi.zhangwei@huawei.com\n\nTested-by: WANG Chao \u003cchaowang@redhat.com\u003e\nReported-by: WANG Chao \u003cchaowang@redhat.com\u003e\nReported-by: zhangwei(Jovi) \u003cjovi.zhangwei@huawei.com\u003e\nSigned-off-by: Steven Rostedt \u003crostedt@goodmis.org\u003e\n" }, { "commit": "875b7679abbb232b584f2eec59fa6e45690dd6c4", "tree": "09335bd46be2c41367f24b129b685c97e5a5842a", "parents": [ "39ab967e1d090e36ed49adce9ad82f57c91adbb6", "8f964525a121f2ff2df948dac908dcc65be21b5b" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Sun Apr 07 13:01:25 2013 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Sun Apr 07 13:01:25 2013 -0700" }, "message": "Merge git://git.kernel.org/pub/scm/virt/kvm/kvm\n\nPull KVM fix from Gleb Natapov:\n \"Bugfix for the regression introduced by commit c300aa64ddf5\"\n\n* git://git.kernel.org/pub/scm/virt/kvm/kvm:\n KVM: Allow cross page reads and writes from cached translations.\n" }, { "commit": "8f964525a121f2ff2df948dac908dcc65be21b5b", "tree": "1986d7677a1cae8f639c91812da2d8c6ed5bba26", "parents": [ "09a6e1f4ad32243989b30485f78985c0923284cd" ], "author": { "name": "Andrew Honig", "email": "ahonig@google.com", "time": "Fri Mar 29 09:35:21 2013 -0700" }, "committer": { "name": "Gleb Natapov", "email": "gleb@redhat.com", "time": "Sun Apr 07 13:05:35 2013 +0300" }, "message": "KVM: Allow cross page reads and writes from cached translations.\n\nThis patch adds support for kvm_gfn_to_hva_cache_init functions for\nreads and writes that will cross a page. If the range falls within\nthe same memslot, then this will be a fast operation. If the range\nis split between two memslots, then the slower kvm_read_guest and\nkvm_write_guest are used.\n\nTested: Test against kvm_clock unit tests.\n\nSigned-off-by: Andrew Honig \u003cahonig@google.com\u003e\nSigned-off-by: Gleb Natapov \u003cgleb@redhat.com\u003e\n" }, { "commit": "b196553a7fdf305273268113ba80ef303bf012af", "tree": "4230c66996c3e421bfd664166196fadc94c98cdf", "parents": [ "53f63189b1110559dce8c1ee29e8abc3e31f7630", "de7d5f729c72638f41d7c17487bccb1c570ff144" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Fri Apr 05 19:29:36 2013 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Fri Apr 05 19:29:36 2013 -0700" }, "message": "Merge tag \u0027pci-v3.9-fixes-1\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/helgaas/pci\n\nPull PCI fixes from Bjorn Helgaas:\n \"PCI updates for v3.9:\n\n ASPM\n Revert \"PCI/ACPI: Request _OSC control before scanning PCI root bus\"\n kexec\n PCI: Don\u0027t try to disable Bus Master on disconnected PCI devices\n Platform ROM images\n PCI: Add PCI ROM helper for platform-provided ROM images\n nouveau: Attempt to use platform-provided ROM image\n radeon: Attempt to use platform-provided ROM image\n Hotplug\n PCI/ACPI: Always resume devices on ACPI wakeup notifications\n PCI/PM: Disable runtime PM of PCIe ports\n EISA\n EISA/PCI: Fix bus res reference\n EISA/PCI: Init EISA early, before PNP\"\n\n* tag \u0027pci-v3.9-fixes-1\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/helgaas/pci:\n PCI/PM: Disable runtime PM of PCIe ports\n PCI/ACPI: Always resume devices on ACPI wakeup notifications\n PCI: Don\u0027t try to disable Bus Master on disconnected PCI devices\n Revert \"PCI/ACPI: Request _OSC control before scanning PCI root bus\"\n radeon: Attempt to use platform-provided ROM image\n nouveau: Attempt to use platform-provided ROM image\n EISA/PCI: Init EISA early, before PNP\n EISA/PCI: Fix bus res reference\n PCI: Add PCI ROM helper for platform-provided ROM images\n" }, { "commit": "53f63189b1110559dce8c1ee29e8abc3e31f7630", "tree": "5f9850243be2ab26d4ad3ad6829eaa93d90f188f", "parents": [ "6cfa92382e5f11be0bdb5ced62ed249004708f6c", "124dff01afbdbff251f0385beca84ba1b9adda68" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Fri Apr 05 14:04:10 2013 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Fri Apr 05 14:04:10 2013 -0700" }, "message": "Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net\n\nPull networking fixes from David Miller:\n\n 1) Fix erroneous sock_orphan() leading to crashes and double\n kfree_skb() in NFC protocol. From Thierry Escande and Samuel Ortiz.\n\n 2) Fix use after free in remain-on-channel mac80211 code, from Johannes\n Berg.\n\n 3) nf_reset() needs to reset the NF tracing cookie, otherwise we can\n leak it from one namespace into another. Fix from Gao Feng and\n Patrick McHardy.\n\n 4) Fix overflow in channel scanning array of mwifiex driver, from Stone\n Piao.\n\n 5) Fix loss of link after suspend/shutdown in r8169, from Hayes Wang.\n\n 6) Synchronization of unicast address lists to the undelying device\n doesn\u0027t work because whether to sync is maintained as a boolean\n rather than a true count. Fix from Vlad Yasevich.\n\n 7) Fix corruption of TSO packets in atl1e by limiting the segmented\n packet length. From Hannes Frederic Sowa.\n\n 8) Revert bogus AF_UNIX credential passing change and fix the\n coalescing issue properly, from Eric W Biederman.\n\n 9) Changes of ipv4 address lifetime settings needs to generate a\n notification, from Jiri Pirko.\n\n* git://git.kernel.org/pub/scm/linux/kernel/git/davem/net: (22 commits)\n netfilter: don\u0027t reset nf_trace in nf_reset()\n net: ipv4: notify when address lifetime changes\n ixgbe: fix registration order of driver and DCA nofitication\n af_unix: If we don\u0027t care about credentials coallesce all messages\n Revert \"af_unix: dont send SCM_CREDENTIAL when dest socket is NULL\"\n bonding: remove sysfs before removing devices\n atl1e: limit gso segment size to prevent generation of wrong ip length fields\n net: count hw_addr syncs so that unsync works properly.\n r8169: fix auto speed down issue\n netfilter: ip6t_NPT: Fix translation for non-multiple of 32 prefix lengths\n mwifiex: limit channel number not to overflow memory\n NFC: microread: Fix build failure due to a new MEI bus API\n iwlwifi: dvm: fix the passive-no-RX workaround\n netfilter: nf_conntrack: fix error return code\n NFC: llcp: Keep the connected socket parent pointer alive\n mac80211: fix idle handling sequence\n netfilter: nfnetlink_acct: return -EINVAL if object name is empty\n netfilter: nfnetlink_queue: fix error return code in nfnetlink_queue_init()\n netfilter: reset nf_trace in nf_reset\n mac80211: fix remain-on-channel cancel crash\n ...\n" }, { "commit": "124dff01afbdbff251f0385beca84ba1b9adda68", "tree": "57fe790d91b0d56df456f61b25cce398bc6f4271", "parents": [ "34e2ed34a035de07277cca817fe8264324398141" ], "author": { "name": "Patrick McHardy", "email": "kaber@trash.net", "time": "Fri Apr 05 20:42:05 2013 +0200" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Fri Apr 05 15:38:10 2013 -0400" }, "message": "netfilter: don\u0027t reset nf_trace in nf_reset()\n\nCommit 130549fe (\"netfilter: reset nf_trace in nf_reset\") added code\nto reset nf_trace in nf_reset(). This is wrong and unnecessary.\n\nnf_reset() is used in the following cases:\n\n- when passing packets up the the socket layer, at which point we want to\n release all netfilter references that might keep modules pinned while\n the packet is queued. nf_trace doesn\u0027t matter anymore at this point.\n\n- when encapsulating or decapsulating IPsec packets. We want to continue\n tracing these packets after IPsec processing.\n\n- when passing packets through virtual network devices. Only devices on\n that encapsulate in IPv4/v6 matter since otherwise nf_trace is not\n used anymore. Its not entirely clear whether those packets should\n be traced after that, however we\u0027ve always done that.\n\n- when passing packets through virtual network devices that make the\n packet cross network namespace boundaries. This is the only cases\n where we clearly want to reset nf_trace and is also what the\n original patch intended to fix.\n\nAdd a new function nf_reset_trace() and use it in dev_forward_skb() to\nfix this properly.\n\nSigned-off-by: Patrick McHardy \u003ckaber@trash.net\u003e\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "4543fbefe6e06a9e40d9f2b28d688393a299f079", "tree": "be52f567c2f791b4328f75bee9cecaf022ed6a35", "parents": [ "e2409d83434d77874b461b78af6a19cd6e6a1280" ], "author": { "name": "Vlad Yasevich", "email": "vyasevic@redhat.com", "time": "Tue Apr 02 17:10:07 2013 -0400" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Fri Apr 05 00:18:46 2013 -0400" }, "message": "net: count hw_addr syncs so that unsync works properly.\n\nA few drivers use dev_uc_sync/unsync to synchronize the\naddress lists from master down to slave/lower devices. In\nsome cases (bond/team) a single address list is synched down\nto multiple devices. At the time of unsync, we have a leak\nin these lower devices, because \"synced\" is treated as a\nboolean and the address will not be unsynced for anything after\nthe first device/call.\n\nTreat \"synced\" as a count (same as refcount) and allow all\nunsync calls to work.\n\nSigned-off-by: Vlad Yasevich \u003cvyasevic@redhat.com\u003e\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "d08d528dc1848fb369a0b27cdb0749d8f6f38063", "tree": "ec5fdd10b7663adb9ea8645c2cc351f31718b797", "parents": [ "b6a9b7f6b1f21735a7456d534dc0e68e61359d2c", "6cb437acd93a01fdbd6bac9c78ac8159c644e576" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Thu Apr 04 15:56:28 2013 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Thu Apr 04 15:56:28 2013 -0700" }, "message": "Merge tag \u0027pm+acpi-3.9-rc6\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/rafael/linux-pm\n\nPull ACPI and power management fixes from Rafael Wysocki:\n\n - Revert of a recent cpuidle change that caused Nehalem machines to\n hang on boot from Alex Shi.\n\n - USB power management fix addressing a crash in the port device\n object\u0027s release routine from Rafael J Wysocki.\n\n - Device PM QoS fix for a potential deadlock related to sysfs interface\n from Rafael J Wysocki.\n\n - Fix for a cpufreq crash when the /cpus Device Tree node is missing\n from Paolo Pisati.\n\n - Fix for a build issue on ia64 related to the Boot Graphics Resource\n Table (BGRT) from Tony Luck.\n\n - Two fixes for ACPI handles being set incorrectly for device objects\n that don\u0027t correspond to any ACPI namespace nodes in the I2C and SPI\n subsystems from Rafael J Wysocki.\n\n - Fix for compiler warnings related to CONFIG_PM_DEVFREQ being unset\n from Rajagopal Venkat.\n\n - Fix for a symbol definition typo in cpufreq_governor.h from Borislav\n Petkov.\n\n* tag \u0027pm+acpi-3.9-rc6\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/rafael/linux-pm:\n ACPI / BGRT: Don\u0027t let users configure BGRT on non X86 systems\n cpuidle / ACPI: recover percpu ACPI processor cstate\n ACPI / I2C: Use parent\u0027s ACPI_HANDLE() in acpi_i2c_register_devices()\n cpufreq: Correct header guards typo\n ACPI / SPI: Use parent\u0027s ACPI_HANDLE() in acpi_register_spi_devices()\n cpufreq: check OF node /cpus presence before dereferencing it\n PM / devfreq: Fix compiler warnings for CONFIG_PM_DEVFREQ unset\n PM / QoS: Avoid possible deadlock related to sysfs access\n USB / PM: Don\u0027t try to hide PM QoS flags from usb_port_device_release()\n" }, { "commit": "4f4ecd5f2a94135a8a556232aa9ddc55944d9c8f", "tree": "99a4808dce728bc3b7bfe6ca6a5eae4bd6eeac99", "parents": [ "518314ffe4ab5d7ffae0607d0c56ba57e0279732", "906b1c394d0906a154fbdc904ca506bceb515756" ], "author": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Thu Apr 04 17:41:53 2013 -0400" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Thu Apr 04 17:41:53 2013 -0400" }, "message": "Merge branch \u0027master\u0027 of git://1984.lsi.us.es/nf\n\nPablo Neira Ayuso says:\n\n\u003d\u003d\u003d\u003d\u003d\u003d\u003d\u003d\u003d\u003d\u003d\u003d\u003d\u003d\u003d\u003d\u003d\u003d\u003d\u003d\nThe following patchset contains netfilter updates for your net tree,\nthey are:\n\n* Fix missing the skb-\u003etrace reset in nf_reset, noticed by Gao Feng\n while using the TRACE target with several net namespaces.\n\n* Fix prefix translation in IPv6 NPT if non-multiple of 32 prefixes\n are used, from Matthias Schiffer.\n\n* Fix invalid nfacct objects with empty name, they are now rejected\n with -EINVAL, spotted by Michael Zintakis, patch from myself.\n\n* A couple of fixes for wrong return values in the error path of\n nfnetlink_queue and nf_conntrack, from Wei Yongjun.\n\u003d\u003d\u003d\u003d\u003d\u003d\u003d\u003d\u003d\u003d\u003d\u003d\u003d\u003d\u003d\u003d\u003d\u003d\u003d\u003d\n\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "a32450e127fc6e5ca6d958ceb3cfea4d30a00846", "tree": "a63723b4130f33dc8354db33e735649544507d1e", "parents": [ "d8668fcb0b257d9fdcfbe5c172a99b8d85e1cd82" ], "author": { "name": "Shan Hai", "email": "shan.hai@windriver.com", "time": "Mon Mar 18 10:30:44 2013 +0800" }, "committer": { "name": "Jeff Garzik", "email": "jgarzik@redhat.com", "time": "Wed Apr 03 19:33:43 2013 -0400" }, "message": "libata: Set max sector to 65535 for Slimtype DVD A DS8A8SH drive\n\nThe Slimtype DVD A DS8A8SH drive locks up when max sector is smaller than\n65535, and the blow backtrace is observed on locking up:\n\nINFO: task flush-8:32:1130 blocked for more than 120 seconds.\n\"echo 0 \u003e /proc/sys/kernel/hung_task_timeout_secs\" disables this message.\nflush-8:32 D ffffffff8180cf60 0 1130 2 0x00000000\n ffff880273aef618 0000000000000046 0000000000000005 ffff880273aee000\n ffff880273aee000 ffff880273aeffd8 ffff880273aee010 ffff880273aee000\n ffff880273aeffd8 ffff880273aee000 ffff88026e842ea0 ffff880274a10000\nCall Trace:\n [\u003cffffffff8168fc2d\u003e] schedule+0x5d/0x70\n [\u003cffffffff8168fccc\u003e] io_schedule+0x8c/0xd0\n [\u003cffffffff81324461\u003e] get_request+0x731/0x7d0\n [\u003cffffffff8133dc60\u003e] ? cfq_allow_merge+0x50/0x90\n [\u003cffffffff81083aa0\u003e] ? wake_up_bit+0x40/0x40\n [\u003cffffffff81320443\u003e] ? bio_attempt_back_merge+0x33/0x110\n [\u003cffffffff813248ea\u003e] blk_queue_bio+0x23a/0x3f0\n [\u003cffffffff81322176\u003e] generic_make_request+0xc6/0x120\n [\u003cffffffff81322308\u003e] submit_bio+0x138/0x160\n [\u003cffffffff811d7596\u003e] ? bio_alloc_bioset+0x96/0x120\n [\u003cffffffff811d1f61\u003e] submit_bh+0x1f1/0x220\n [\u003cffffffff811d48b8\u003e] __block_write_full_page+0x228/0x340\n [\u003cffffffff811d3650\u003e] ? attach_nobh_buffers+0xc0/0xc0\n [\u003cffffffff811d8960\u003e] ? I_BDEV+0x10/0x10\n [\u003cffffffff811d8960\u003e] ? I_BDEV+0x10/0x10\n [\u003cffffffff811d4ab6\u003e] block_write_full_page_endio+0xe6/0x100\n [\u003cffffffff811d4ae5\u003e] block_write_full_page+0x15/0x20\n [\u003cffffffff811d9268\u003e] blkdev_writepage+0x18/0x20\n [\u003cffffffff81142527\u003e] __writepage+0x17/0x40\n [\u003cffffffff811438ba\u003e] write_cache_pages+0x34a/0x4a0\n [\u003cffffffff81142510\u003e] ? set_page_dirty+0x70/0x70\n [\u003cffffffff81143a61\u003e] generic_writepages+0x51/0x80\n [\u003cffffffff81143ab0\u003e] do_writepages+0x20/0x50\n [\u003cffffffff811c9ed6\u003e] __writeback_single_inode+0xa6/0x2b0\n [\u003cffffffff811ca861\u003e] writeback_sb_inodes+0x311/0x4d0\n [\u003cffffffff811caaa6\u003e] __writeback_inodes_wb+0x86/0xd0\n [\u003cffffffff811cad43\u003e] wb_writeback+0x1a3/0x330\n [\u003cffffffff816916cf\u003e] ? _raw_spin_lock_irqsave+0x3f/0x50\n [\u003cffffffff811b8362\u003e] ? get_nr_inodes+0x52/0x70\n [\u003cffffffff811cb0ac\u003e] wb_do_writeback+0x1dc/0x260\n [\u003cffffffff8168dd34\u003e] ? schedule_timeout+0x204/0x240\n [\u003cffffffff811cb232\u003e] bdi_writeback_thread+0x102/0x2b0\n [\u003cffffffff811cb130\u003e] ? wb_do_writeback+0x260/0x260\n [\u003cffffffff81083550\u003e] kthread+0xc0/0xd0\n [\u003cffffffff81083490\u003e] ? kthread_worker_fn+0x1b0/0x1b0\n [\u003cffffffff8169a3ec\u003e] ret_from_fork+0x7c/0xb0\n [\u003cffffffff81083490\u003e] ? kthread_worker_fn+0x1b0/0x1b0\n\n The above trace was triggered by\n \"dd if\u003d/dev/zero of\u003d/dev/sr0 bs\u003d2048 count\u003d32768\"\n\n It was previously working by accident, since another bug introduced\n by 4dce8ba94c7 (libata: Use \u0027bool\u0027 return value for ata_id_XXX) caused\n all drives to use maxsect\u003d65535.\n\nCc: stable@vger.kernel.org\nSigned-off-by: Shan Hai \u003cshan.hai@windriver.com\u003e\nSigned-off-by: Jeff Garzik \u003cjgarzik@redhat.com\u003e\n" }, { "commit": "d8668fcb0b257d9fdcfbe5c172a99b8d85e1cd82", "tree": "855e29baf8416d41edca4cad42e85e96d574072c", "parents": [ "da241efcd9c3da2af6ba20055c7e158ec725005c" ], "author": { "name": "Shan Hai", "email": "shan.hai@windriver.com", "time": "Mon Mar 18 10:30:43 2013 +0800" }, "committer": { "name": "Jeff Garzik", "email": "jgarzik@redhat.com", "time": "Wed Apr 03 19:33:40 2013 -0400" }, "message": "libata: Use integer return value for atapi_command_packet_set\n\nThe function returns type of ATAPI drives so it should return integer value.\nThe commit 4dce8ba94c7 (libata: Use \u0027bool\u0027 return value for ata_id_XXX) since\nv2.6.39 changed the type of return value from int to bool, the change would\ncause all of the ATAPI class drives to be treated as TYPE_TAPE and the\nmax_sectors of the drives to be set to 65535 because of the commit\nf8d8e5799b7(libata: increase 128 KB / cmd limit for ATAPI tape drives), for the\nfunction would return true for all ATAPI class drives and the TYPE_TAPE is\ndefined as 0x01.\n\nCc: stable@vger.kernel.org\nSigned-off-by: Shan Hai \u003cshan.hai@windriver.com\u003e\nSigned-off-by: Jeff Garzik \u003cjgarzik@redhat.com\u003e\n" }, { "commit": "aea7fab8bac68860f3eb2e8127f9ea698475c0c4", "tree": "3a961e8135e8dbf5316a4b3ab22b3ce3368ade96", "parents": [ "2dc958fa2fe6987e7ab106bd97029a09a82fcd8d", "2a1486981c1317dc4f4aad568f2cc6e49dfb8c82" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Tue Apr 02 18:47:23 2013 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Tue Apr 02 18:47:23 2013 -0700" }, "message": "Merge branch \u0027upstream\u0027 of git://git.linux-mips.org/pub/scm/ralf/upstream-linus\n\nPull MIPS fixes from Ralf Baechle:\n \"A collection of fixes pretty much across the MIPS code. Even the\n change to include/linux/signal.h by David Howells\u0027 2a1486981c13 (\"Fix\n breakage in MIPS siginfo handling\") should be considered MIPS-specific\n as it touches an ifdefed segment that is only relevant to MIPS and\n which unfortunately can\u0027t be made to go away entirely.\"\n\n* \u0027upstream\u0027 of git://git.linux-mips.org/pub/scm/ralf/upstream-linus:\n Fix breakage in MIPS siginfo handling\n Revert \"MIPS: BCM63XX: Call board_register_device from device_initcall()\"\n MIPS: BCM63XX: Make nvram checksum failure non fatal\n MIPS: Fix code generation for non-DSP capable CPUs\n MIPS: Fix inconsistent formatting inside /proc/cpuinfo\n MIPS: SEAD3: Enable LL/SC.\n MIPS: Get rid of CONFIG_CPU_HAS_LLSC again\n MIPS: Add dependencies for HAVE_ARCH_TRANSPARENT_HUGEPAGE\n MIPS: VR4133: Fix probe for LL/SC.\n MIPS: Fix logic errors in bitops.c\n MIPS: Use CONFIG_CPU_MIPSR2 in csum_partial.S\n MIPS: compat: Return same error ENOSYS as native for invalid operation.\n" }, { "commit": "5faaa035ddc16d3d2e31c0bfc1c4756b6869dbcc", "tree": "d6370c92f8b81fa26b0b7399187c3d71c03a5225", "parents": [ "0f703069296664eb7c649c837cc8bb936c3ef07f" ], "author": { "name": "Rajagopal Venkat", "email": "rajagopal.venkat@linaro.org", "time": "Thu Mar 21 13:28:25 2013 +0000" }, "committer": { "name": "Rafael J. Wysocki", "email": "rafael.j.wysocki@intel.com", "time": "Tue Apr 02 01:28:41 2013 +0200" }, "message": "PM / devfreq: Fix compiler warnings for CONFIG_PM_DEVFREQ unset\n\nFix compiler warnings generated when devfreq is not enabled\n(CONFIG_PM_DEVFREQ is not set).\n\nSigned-off-by: Rajagopal Venkat \u003crajagopal.venkat@linaro.org\u003e\nAcked-by: MyungJoo Ham \u003cmyungjoo.ham@samsung.com\u003e\nSigned-off-by: Rafael J. Wysocki \u003crafael.j.wysocki@intel.com\u003e\n" }, { "commit": "ff3421dee60928de95b68a13a1b64125b62b10a4", "tree": "fd4fc33c7b9ceea20c5a4f3a8881ae46fa01b187", "parents": [ "07961ac7c0ee8b546658717034fe692fd12eefa9", "6741f40d198c6a5feb23653a1efd4ca47f93d83d" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Mon Apr 01 08:06:30 2013 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Mon Apr 01 08:06:30 2013 -0700" }, "message": "Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net\n\nPull networking fixes from David Miller:\n\n 1) sadb_msg prepared for IPSEC userspace forgets to initialize the\n satype field, fix from Nicolas Dichtel.\n\n 2) Fix mac80211 synchronization during station removal, from Johannes\n Berg.\n\n 3) Fix IPSEC sequence number notifications when they wrap, from Steffen\n Klassert.\n\n 4) Fix cfg80211 wdev tracing crashes when add_virtual_intf() returns an\n error pointer, from Johannes Berg.\n\n 5) In mac80211, don\u0027t call into the channel context code with the\n interface list mutex held. From Johannes Berg.\n\n 6) In mac80211, if we don\u0027t actually associate, do not restart the STA\n timer, otherwise we can crash. From Ben Greear.\n\n 7) Missing dma_mapping_error() check in e1000, ixgb, and e1000e. From\n Christoph Paasch.\n\n 8) Fix sja1000 driver defines to not conflict with SH port, from Marc\n Kleine-Budde.\n\n 9) Don\u0027t call il4965_rs_use_green with a NULL station, from Colin Ian\n King.\n\n10) Suspend/Resume in the FEC driver fail because the buffer descriptors\n are not initialized at all the moments in which they should. Fix\n from Frank Li.\n\n11) cpsw and davinci_emac drivers both use the wrong interface to\n restart a stopped TX queue. Use netif_wake_queue not\n netif_start_queue, the latter is for initialization/bringup not\n active management of the queue. From Mugunthan V N.\n\n12) Fix regression in rate calculations done by\n psched_ratecfg_precompute(), missing u64 type promotion. From\n Sergey Popovich.\n\n13) Fix length overflow in tg3 VPD parsing, from Kees Cook.\n\n14) AOE driver fails to allocate enough headroom, resulting in crashes.\n Fix from Eric Dumazet.\n\n15) RX overflow happens too quickly in sky2 driver because pause packet\n thresholds are not programmed correctly. From Mirko Lindner.\n\n16) Bonding driver manages arp_interval and miimon settings incorrectly,\n disabling one unintentionally disables both. Fix from Nikolay\n Aleksandrov.\n\n17) smsc75xx drivers don\u0027t program the RX mac properly for jumbo frames.\n Fix from Steve Glendinning.\n\n18) Fix off-by-one in Codel packet scheduler. From Vijay Subramanian.\n\n19) Fix packet corruption in atl1c by disabling MSI support, from Hannes\n Frederic Sowa.\n\n20) netdev_rx_handler_unregister() needs a synchronize_net() to fix\n crashes in bonding driver unload stress tests. From Eric Dumazet.\n\n21) rxlen field of ks8851 RX packet descriptors not interpreted\n correctly (it is 12 bits not 16 bits, so needs to be masked after\n shifting the 32-bit value down 16 bits). Fix from Max Nekludov.\n\n22) Fix missed RX/TX enable in sh_eth driver due to mishandling of link\n change indications. From Sergei Shtylyov.\n\n23) Fix crashes during spurious ECI interrupts in sh_eth driver, also\n from Sergei Shtylyov.\n\n24) dm9000 driver initialization is done wrong for revision B devices\n with DSP PHY, from Joseph CHANG.\n\n* git://git.kernel.org/pub/scm/linux/kernel/git/davem/net: (53 commits)\n DM9000B: driver initialization upgrade\n sh_eth: make \u0027link\u0027 field of \u0027struct sh_eth_private\u0027 *int*\n sh_eth: workaround for spurious ECI interrupt\n sh_eth: fix handling of no LINK signal\n ks8851: Fix interpretation of rxlen field.\n net: add a synchronize_net() in netdev_rx_handler_unregister()\n MAINTAINERS: Update netxen_nic maintainers list\n atl1e: drop pci-msi support because of packet corruption\n net: fq_codel: Fix off-by-one error\n net: calxedaxgmac: Wake-on-LAN fixes\n net: calxedaxgmac: fix rx ring handling when OOM\n net: core: Remove redundant call to \u0027nf_reset\u0027 in \u0027dev_forward_skb\u0027\n smsc75xx: fix jumbo frame support\n net: fix the use of this_cpu_ptr\n bonding: fix disabling of arp_interval and miimon\n ipv6: don\u0027t accept node local multicast traffic from the wire\n sky2: Threshold for Pause Packet is set wrong\n sky2: Receive Overflows not counted\n aoe: reserve enough headroom on skbs\n line up comment for ndo_bridge_getlink\n ...\n" }, { "commit": "dbf520a9d7d4d5ba28d2947be11e34099a5e3e20", "tree": "29e7a07a13a76a89b3c175c58592b2d3b176cfa5", "parents": [ "13d2080db3472b3399ba32e6026960de5d32a344" ], "author": { "name": "Paul Walmsley", "email": "paul@pwsan.com", "time": "Sun Mar 31 00:04:40 2013 +0000" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Sun Mar 31 11:38:33 2013 -0700" }, "message": "Revert \"lockdep: check that no locks held at freeze time\"\n\nThis reverts commit 6aa9707099c4b25700940eb3d016f16c4434360d.\n\nCommit 6aa9707099c4 (\"lockdep: check that no locks held at freeze time\")\ncauses problems with NFS root filesystems. The failures were noticed on\nOMAP2 and 3 boards during kernel init:\n\n [ BUG: swapper/0/1 still has locks held! ]\n 3.9.0-rc3-00344-ga937536 #1 Not tainted\n -------------------------------------\n 1 lock held by swapper/0/1:\n #0: (\u0026type-\u003es_umount_key#13/1){+.+.+.}, at: [\u003cc011e84c\u003e] sget+0x248/0x574\n\n stack backtrace:\n rpc_wait_bit_killable\n __wait_on_bit\n out_of_line_wait_on_bit\n __rpc_execute\n rpc_run_task\n rpc_call_sync\n nfs_proc_get_root\n nfs_get_root\n nfs_fs_mount_common\n nfs_try_mount\n nfs_fs_mount\n mount_fs\n vfs_kern_mount\n do_mount\n sys_mount\n do_mount_root\n mount_root\n prepare_namespace\n kernel_init_freeable\n kernel_init\n\nAlthough the rootfs mounts, the system is unstable. Here\u0027s a transcript\nfrom a PM test:\n\n http://www.pwsan.com/omap/testlogs/test_v3.9-rc3/20130317194234/pm/37xxevm/37xxevm_log.txt\n\nHere\u0027s what the test log should look like:\n\n http://www.pwsan.com/omap/testlogs/test_v3.8/20130218214403/pm/37xxevm/37xxevm_log.txt\n\nMailing list discussion is here:\n\n http://lkml.org/lkml/2013/3/4/221\n\nDeal with this for v3.9 by reverting the problem commit, until folks can\nfigure out the right long-term course of action.\n\nSigned-off-by: Paul Walmsley \u003cpaul@pwsan.com\u003e\nCc: Mandeep Singh Baines \u003cmsb@chromium.org\u003e\nCc: Jeff Layton \u003cjlayton@redhat.com\u003e\nCc: Shawn Guo \u003cshawn.guo@linaro.org\u003e\nCc: \u003cmaciej.rutecki@gmail.com\u003e\nCc: Fengguang Wu \u003cfengguang.wu@intel.com\u003e\nCc: Trond Myklebust \u003cTrond.Myklebust@netapp.com\u003e\nCc: Ingo Molnar \u003cmingo@redhat.com\u003e\nCc: Ben Chan \u003cbenchan@chromium.org\u003e\nCc: Oleg Nesterov \u003coleg@redhat.com\u003e\nCc: Tejun Heo \u003ctj@kernel.org\u003e\nCc: Rafael J. Wysocki \u003crjw@sisk.pl\u003e\nCc: Andrew Morton \u003cakpm@linux-foundation.org\u003e\nSigned-off-by: Linus Torvalds \u003ctorvalds@linux-foundation.org\u003e\n" }, { "commit": "09a9f1d27892255cfb9c91203f19476765e2d8d1", "tree": "e6f0985223c87408773c3b81428935d3ce99931b", "parents": [ "0776ce03b1348d39ba3035ea3ee3d268a42912ce" ], "author": { "name": "Michel Lespinasse", "email": "walken@google.com", "time": "Thu Mar 28 16:26:23 2013 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Thu Mar 28 17:45:51 2013 -0700" }, "message": "Revert \"mm: introduce VM_POPULATE flag to better deal with racy userspace programs\"\n\nThis reverts commit 186930500985 (\"mm: introduce VM_POPULATE flag to\nbetter deal with racy userspace programs\").\n\nVM_POPULATE only has any effect when userspace plays racy games with\nvmas by trying to unmap and remap memory regions that mmap or mlock are\noperating on.\n\nAlso, the only effect of VM_POPULATE when userspace plays such games is\nthat it avoids populating new memory regions that get remapped into the\naddress range that was being operated on by the original mmap or mlock\ncalls.\n\nLet\u0027s remove VM_POPULATE as there isn\u0027t any strong argument to mandate a\nnew vm_flag.\n\nSigned-off-by: Michel Lespinasse \u003cwalken@google.com\u003e\nSigned-off-by: Hugh Dickins \u003chughd@google.com\u003e\nSigned-off-by: Linus Torvalds \u003ctorvalds@linux-foundation.org\u003e\n" }, { "commit": "0776ce03b1348d39ba3035ea3ee3d268a42912ce", "tree": "24b9533ad5b05aeb02a730019f6860211253e1fd", "parents": [ "045ecc26a06459c5c88eade6e545bb109a1cdb38", "482b0b5d82bd916cc0c55a2abf65bdc69023b843" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Thu Mar 28 15:54:25 2013 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Thu Mar 28 15:54:25 2013 -0700" }, "message": "Merge tag \u0027usb-3.9-rc4\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/usb\n\nPull USB fixes from Greg Kroah-Hartman:\n \"Here are some USB fixes to resolve issues reported recently, as well\n as a new device id for the ftdi_sio driver.\"\n\n* tag \u0027usb-3.9-rc4\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/usb:\n usb: ftdi_sio: Add support for Mitsubishi FX-USB-AW/-BD\n usb: Fix compile error by selecting USB_OTG_UTILS\n USB: serial: fix hang when opening port\n USB: EHCI: fix bug in iTD/siTD DMA pool allocation\n xhci: Don\u0027t warn on empty ring for suspended devices.\n usb: xhci: Fix TRB transfer length macro used for Event TRB.\n usb/acpi: binding xhci root hub usb port with ACPI\n usb: add find_raw_port_number callback to struct hc_driver()\n usb: xhci: fix build warning\n" }, { "commit": "1b6a4db220cf04114980694685b668bad4ca030d", "tree": "2036aa9275ec6bdc538a9472acccb9219d80f46f", "parents": [ "dfca53fb166bc2a0a1ec36efedad30946e0b0652", "347e0899b1c75d907f01ac883ca38d37fe9bfa42" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Thu Mar 28 15:51:33 2013 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Thu Mar 28 15:51:33 2013 -0700" }, "message": "Merge tag \u0027char-misc-3.9-rc4\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/char-misc\n\nPull char/misc driver fixes from Greg Kroah-Hartman:\n \"Here are some small char/misc driver fixes that resolve issues\n recently reported against the 3.9-rc kernels. All have been in\n linux-next for a while.\"\n\n* tag \u0027char-misc-3.9-rc4\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/char-misc:\n VMCI: Fix process-to-process DRGAMs.\n mei: ME hardware reset needs to be synchronized\n mei: add mei_stop function to stop mei device\n extcon: max77693: Initialize register of MUIC device to bring up it without platform data\n extcon: max77693: Fix bug of wrong pointer when platform data is not used\n extcon: max8997: Check the pointer of platform data to protect null pointer error\n" }, { "commit": "2c3de1c2d7d68c6ba4c1ecd82c68285f34d9609e", "tree": "6a09ce761173a966718f9009514dcc90bd9947b7", "parents": [ "9064171268d838b8f283fe111ef086b9479d059a", "87a8ebd637dafc255070f503909a053cf0d98d3f" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Thu Mar 28 13:43:46 2013 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Thu Mar 28 13:43:46 2013 -0700" }, "message": "Merge branch \u0027for-linus\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/ebiederm/user-namespace\n\nPull userns fixes from Eric W Biederman:\n \"The bulk of the changes are fixing the worst consequences of the user\n namespace design oversight in not considering what happens when one\n namespace starts off as a clone of another namespace, as happens with\n the mount namespace.\n\n The rest of the changes are just plain bug fixes.\n\n Many thanks to Andy Lutomirski for pointing out many of these issues.\"\n\n* \u0027for-linus\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/ebiederm/user-namespace:\n userns: Restrict when proc and sysfs can be mounted\n ipc: Restrict mounting the mqueue filesystem\n vfs: Carefully propogate mounts across user namespaces\n vfs: Add a mount flag to lock read only bind mounts\n userns: Don\u0027t allow creation if the user is chrooted\n yama: Better permission check for ptraceme\n pid: Handle the exit of a multi-threaded init.\n scm: Require CAP_SYS_ADMIN over the current pidns to spoof pids.\n" }, { "commit": "24f11a5cf538a8fcc10d61f457e9a2094fb965b4", "tree": "950cfd826b3be166972cda88adbed56a638eaa33", "parents": [ "715230a44310a8cf66fbfb5a46f9a62a9b2de424" ], "author": { "name": "Dmitry Kravkov", "email": "dmitry@broadcom.com", "time": "Wed Mar 27 06:54:00 2013 +0000" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Wed Mar 27 14:06:41 2013 -0400" }, "message": "line up comment for ndo_bridge_getlink\n\nSigned-off-by: Dmitry Kravkov \u003cdmitry@broadcom.com\u003e\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "87a8ebd637dafc255070f503909a053cf0d98d3f", "tree": "0bc879f9118c3333c73dfd15223a79e6219f64fd", "parents": [ "a636b702ed1805e988ad3d8ff8b52c060f8b341c" ], "author": { "name": "Eric W. Biederman", "email": "ebiederm@xmission.com", "time": "Sun Mar 24 14:28:27 2013 -0700" }, "committer": { "name": "Eric W. Biederman", "email": "ebiederm@xmission.com", "time": "Wed Mar 27 07:50:08 2013 -0700" }, "message": "userns: Restrict when proc and sysfs can be mounted\n\nOnly allow unprivileged mounts of proc and sysfs if they are already\nmounted when the user namespace is created.\n\nproc and sysfs are interesting because they have content that is\nper namespace, and so fresh mounts are needed when new namespaces\nare created while at the same time proc and sysfs have content that\nis shared between every instance.\n\nRespect the policy of who may see the shared content of proc and sysfs\nby only allowing new mounts if there was an existing mount at the time\nthe user namespace was created.\n\nIn practice there are only two interesting cases: proc and sysfs are\nmounted at their usual places, proc and sysfs are not mounted at all\n(some form of mount namespace jail).\n\nCc: stable@vger.kernel.org\nAcked-by: Serge Hallyn \u003cserge.hallyn@canonical.com\u003e\nSigned-off-by: \"Eric W. Biederman\" \u003cebiederm@xmission.com\u003e\n" }, { "commit": "90563b198e4c6674c63672fae1923da467215f45", "tree": "aa8528c1c23dccbeca409059ec5f5d21ca1318bf", "parents": [ "3151527ee007b73a0ebd296010f1c0454a919c7d" ], "author": { "name": "Eric W. Biederman", "email": "ebiederm@xmission.com", "time": "Fri Mar 22 03:10:15 2013 -0700" }, "committer": { "name": "Eric W. Biederman", "email": "ebiederm@xmission.com", "time": "Wed Mar 27 07:50:04 2013 -0700" }, "message": "vfs: Add a mount flag to lock read only bind mounts\n\nWhen a read-only bind mount is copied from mount namespace in a higher\nprivileged user namespace to a mount namespace in a lesser privileged\nuser namespace, it should not be possible to remove the the read-only\nrestriction.\n\nAdd a MNT_LOCK_READONLY mount flag to indicate that a mount must\nremain read-only.\n\nCC: stable@vger.kernel.org\nAcked-by: Serge Hallyn \u003cserge.hallyn@canonical.com\u003e\nSigned-off-by: \"Eric W. Biederman\" \u003cebiederm@xmission.com\u003e\n" }, { "commit": "3151527ee007b73a0ebd296010f1c0454a919c7d", "tree": "33175354889523cd20586fb28456e566529c46d9", "parents": [ "eddc0a3abff273842a94784d2d022bbc36dc9015" ], "author": { "name": "Eric W. Biederman", "email": "ebiederm@xmission.com", "time": "Fri Mar 15 01:45:51 2013 -0700" }, "committer": { "name": "Eric W. Biederman", "email": "ebiederm@xmission.com", "time": "Wed Mar 27 07:49:29 2013 -0700" }, "message": "userns: Don\u0027t allow creation if the user is chrooted\n\nGuarantee that the policy of which files may be access that is\nestablished by setting the root directory will not be violated\nby user namespaces by verifying that the root directory points\nto the root of the mount namespace at the time of user namespace\ncreation.\n\nChanging the root is a privileged operation, and as a matter of policy\nit serves to limit unprivileged processes to files below the current\nroot directory.\n\nFor reasons of simplicity and comprehensibility the privilege to\nchange the root directory is gated solely on the CAP_SYS_CHROOT\ncapability in the user namespace. Therefore when creating a user\nnamespace we must ensure that the policy of which files may be access\ncan not be violated by changing the root directory.\n\nAnyone who runs a processes in a chroot and would like to use user\nnamespace can setup the same view of filesystems with a mount\nnamespace instead. With this result that this is not a practical\nlimitation for using user namespaces.\n\nCc: stable@vger.kernel.org\nAcked-by: Serge Hallyn \u003cserge.hallyn@canonical.com\u003e\nReported-by: Andy Lutomirski \u003cluto@amacapital.net\u003e\nSigned-off-by: \"Eric W. Biederman\" \u003cebiederm@xmission.com\u003e\n" }, { "commit": "fffe01f7a768d07cc50ace71abe28fbf2f786a43", "tree": "6e20b8c21f80d5d27f473e59fdb1696e165fbe1e", "parents": [ "8bb9660418e05bb1845ac1a2428444d78e322cc7" ], "author": { "name": "Matthew Garrett", "email": "matthew.garrett@nebula.com", "time": "Tue Mar 26 17:25:54 2013 -0400" }, "committer": { "name": "Bjorn Helgaas", "email": "bhelgaas@google.com", "time": "Tue Mar 26 17:19:41 2013 -0600" }, "message": "PCI: Add PCI ROM helper for platform-provided ROM images\n\nIt turns out that some UEFI systems provide apparently an apparently valid\nPCI ROM BAR that turns out to contain garbage, so the attempt in 547b52463\nto prefer the ROM from the BAR actually breaks a different set of machines.\nAs Linus pointed out, the graphics drivers are probably in the best\nposition to make this judgement, so this basically reverts 547b52463 and\nf9a37be0f and adds a new helper function. Followup patches will add support\nto nouveau and radeon for probing this ROM source if they can\u0027t find a ROM\nfrom some other source.\n\n[bhelgaas: added reporter and bugzilla pointers, s/f4eb5ff05/547b52463]\nReference: https://bugzilla.redhat.com/show_bug.cgi?id\u003d927451\nReference: http://lkml.kernel.org/r/kg69ef$vdb$1@ger.gmane.org\nReported-by: Mantas Mikulėnas \u003cgrawity@gmail.com\u003e\nReported-by: Chris Murphy \u003cbugzilla@colorremedies.com\u003e\nSigned-off-by: Matthew Garrett \u003cmatthew.garrett@nebula.com\u003e\nSigned-off-by: Bjorn Helgaas \u003cbhelgaas@google.com\u003e" }, { "commit": "b175293ccc98ab84e93d25472d7422b4a897614b", "tree": "777a8705e6a81712f5314d5f4551a069e430be82", "parents": [ "5d538483ea4920899233d51f3e9c48c75cc10b6d", "330305cc4a6b0cb75c22fc01b8826f0ad755550f" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Tue Mar 26 14:24:29 2013 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Tue Mar 26 14:24:29 2013 -0700" }, "message": "Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net\n\nPull networking fixes from David Miller:\n\n 1) Always increment IPV4 ID field in encapsulated GSO packets, even\n when DF is set. Regression fix from Pravin B Shelar.\n\n 2) Fix per-net subsystem initialization in netfilter conntrack,\n otherwise we may access dynamically allocated memory before it is\n actually allocated. From Gao Feng.\n\n 3) Fix DMA buffer lengths in iwl3945 driver, from Stanislaw Gruszka.\n\n 4) Fix race between submission of sync vs async commands in mwifiex\n driver, from Amitkumar Karwar.\n\n 5) Add missing cancel of command timer in mwifiex driver, from Bing\n Zhao.\n\n 6) Missing SKB free in rtlwifi USB driver, from Jussi Kivilinna.\n\n 7) Thermal layer tries to use a genetlink multicast string that is\n longer than the 16 character limit. Fix it and add a BUG check to\n prevent this kind of thing from happening in the future.\n\n From Masatake YAMATO.\n\n 8) Fix many bugs in the handling of the teardown of L2TP connections,\n UDP encapsulation instances, and sockets. From Tom Parkin.\n\n 9) Missing socket release in IRDA, from Kees Cook.\n\n10) Fix fec driver modular build, from Fabio Estevam.\n\n11) Erroneous use of kfree() instead of free_netdev() in lantiq_etop,\n from Wei Yongjun.\n\n12) Fix bugs in handling of queue numbers and steering rules in mlx4\n driver, from Moshe Lazer, Hadar Hen Zion, and Or Gerlitz.\n\n13) Some FOO_DIAG_MAX constants were defined off by one, fix from Andrey\n Vagin.\n\n14) TCP segmentation deferral is unintentionally done too strongly,\n breaking ACK clocking. Fix from Eric Dumazet.\n\n15) net_enable_timestamp() can legitimately be invoked from software\n interrupts, and in a way that is safe, so remove the WARN_ON().\n Also from Eric Dumazet.\n\n16) Fix use after free in VLANs, from Cong Wang.\n\n17) Fix TCP slow start retransmit storms after SACK reneging, from\n Yuchung Cheng.\n\n18) Unix socket release should mark a socket dead before NULL\u0027ing out\n sock-\u003esk, otherwise we can race. Fix from Paul Moore.\n\n19) IPV6 addrconf code can try to free static memory, from Hong Zhiguo.\n\n20) Fix register mis-programming, NULL pointer derefs, and wrong PHC\n clock frequency in IGB driver. From Lior LevyAlex Williamson, Jiri\n Benc, and Jeff Kirsher.\n\n21) skb-\u003eip_summed logic in pch_gbe driver is reversed, breaking packet\n forwarding. Fix from Veaceslav Falico.\n\n* git://git.kernel.org/pub/scm/linux/kernel/git/davem/net: (65 commits)\n ipv4: Fix ip-header identification for gso packets.\n bonding: remove already created master sysfs link on failure\n af_unix: dont send SCM_CREDENTIAL when dest socket is NULL\n pch_gbe: fix ip_summed checksum reporting on rx\n igb: fix PHC stopping on max freq\n igb: make sensor info static\n igb: SR-IOV init reordering\n igb: Fix null pointer dereference\n igb: fix i350 anti spoofing config\n ixgbevf: don\u0027t release the soft entries\n ipv6: fix bad free of addrconf_init_net\n unix: fix a race condition in unix_release()\n tcp: undo spurious timeout after SACK reneging\n bnx2x: fix assignment of signed expression to unsigned variable\n bridge: fix crash when set mac address of br interface\n 8021q: fix a potential use-after-free\n net: remove a WARN_ON() in net_enable_timestamp()\n tcp: preserve ACK clocking in TSO\n net: fix *_DIAG_MAX constants\n net/mlx4_core: Disallow releasing VF QPs which have steering rules\n ...\n" }, { "commit": "3f5eb14135ba9d97ba4b8514fc7ef5e0dac2abf4", "tree": "4ab79f8553199f6c81a80612d497bd33b5212fea", "parents": [ "09ce0c0c8a99651cace20958278476ee3f31678c" ], "author": { "name": "Lan Tianyu", "email": "tianyu.lan@intel.com", "time": "Tue Mar 19 16:48:12 2013 +0800" }, "committer": { "name": "Sarah Sharp", "email": "sarah.a.sharp@linux.intel.com", "time": "Mon Mar 25 10:39:17 2013 -0700" }, "message": "usb: add find_raw_port_number callback to struct hc_driver()\n\nxhci driver divides the root hub into two logical hubs which work\nrespectively for usb 2.0 and usb 3.0 devices. They are independent\ndevices in the usb core. But in the ACPI table, it\u0027s one device node\nand all usb2.0 and usb3.0 ports are under it. Binding usb port with\nits acpi node needs the raw port number which is reflected in the xhci\nextended capabilities table. This patch is to add find_raw_port_number\ncallback to struct hc_driver(), fill it with xhci_find_raw_port_number()\nwhich will return raw port number and add a wrap usb_hcd_find_raw_port_number().\n\nOtherwise, refactor xhci_find_real_port_number(). Using\nxhci_find_raw_port_number() to get real index in the HW port status\nregisters instead of scanning through the xHCI roothub port array.\nThis can help to speed up.\n\nAll addresses in xhci-\u003eusb2_ports and xhci-\u003eusb3_ports array are\nkown good ports and don\u0027t include following bad ports in the extended\ncapabilities talbe.\n (1) root port that doesn\u0027t have an entry\n (2) root port with unknown speed\n (3) root port that is listed twice and with different speeds.\n\nSo xhci_find_raw_port_number() will only return port num of good ones\nand never touch bad ports above.\n\nSigned-off-by: Lan Tianyu \u003ctianyu.lan@intel.com\u003e\nSigned-off-by: Sarah Sharp \u003csarah.a.sharp@linux.intel.com\u003e\n" }, { "commit": "fb9bb1829ddf6692cd31b28183688b42e1eda149", "tree": "ad2fd814162a8e428fe64af709770e593d1ffe6d", "parents": [ "844fdd9ac1cdd756f5bd233f302ecabb27dd387a", "c69d72aec52eb5234f433259ac5dcc3b68f1480d" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Mon Mar 25 09:26:10 2013 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Mon Mar 25 09:26:10 2013 -0700" }, "message": "Merge tag \u0027fixes\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc\n\nPull ARM SoC bug fixes from Arnd Bergmann:\n \"Four patches for arm-soc this week:\n\n - Kevin Hilman is no longer reachable under his previous email\n address. He submitted the patch earlier, but nobody felt\n responsible to pick it up.\n\n - One Tegra fix for an incorect register address in device tree.\n\n - IMX multiplatform support exposes a configuration option that leads\n to unbootable kernels on all other machines and that needs to\n depend on that platform.\n\n - A nontrivial bug fix for the setup of the mxs video output.\"\n\n* tag \u0027fixes\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc:\n MAINTAINERS: update email address for Kevin Hilman\n ARM: tegra: fix register address of slink controller\n ARM: imx: add dependency check for DEBUG_IMX_UART_PORT\n ARM: video: mxs: Fix mxsfb misconfiguring VDCTRL0\n" }, { "commit": "130549fed828cc34c22624c6195afcf9e7ae56fe", "tree": "4d2f1ff9247a0708100d2c8b4fe15f96cc757ca5", "parents": [ "7ebe183c6d444ef5587d803b64a1f4734b18c564" ], "author": { "name": "Gao feng", "email": "gaofeng@cn.fujitsu.com", "time": "Thu Mar 21 19:48:41 2013 +0000" }, "committer": { "name": "Pablo Neira Ayuso", "email": "pablo@netfilter.org", "time": "Mon Mar 25 14:21:23 2013 +0100" }, "message": "netfilter: reset nf_trace in nf_reset\n\nWe forgot to clear the nf_trace of sk_buff in nf_reset,\nWhen we use veth device, this nf_trace information will\nbe leaked from one net namespace to another net namespace.\n\nSigned-off-by: Gao feng \u003cgaofeng@cn.fujitsu.com\u003e\nSigned-off-by: Pablo Neira Ayuso \u003cpablo@netfilter.org\u003e\n" }, { "commit": "5da273fe3fd137c6ae4acf74b7449500f5e4dc09", "tree": "e49a4f7b5fb24a2bb8a4d0945f3981d5edff93df", "parents": [ "14629ed31467741d12f342c95621900646173519", "122090366d1d5c6ec1bfb6dfdb3a6d121ff074aa" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Fri Mar 22 16:43:53 2013 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Fri Mar 22 16:43:53 2013 -0700" }, "message": "Merge git://git.infradead.org/users/willy/linux-nvme\n\nPull NVMe driver update from Matthew Wilcox:\n \"These patches have mostly been baking for a few months; sorry I didn\u0027t\n get them in during the merge window. They\u0027re all bug fixes, except\n for the addition of the SMART log and the addition to MAINTAINERS.\"\n\n* git://git.infradead.org/users/willy/linux-nvme:\n NVMe: Add namespaces with no LBA range feature\n MAINTAINERS: Add entry for the NVMe driver\n NVMe: Initialize iod nents to 0\n NVMe: Define SMART log\n NVMe: Add result to nvme_get_features\n NVMe: Set result from user admin command\n NVMe: End queued bio requests when freeing queue\n NVMe: Free cmdid on nvme_submit_bio error\n" }, { "commit": "14629ed31467741d12f342c95621900646173519", "tree": "2213913ecb569a9b386cac11dbe0aac37911d97f", "parents": [ "b9cb3bf42efc2faa55e815f4368738978536c6d1", "38d78e587d4960d0db94add518d27ee74bad2301" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Fri Mar 22 16:41:44 2013 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Fri Mar 22 16:41:44 2013 -0700" }, "message": "Merge branch \u0027akpm\u0027 (fixes from Andrew)\n\nMerge misc fixes from Andrew Morton.\n\n* emailed patches from Andrew Morton \u003cakpm@linux-foundation.org\u003e:\n mqueue: sys_mq_open: do not call mnt_drop_write() if read-only\n mm/hotplug: only free wait_table if it\u0027s allocated by vmalloc\n dma-debug: update DMA debug API to better handle multiple mappings of a buffer\n dma-debug: fix locking bug in check_unmap()\n drivers/rtc/rtc-at91rm9200.c: use a variable for storing IMR\n drivers/video/ep93xx-fb.c: include \u003clinux/io.h\u003e for devm_ioremap()\n drivers/rtc/rtc-da9052.c: fix for rtc device registration\n mm: zone_end_pfn is too small\n poweroff: change orderly_poweroff() to use schedule_work()\n mm/hugetlb: fix total hugetlbfs pages count when using memory overcommit accouting\n printk: Provide a wake_up_klogd() off-case\n irq_work.h: fix warning when CONFIG_IRQ_WORK\u003dn\n" }, { "commit": "f9228b204f789493117e458d2fefae937edb7272", "tree": "b073cb200a073a6ce2767012174ccd39accf4e48", "parents": [ "2ca067efd82939dfd87827d29d36a265823a4c2f" ], "author": { "name": "Russ Anderson", "email": "rja@sgi.com", "time": "Fri Mar 22 15:04:43 2013 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Fri Mar 22 16:41:20 2013 -0700" }, "message": "mm: zone_end_pfn is too small\n\nBooting with 32 TBytes memory hits BUG at mm/page_alloc.c:552! (output\nbelow).\n\nThe key hint is \"page 4294967296 outside zone\".\n4294967296 \u003d 0x100000000 (bit 32 is set).\n\nThe problem is in include/linux/mmzone.h:\n\n 530 static inline unsigned zone_end_pfn(const struct zone *zone)\n 531 {\n 532 return zone-\u003ezone_start_pfn + zone-\u003espanned_pages;\n 533 }\n\nzone_end_pfn is \"unsigned\" (32 bits). Changing it to \"unsigned long\"\n(64 bits) fixes the problem.\n\nzone_end_pfn() was added recently in commit 108bcc96ef70 (\"mm: add \u0026 use\nzone_end_pfn() and zone_spans_pfn()\")\n\nOutput from the failure.\n\n No AGP bridge found\n page 4294967296 outside zone [ 4294967296 - 4327469056 ]\n ------------[ cut here ]------------\n kernel BUG at mm/page_alloc.c:552!\n invalid opcode: 0000 [#1] SMP\n Modules linked in:\n CPU 0\n Pid: 0, comm: swapper Not tainted 3.9.0-rc2.dtp+ #10\n RIP: free_one_page+0x382/0x430\n Process swapper (pid: 0, threadinfo ffffffff81942000, task ffffffff81955420)\n Call Trace:\n __free_pages_ok+0x96/0xb0\n __free_pages+0x25/0x50\n __free_pages_bootmem+0x8a/0x8c\n __free_memory_core+0xea/0x131\n free_low_memory_core_early+0x4a/0x98\n free_all_bootmem+0x45/0x47\n mem_init+0x7b/0x14c\n start_kernel+0x216/0x433\n x86_64_start_reservations+0x2a/0x2c\n x86_64_start_kernel+0x144/0x153\n Code: 89 f1 ba 01 00 00 00 31 f6 d3 e2 4c 89 ef e8 66 a4 01 00 e9 2c fe ff ff 0f 0b eb fe 0f 0b 66 66 2e 0f 1f 84 00 00 00 00 00 eb f3 \u003c0f\u003e 0b eb fe 0f 0b 0f 1f 84 00 00 00 00 00 eb f6 0f 0b eb fe 49\n\nSigned-off-by: Russ Anderson \u003crja@sgi.com\u003e\nReported-by: George Beshers \u003cgbeshers@sgi.com\u003e\nAcked-by: Hedi Berriche \u003chedi@sgi.com\u003e\nCc: Cody P Schafer \u003ccody@linux.vnet.ibm.com\u003e\nCc: Michal Hocko \u003cmhocko@suse.cz\u003e\nSigned-off-by: Andrew Morton \u003cakpm@linux-foundation.org\u003e\nSigned-off-by: Linus Torvalds \u003ctorvalds@linux-foundation.org\u003e\n" }, { "commit": "dc72c32e1fd872a9a4fdfe645283c9dcd68e556d", "tree": "66f817ecb840f59173de2a95a9a69fb5c3a75d21", "parents": [ "fe8d52614bd419cedef85ef55850fd090373f481" ], "author": { "name": "Frederic Weisbecker", "email": "fweisbec@gmail.com", "time": "Fri Mar 22 15:04:39 2013 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Fri Mar 22 16:41:20 2013 -0700" }, "message": "printk: Provide a wake_up_klogd() off-case\n\nwake_up_klogd() is useless when CONFIG_PRINTK\u003dn because neither printk()\nnor printk_sched() are in use and there are actually no waiter on\nlog_wait waitqueue. It should be a stub in this case for users like\nbust_spinlocks().\n\nOtherwise this results in this warning when CONFIG_PRINTK\u003dn and\nCONFIG_IRQ_WORK\u003dn:\n\n\tkernel/built-in.o In function `wake_up_klogd\u0027:\n\t(.text.wake_up_klogd+0xb4): undefined reference to `irq_work_queue\u0027\n\nTo fix this, provide an off-case for wake_up_klogd() when\nCONFIG_PRINTK\u003dn.\n\nThere is much more from console_unlock() and other console related code\nin printk.c that should be moved under CONFIG_PRINTK. But for now,\nfocus on a minimal fix as we passed the merged window already.\n\n[akpm@linux-foundation.org: include printk.h in bust_spinlocks.c]\nSigned-off-by: Frederic Weisbecker \u003cfweisbec@gmail.com\u003e\nReported-by: James Hogan \u003cjames.hogan@imgtec.com\u003e\nCc: James Hogan \u003cjames.hogan@imgtec.com\u003e\nCc: Steven Rostedt \u003crostedt@goodmis.org\u003e\nCc: Peter Zijlstra \u003cpeterz@infradead.org\u003e\nCc: Ingo Molnar \u003cmingo@kernel.org\u003e\nSigned-off-by: Andrew Morton \u003cakpm@linux-foundation.org\u003e\nSigned-off-by: Linus Torvalds \u003ctorvalds@linux-foundation.org\u003e\n" }, { "commit": "fe8d52614bd419cedef85ef55850fd090373f481", "tree": "d75e03f0b382711bc051cdea5b29af84e52a671c", "parents": [ "9217cbb8df31c10efc96362227b2ebdbb9fe996c" ], "author": { "name": "James Hogan", "email": "james.hogan@imgtec.com", "time": "Fri Mar 22 15:04:37 2013 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Fri Mar 22 16:41:19 2013 -0700" }, "message": "irq_work.h: fix warning when CONFIG_IRQ_WORK\u003dn\n\nA randconfig caught repeated compiler warnings when CONFIG_IRQ_WORK\u003dn\ndue to the definition of a non-inline static function in\n\u003clinux/irq_work.h\u003e:\n\n include/linux/irq_work.h +40 : warning: \u0027irq_work_needs_cpu\u0027 defined but not used\n\nMake it inline to supress the warning. This is caused commit\n00b42959106a (\"irq_work: Don\u0027t stop the tick with pending works\") merged\nin v3.9-rc1.\n\nSigned-off-by: James Hogan \u003cjames.hogan@imgtec.com\u003e\nSigned-off-by: Frederic Weisbecker \u003cfweisbec@gmail.com\u003e\nCc: Steven Rostedt \u003crostedt@goodmis.org\u003e\nCc: Peter Zijlstra \u003cpeterz@infradead.org\u003e\nCc: Thomas Gleixner \u003ctglx@linutronix.de\u003e\nCc: Ingo Molnar \u003cmingo@kernel.org\u003e\nCc: Paul Gortmaker \u003cpaul.gortmaker@windriver.com\u003e\nSigned-off-by: Andrew Morton \u003cakpm@linux-foundation.org\u003e\nSigned-off-by: Linus Torvalds \u003ctorvalds@linux-foundation.org\u003e\n" }, { "commit": "b9cb3bf42efc2faa55e815f4368738978536c6d1", "tree": "d17b9aa7132313423d9c1d53695bbeead35fa00e", "parents": [ "8f46c507a2245697d6b3af75552c76d2f4fb3ed2", "09a6e1f4ad32243989b30485f78985c0923284cd" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Fri Mar 22 12:57:30 2013 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Fri Mar 22 12:57:30 2013 -0700" }, "message": "Merge git://git.kernel.org/pub/scm/virt/kvm/kvm\n\nPull KVM fix from Marcelo Tosatti:\n \"Fix compilation on PPC with !CONFIG_KVM\"\n\n* git://git.kernel.org/pub/scm/virt/kvm/kvm:\n Revert \"KVM: allow host header to be included even for !CONFIG_KVM\"\n" }, { "commit": "8f46c507a2245697d6b3af75552c76d2f4fb3ed2", "tree": "2d3372ae90c6dd549e4b664a65826770a5edf450", "parents": [ "70dc52faae971cb7cfd6b0d3a5824886bb5045bb", "fc98ab873aa3dbe783ce56a2ffdbbe7c7609521a" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Fri Mar 22 12:45:55 2013 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Fri Mar 22 12:45:55 2013 -0700" }, "message": "Merge tag \u0027usb-3.9-rc3\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/usb\n\nPull USB fixes from Greg Kroah-Hartman:\n \"Here are a number of USB fixes that resolve issues that have been\n reported against 3.9-rc3.\"\n\n* tag \u0027usb-3.9-rc3\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/usb: (37 commits)\n USB: ti_usb_3410_5052: fix use-after-free in TIOCMIWAIT\n USB: ssu100: fix use-after-free in TIOCMIWAIT\n USB: spcp8x5: fix use-after-free in TIOCMIWAIT\n USB: quatech2: fix use-after-free in TIOCMIWAIT\n USB: pl2303: fix use-after-free in TIOCMIWAIT\n USB: oti6858: fix use-after-free in TIOCMIWAIT\n USB: mos7840: fix use-after-free in TIOCMIWAIT\n USB: mos7840: fix broken TIOCMIWAIT\n USB: mct_u232: fix use-after-free in TIOCMIWAIT\n USB: io_ti: fix use-after-free in TIOCMIWAIT\n USB: io_edgeport: fix use-after-free in TIOCMIWAIT\n USB: ftdi_sio: fix use-after-free in TIOCMIWAIT\n USB: f81232: fix use-after-free in TIOCMIWAIT\n USB: cypress_m8: fix use-after-free in TIOCMIWAIT\n USB: ch341: fix use-after-free in TIOCMIWAIT\n USB: ark3116: fix use-after-free in TIOCMIWAIT\n USB: serial: add modem-status-change wait queue\n USB: serial: fix interface refcounting\n USB: io_ti: fix get_icount for two port adapters\n USB: garmin_gps: fix memory leak on disconnect\n ...\n" }, { "commit": "1e0695cbc814c718763ed93f20711b12c46cfa40", "tree": "a367fd984ddb5c12e80f8dfd9a41f385d7a19a97", "parents": [ "51f0885e5415b4cc6535e9cdcc5145bfbc134353", "9713faecff3d071de1208b081d4943b002e9cb1c" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Fri Mar 22 12:44:22 2013 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Fri Mar 22 12:44:22 2013 -0700" }, "message": "Merge tag \u0027for_linus\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/bp/bp\n\nPull EDAC fixes from Borislav Petkov:\n \"A fix from Mauro to correct csrow size accounting in sysfs and a\n sparse fix from Stephen Hemminger.\"\n\n* tag \u0027for_linus\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/bp/bp:\n EDAC: Merge mci.mem_is_per_rank with mci.csbased\n amd64_edac: Correct DIMM sizes\n EDAC: Make sysfs functions static\n" }, { "commit": "09a6e1f4ad32243989b30485f78985c0923284cd", "tree": "054ea05c79aaf29d966b9aa18c48780b5bec25ce", "parents": [ "2ffdd7e23cde5a8b94d41ec0adfdd58cffe67f3a" ], "author": { "name": "Marcelo Tosatti", "email": "mtosatti@redhat.com", "time": "Fri Mar 22 08:08:06 2013 -0300" }, "committer": { "name": "Marcelo Tosatti", "email": "mtosatti@redhat.com", "time": "Fri Mar 22 08:08:06 2013 -0300" }, "message": "Revert \"KVM: allow host header to be included even for !CONFIG_KVM\"\n\nThis reverts commit f445f11eb2cc265dd47da5b2e864df46cd6e5a82 as\nit breaks PPC with CONFIG_KVM\u003dn.\n\nSigned-off-by: Marcelo Tosatti \u003cmtosatti@redhat.com\u003e\n" }, { "commit": "e5b33dc9d16053c2ae4c2c669cf008829530364b", "tree": "620a348191d18d4bb6fe92ee80dfeb5b0723ef9c", "parents": [ "d7971051e4df825e0bc11b995e87bfe86355b8e5" ], "author": { "name": "Johan Hovold", "email": "jhovold@gmail.com", "time": "Tue Mar 19 09:21:10 2013 +0100" }, "committer": { "name": "Greg Kroah-Hartman", "email": "gregkh@linuxfoundation.org", "time": "Thu Mar 21 15:59:02 2013 -0700" }, "message": "USB: serial: add modem-status-change wait queue\n\nAdd modem-status-change wait queue to struct usb_serial_port that\nsubdrivers can use to implement TIOCMIWAIT.\n\nCurrently subdrivers use a private wait queue which may have been\nreleased when waking up after device disconnected.\n\nNote that we\u0027re adding a new wait queue rather than reusing the tty-port\none as we do not want to get woken up at hangup (yet).\n\nCc: stable \u003cstable@vger.kernel.org\u003e\nSigned-off-by: Johan Hovold \u003cjhovold@gmail.com\u003e\nSigned-off-by: Greg Kroah-Hartman \u003cgregkh@linuxfoundation.org\u003e\n" }, { "commit": "d93acbcacdec04dbdab0d1cc35457eb3bf1d2a38", "tree": "d05361d334d2d1035abf249031febebaa1766829", "parents": [ "d714aaf649460cbfd5e82e75520baa856b4fa0a0", "eda81bea894e5cd945e30f85b00546caf80fbecc" ], "author": { "name": "Greg Kroah-Hartman", "email": "gregkh@linuxfoundation.org", "time": "Thu Mar 21 08:40:22 2013 -0700" }, "committer": { "name": "Greg Kroah-Hartman", "email": "gregkh@linuxfoundation.org", "time": "Thu Mar 21 08:40:22 2013 -0700" }, "message": "Merge tag \u0027fixes-for-v3.9-rc4\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/balbi/usb into usb-linus\n\nFelipe writes:\n\n\tusb: fixes for v3.9-rc4\n\n\tudc-core learned that it shouldn\u0027t use invalid pointers\n\twhen unloading a gadget driver.\n\n\tnet2272 and net2280 got a fix for a regression caused by\n\tthe udc_start/udc_stop conversion.\n\n\tWe\u0027re defining a static inline no-op for otg_ulpi_create()\n\tto prevent build errors when that driver isn\u0027t enabled.\n\n\tFunctionFS got a fix for an off-by-one error when binding\n\tand unbinding instances of FunctionFS.\n\n\tMUSB learned that it shouldn\u0027t try to unmap buffers which\n\tweren\u0027t previously mapped.\n\n\tf_rndis got a fix for a possible NULL pointer dereference\n\tin a debugging message code.\n\n\tMUSB\u0027s DA8xx glue layer got a build fix due to a typo.\n" }, { "commit": "cd82346934888e083da3b70e4bea13923175d086", "tree": "40d5058b50864e2c42e5a14cc4bd1029fe9373e0", "parents": [ "172a271b5e090da7468c66b9ccbcdb3d929eed75", "fd4a5aef002bb57e8a35ed34d8a878034b9bde94" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Thu Mar 21 08:29:11 2013 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Thu Mar 21 08:29:11 2013 -0700" }, "message": "Merge branch \u0027perf-urgent-for-linus\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip\n\nPull perf fixes from Ingo Molnar:\n \"A fair chunk of the linecount comes from a fix for a tracing bug that\n corrupts latency tracing buffers when the overwrite mode is changed on\n the fly - the rest is mostly assorted fewliner fixlets.\"\n\n* \u0027perf-urgent-for-linus\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip:\n perf/x86: Add SNB/SNB-EP scheduling constraints for cycle_activity event\n kprobes/x86: Check Interrupt Flag modifier when registering probe\n kprobes: Make hash_64() as always inlined\n perf: Generate EXIT event only once per task context\n perf: Reset hwc-\u003elast_period on sw clock events\n tracing: Prevent buffer overwrite disabled for latency tracers\n tracing: Keep overwrite in sync between regular and snapshot buffers\n tracing: Protect tracer flags with trace_types_lock\n perf tools: Fix LIBNUMA build with glibc 2.12 and older.\n tracing: Fix free of probe entry by calling call_rcu_sched()\n perf/POWER7: Create a sysfs format entry for Power7 events\n perf probe: Fix segfault\n libtraceevent: Remove hard coded include to /usr/local/include in Makefile\n perf record: Fix -C option\n perf tools: check if -DFORTIFY_SOURCE\u003d2 is allowed\n perf report: Fix build with NO_NEWT\u003d1\n perf annotate: Fix build with NO_NEWT\u003d1\n tracing: Fix race in snapshot swapping\n" }, { "commit": "73214f5d9f33b79918b1f7babddd5c8af28dd23d", "tree": "c18b7cb34898ac673c0f3b85d45225f95ac0f885", "parents": [ "f379fb991b9f958be2c89df8dc0e446d67f657e4" ], "author": { "name": "Masatake YAMATO", "email": "yamato@redhat.com", "time": "Tue Mar 19 01:47:28 2013 +0000" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Wed Mar 20 17:56:58 2013 -0400" }, "message": "thermal: shorten too long mcast group name\n\nThe original name is too long.\n\nSigned-off-by: Masatake YAMATO \u003cyamato@redhat.com\u003e\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "44046a593eb770dbecdabf1c82bcd252f2a8337b", "tree": "1f8db140d6f920d0abad4a072c8f2d85a6e6ca9b", "parents": [ "f1e79e208076ffe7bad97158275f1c572c04f5c7" ], "author": { "name": "Tom Parkin", "email": "tparkin@katalix.com", "time": "Tue Mar 19 06:11:12 2013 +0000" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Wed Mar 20 12:10:38 2013 -0400" }, "message": "udp: add encap_destroy callback\n\nUsers of udp encapsulation currently have an encap_rcv callback which they can\nuse to hook into the udp receive path.\n\nIn situations where a encapsulation user allocates resources associated with a\nudp encap socket, it may be convenient to be able to also hook the proto\n.destroy operation. For example, if an encap user holds a reference to the\nudp socket, the destroy hook might be used to relinquish this reference.\n\nThis patch adds a socket destroy hook into udp, which is set and enabled\nin the same way as the existing encap_rcv hook.\n\nSigned-off-by: Tom Parkin \u003ctparkin@katalix.com\u003e\nSigned-off-by: James Chapman \u003cjchapman@katalix.com\u003e\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "7fa4cd1a78ea5af688ffce45553abbee9d7afd84", "tree": "8504ffc3fd9d2e2abd90c39c11edf6667c8d9075", "parents": [ "3416905ba058e43112ad7b1b4859797f027f5a07" ], "author": { "name": "Fabio Estevam", "email": "fabio.estevam@freescale.com", "time": "Wed Mar 20 10:35:44 2013 -0300" }, "committer": { "name": "Felipe Balbi", "email": "balbi@ti.com", "time": "Wed Mar 20 17:30:40 2013 +0200" }, "message": "usb: ulpi: Define a *otg_ulpi_create no-op\n\nBuilding a kernel for imx_v4_v5_defconfig with CONFIG_USB_ULPI disabled, results\nin the following error:\n\narch/arm/mach-imx/built-in.o: In function \u0027pca100_init\u0027:\nplatform-mx2-emma.c:(.init.text+0x6788): undefined reference to \u0027otg_ulpi_create\u0027\nplatform-mx2-emma.c:(.init.text+0x682c): undefined reference to \u0027mxc_ulpi_access_ops\u0027\n\nFix this by providing a no-op definition of *otg_ulpi_create for the case when\nCONFIG_USB_ULPI is not defined.\n\nAcked-by: Igor Grinberg \u003cgrinberg@compulab.co.il\u003e\nSigned-off-by: Fabio Estevam \u003cfabio.estevam@freescale.com\u003e\nSigned-off-by: Felipe Balbi \u003cbalbi@ti.com\u003e\n" }, { "commit": "ea4a0ce11160200410abbabd44ec9e75e93a95be", "tree": "20ceced4ddc4b34d78ce1318d2bc5a58debf08aa", "parents": [ "10b38669d64c757cfd927e3820292c580ed70aae", "a2c118bfab8bc6b8bb213abfc35201e441693d55" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Tue Mar 19 18:24:12 2013 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Tue Mar 19 18:24:12 2013 -0700" }, "message": "Merge git://git.kernel.org/pub/scm/virt/kvm/kvm\n\nPull kvm fixes from Marcelo Tosatti.\n\n* git://git.kernel.org/pub/scm/virt/kvm/kvm:\n KVM: Fix bounds checking in ioapic indirect register reads (CVE-2013-1798)\n KVM: x86: Convert MSR_KVM_SYSTEM_TIME to use gfn_to_hva_cache functions (CVE-2013-1797)\n KVM: x86: fix for buffer overflow in handling of MSR_KVM_SYSTEM_TIME (CVE-2013-1796)\n KVM: x86: fix deadlock in clock-in-progress request handling\n KVM: allow host header to be included even for !CONFIG_KVM\n" }, { "commit": "7b1b3fd74e3a8a63858fc5382af90d2a19f4afb8", "tree": "c65082c666b1a790de559b5854b6e36795ba894e", "parents": [ "112ccff716ae74ffa5f30266b29c4d72aab4074b", "5a3da1fe9561828d0ca7eca664b16ec2b9bf0055" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Tue Mar 19 13:20:51 2013 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Tue Mar 19 13:20:51 2013 -0700" }, "message": "Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net\n\nPull networking fixes from David Miller:\n\n 1) Fix ARM BPF JIT handling of negative \u0027k\u0027 values, from Chen Gang.\n\n 2) Insufficient space reserved for bridge netlink values, fix from\n Stephen Hemminger.\n\n 3) Some dst_neigh_lookup*() callers don\u0027t interpret error pointer\n correctly, fix from Zhouyi Zhou.\n\n 4) Fix transport match in SCTP active_path loops, from Xugeng Zhang.\n\n 5) Fix qeth driver handling of multi-order SKB frags, from Frank\n Blaschka.\n\n 6) fec driver is missing napi_disable() call, resulting in crashes on\n unload, from Georg Hofmann.\n\n 7) Don\u0027t try to handle PMTU events on a listening socket, fix from Eric\n Dumazet.\n\n 8) Fix timestamp location calculations in IP option processing, from\n David Ward.\n\n 9) FIB_TABLE_HASHSZ setting is not controlled by the correct kconfig\n tests, from Denis V Lunev.\n\n10) Fix TX descriptor push handling in SFC driver, from Ben Hutchings.\n\n11) Fix isdn/hisax and tulip/de4x5 kconfig dependencies, from Arnd\n Bergmann.\n\n12) bnx2x statistics don\u0027t handle 4GB rollover correctly, fix from\n Maciej Żenczykowski.\n\n13) Openvswitch bug fixes for vport del/new error reporting, missing\n genlmsg_end() call in netlink processing, and mis-parsing of\n LLC/SNAP ethernet types. From Rich Lane.\n\n14) SKB pfmemalloc state should only be propagated from the head page of\n a compound page, fix from Pavel Emelyanov.\n\n15) Fix link handling in tg3 driver for 5715 chips when autonegotation\n is disabled. From Nithin Sujir.\n\n16) Fix inverted test of cpdma_check_free_tx_desc return value in\n davinci_emac driver, from Mugunthan V N.\n\n17) vlan_depth is incorrectly calculated in skb_network_protocol(), from\n Li RongQing.\n\n18) Fix probing of Gobi 1K devices in qmi_wwan driver, and fix NCM\n device mode backwards compat in cdc_ncm driver. From Bjørn Mork.\n\n* git://git.kernel.org/pub/scm/linux/kernel/git/davem/net: (52 commits)\n inet: limit length of fragment queue hash table bucket lists\n qeth: Fix scatter-gather regression\n qeth: Fix invalid router settings handling\n qeth: delay feature trace\n tcp: dont handle MTU reduction on LISTEN socket\n bnx2x: fix occasional statistics off-by-4GB error\n vhost/net: fix heads usage of ubuf_info\n bridge: Add support for setting BR_ROOT_BLOCK flag.\n bnx2x: add missing napi deletion in error path\n drivers: net: ethernet: ti: davinci_emac: fix usage of cpdma_check_free_tx_desc()\n ethernet/tulip: DE4x5 needs VIRT_TO_BUS\n isdn: hisax: netjet requires VIRT_TO_BUS\n net: cdc_ncm, cdc_mbim: allow user to prefer NCM for backwards compatibility\n rtnetlink: Mask the rta_type when range checking\n Revert \"ip_gre: make ipgre_tunnel_xmit() not parse network header as IP unconditionally\"\n Fix dst_neigh_lookup/dst_neigh_lookup_skb return value handling bug\n smsc75xx: configuration help incorrectly mentions smsc95xx\n net: fec: fix missing napi_disable call\n net: fec: restart the FEC when PHY speed changes\n skb: Propagate pfmemalloc on skb from head page only\n ...\n" }, { "commit": "2a1486981c1317dc4f4aad568f2cc6e49dfb8c82", "tree": "daaac9cc2b216519c2c456450344b7e5c66c01de", "parents": [ "1762c5ab7ce5f482aafaf9b6a721e41f073ae3cb" ], "author": { "name": "David Howells", "email": "dhowells@redhat.com", "time": "Tue Mar 19 14:00:53 2013 +0000" }, "committer": { "name": "Ralf Baechle", "email": "ralf@linux-mips.org", "time": "Tue Mar 19 19:15:52 2013 +0100" }, "message": "Fix breakage in MIPS siginfo handling\n\nMIPS\u0027s siginfo handling has been broken since this commit:\n\n\tcommit 574c4866e33d648520a8bd5bf6f573ea6e554e88\n\tAuthor: Al Viro \u003cviro@zeniv.linux.org.uk\u003e\n\tDate: Sun Nov 25 22:24:19 2012 -0500\n\tconsolidate kernel-side struct sigaction declarations\n\nfor 64-bit BE MIPS CPUs.\n\nThe UAPI variant looks like this:\n\n\tstruct sigaction {\n\t\tunsigned int\tsa_flags;\n\t\t__sighandler_t\tsa_handler;\n\t\tsigset_t\tsa_mask;\n\t};\n\nbut the core kernel\u0027s variant looks like this:\n\n\tstruct sigaction {\n\t#ifndef __ARCH_HAS_ODD_SIGACTION\n\t\t__sighandler_t\tsa_handler;\n\t\tunsigned long\tsa_flags;\n\t#else\n\t\tunsigned long\tsa_flags;\n\t\t__sighandler_t\tsa_handler;\n\t#endif\n\t#ifdef __ARCH_HAS_SA_RESTORER\n\t\t__sigrestore_t sa_restorer;\n\t#endif\n\t\tsigset_t\tsa_mask;\n\t};\n\nThe problem is that sa_flags has been changed from an unsigned int to an\nunsigned long.\n\nFix this by making sa_flags unsigned int if __ARCH_HAS_ODD_SIGACTION is\ndefined.\n\nWhilst we\u0027re at it, rename __ARCH_HAS_ODD_SIGACTION to\n__ARCH_HAS_IRIX_SIGACTION.\n\nSigned-off-by: David Howells \u003cdhowells@redhat.com\u003e\nCc: linux-mips@linux-mips.org\nCc: linux-kernel@vger.kernel.org\nCc: stable@vger.kernel.org\nAcked-by: Al Viro \u003cviro@zeniv.linux.org.uk\u003e\nSigned-off-by: Ralf Baechle \u003cralf@linux-mips.org\u003e\n" }, { "commit": "6a15075eced2d780fa6c5d83682410f47f2e800b", "tree": "ea7322920030c516a4757a8f4d22eda2ddf6fc75", "parents": [ "a937536b868b8369b98967929045f1df54234323" ], "author": { "name": "Marek Vasut", "email": "marex@denx.de", "time": "Mon Mar 18 19:24:02 2013 +0100" }, "committer": { "name": "Shawn Guo", "email": "shawn.guo@linaro.org", "time": "Tue Mar 19 11:07:58 2013 +0800" }, "message": "ARM: video: mxs: Fix mxsfb misconfiguring VDCTRL0\n\nThe issue fixed by this patch manifests only then using X11\nwith mxsfb driver. The X11 will display either shifted image\nor otherwise distorted image on the LCD.\n\nThe problem is that the X11 tries to reconfigure the framebuffer\nand along the way calls fb_ops.fb_set_par() with X11\u0027s desired\nconfiguration values. The field of particular interest is\nfb_info-\u003evar.sync which contains non-standard values if\nconfigured by kernel. These are either FB_SYNC_DATA_ENABLE_HIGH_ACT,\nFB_SYNC_DOTCLK_FAILING_ACT or both, depending on the platform\nconfiguration. Both of these values are defined in the\ninclude/linux/mxsfb.h file.\n\nThe driver interprets these values and configures the LCD controller\naccordingly. Yet X11 only has access to the standard values for this\nfield defined in include/uapi/linux/fb.h and thus, unlike kernel,\nomits these special values. This results in distorted image on the\nLCD.\n\nThis patch moves these non-standard values into new field of the\nmxsfb_platform_data structure so the driver can in turn check this\nfield instead of the video mode field for these specific portions.\n\nMoreover, this patch prefixes these values with MXSFB_SYNC_ prefix\ninstead of FB_SYNC_ prefix to prevent confusion of subsequent users.\n\nSigned-off-by: Marek Vasut \u003cmarex@denx.de\u003e\nCc: Fabio Estevam \u003cfabio.estevam@freescale.com\u003e\nCc: Linux ARM \u003clinux-arm-kernel@lists.infradead.org\u003e\nCc: Linux FBDEV \u003clinux-fbdev@vger.kernel.org\u003e\nCc: Lothar Waßmann \u003cLW@karo-electronics.de\u003e\nCc: Sascha Hauer \u003ckernel@pengutronix.de\u003e\nTested-by: Fabio Estevam \u003cfabio.estevam@freescale.com\u003e\nSigned-off-by: Shawn Guo \u003cshawn.guo@linaro.org\u003e\n" } ], "next": "f445f11eb2cc265dd47da5b2e864df46cd6e5a82" }