)]}' { "log": [ { "commit": "8e2b2b46ea4ca5ef790dddf78b360ed736a62d7c", "tree": "35fb2be1225c5a4733d4be8c03bc5725f79b43c2", "parents": [ "0c9ae701ae1caf657326db22d61074b40a747c9d" ], "author": { "name": "Stefan Richter", "email": "stefanr@s5r6.in-berlin.de", "time": "Fri Jul 23 13:05:39 2010 +0200" }, "committer": { "name": "Stefan Richter", "email": "stefanr@s5r6.in-berlin.de", "time": "Fri Jul 23 13:36:28 2010 +0200" }, "message": "firewire: cdev: improve FW_CDEV_IOC_ALLOCATE\n\nIn both the ieee1394 stack and the firewire stack, the core treats\nkernelspace drivers better than userspace drivers when it comes to\nCSR address range allocation: The former may request a register to be\nplaced automatically at a free spot anywhere inside a specified address\nrange. The latter may only request a register at a fixed offset.\n\nHence, userspace drivers which do not require a fixed offset potentially\nneed to implement a retry loop with incremented offset in each retry\nuntil the kernel does not fail allocation with EBUSY. This awkward\nprocedure is not fundamentally necessary as the core already provides a\nsuperior allocation API to kernelspace drivers.\n\nTherefore change the ioctl() ABI by addition of a region_end member in\nthe existing struct fw_cdev_allocate. Userspace and kernelspace APIs\nwork the same way now.\n\nThere is a small cost to pay by clients though: If client source code\nis required to compile with older kernel headers too, then any use of\nthe new member fw_cdev_allocate.region_end needs to be enclosed by\n#ifdef/#endif directives. However, any client program that seriously\nwants to use address range allocations will require a kernel of cdev ABI\nversion \u003e\u003d 4 at runtime and a linux/firewire-cdev.h header of \u003e\u003d 4\nanyway. This is because v4 brings FW_CDEV_EVENT_REQUEST2. The only\nclient program in which build-time compatibility with struct\nfw_cdev_allocate as found in older kernel headers makes sense is\nlibraw1394.\n\n(libraw1394 uses the older broken FW_CDEV_EVENT_REQUEST to implement a\nmakeshift, incorrect transaction responder that does at least work\nsomewhat in many simple scenarios, relying on guesswork by libraw1394\nand by libraw1394 based applications. Plus, address range allocation\nand transaction responder is only one of many features that libraw1394\nneeds to provide, and these other features need to work with kernel and\nkernel-headers as old as possible. Any new linux/firewire-cdev.h based\nclient that implements a transaction responder should never attempt to\ndo it like libraw1394; instead it should make a header and kernel of v4\nor later a hard requirement.)\n\nWhile we are at it, update the struct fw_cdev_allocate documentation to\nbetter reflect the recent fw_cdev_event_request2 ABI addition.\n\nSigned-off-by: Stefan Richter \u003cstefanr@s5r6.in-berlin.de\u003e\n" }, { "commit": "cc550216ae9a2993ef3973464714dc1a39ab1f86", "tree": "62ffde836c83fe44b7a9edc01d00bcb9ad4f4ad6", "parents": [ "bf54e1462b9192fdef7ea9e2bc44fdc16a4b87bc" ], "author": { "name": "Stefan Richter", "email": "stefanr@s5r6.in-berlin.de", "time": "Sun Jul 18 13:00:50 2010 +0200" }, "committer": { "name": "Stefan Richter", "email": "stefanr@s5r6.in-berlin.de", "time": "Fri Jul 23 13:36:28 2010 +0200" }, "message": "firewire: cdev: add PHY pinging\n\nThis extends the FW_CDEV_IOC_SEND_PHY_PACKET ioctl() for /dev/fw* to be\nuseful for ping time measurements. One application for it would be gap\ncount optimization in userspace that is based on ping times rather than\nhop count. (The latter is implemented in firewire-core itself but is\nnot applicable to beta PHYs that act as repeater.)\n\nSigned-off-by: Stefan Richter \u003cstefanr@s5r6.in-berlin.de\u003e\n" }, { "commit": "bf54e1462b9192fdef7ea9e2bc44fdc16a4b87bc", "tree": "31ec8e4e13b76d22b7bf9f93ea620e88911fe416", "parents": [ "850bb6f23b93c04ce1e4509a87fa607dc17d97c1" ], "author": { "name": "Stefan Richter", "email": "stefanr@s5r6.in-berlin.de", "time": "Fri Jul 16 22:25:51 2010 +0200" }, "committer": { "name": "Stefan Richter", "email": "stefanr@s5r6.in-berlin.de", "time": "Fri Jul 23 13:36:28 2010 +0200" }, "message": "firewire: cdev: add PHY packet reception\n\nAdd an FW_CDEV_IOC_RECEIVE_PHY_PACKETS ioctl() and\nFW_CDEV_EVENT_PHY_PACKET_RECEIVED poll()/read() event for /dev/fw*.\nThis can be used to get information from remote PHYs by remote access\nPHY packets.\n\nThis is also the 2nd half of the functionality (the receive part) to\nsupport a userspace implementation of a VersaPHY transaction layer.\n\nSafety considerations:\n\n - PHY packets are generally broadcasts, hence some kind of elevated\n privileges should be required of a process to be able to listen in\n on PHY packets. This implementation assumes that a process that is\n allowed to open the /dev/fw* of a local node does have this\n privilege.\n\n There was an inconclusive discussion about introducing POSIX\n capabilities as a means to check for user privileges for these\n kinds of operations.\n\nOther limitations:\n\n - PHY packet reception may be switched on by ioctl() but cannot be\n switched off again. It would be trivial to provide an off switch,\n but this is not worth the code. The client should simply close()\n the fd then, or just ignore further events.\n\n - For sake of simplicity of API and kernel-side implementation, no\n filter per packet content is provided.\n\nSigned-off-by: Stefan Richter \u003cstefanr@s5r6.in-berlin.de\u003e\n" }, { "commit": "850bb6f23b93c04ce1e4509a87fa607dc17d97c1", "tree": "4ec66cea35e15ff095799bae4aec7c1071d4faa4", "parents": [ "b9dc61cf404165fb77e80c853e9fec9af258f9ce" ], "author": { "name": "Stefan Richter", "email": "stefanr@s5r6.in-berlin.de", "time": "Fri Jul 16 22:25:14 2010 +0200" }, "committer": { "name": "Stefan Richter", "email": "stefanr@s5r6.in-berlin.de", "time": "Fri Jul 23 13:36:28 2010 +0200" }, "message": "firewire: cdev: add PHY packet transmission\n\nAdd an FW_CDEV_IOC_SEND_PHY_PACKET ioctl() for /dev/fw* which can be\nused to implement bus management related functionality in userspace.\n\nThis is also half of the functionality (the transmit part) that is\nneeded to support a userspace implementation of a VersaPHY transaction\nlayer.\n\nSafety considerations:\n\n - PHY packets are generally broadcasts and may have interesting\n effects on PHYs and the bus, e.g. make asynchronous arbitration\n impossible due to too low gap count. Hence some kind of elevated\n privileges should be required of a process to be able to send\n PHY packets. This implementation assumes that a process that is\n allowed to open the /dev/fw* of a local node does have this\n privilege.\n\n There was an inconclusive discussion about introducing POSIX\n capabilities as a means to check for user privileges for these\n kinds of operations.\n\n - The kernel does not check integrity of the supplied packet data.\n That would be far too much code, considering the many kinds of\n PHY packets. A process which got the privilege to send these\n packets is trusted to do it correctly.\n\nJust like with the other \"send packet\" ioctls, a non-blocking API is\nchosen; i.e. the ioctl may return even before AT DMA started. After\ntransmission, an event for poll()/read() is enqueued. Most users are\ngoing to need a blocking API, but a blocking userspace wrapper is easy\nto implement, and the second of the two existing libraw1394 calls\nraw1394_phy_packet_write() and raw1394_start_phy_packet_write() can be\nbetter supported that way.\n\nSigned-off-by: Stefan Richter \u003cstefanr@s5r6.in-berlin.de\u003e\n" }, { "commit": "d505e6e87127d4dbdaa5d91561eed810c180ca23", "tree": "590f16144d1d125f745610baae4503e2e0ae8901", "parents": [ "18d0cdfd1a4cc9028c0ef80f94538b31541f8fe5" ], "author": { "name": "Stefan Richter", "email": "stefanr@s5r6.in-berlin.de", "time": "Sat Jul 17 21:36:02 2010 +0200" }, "committer": { "name": "Stefan Richter", "email": "stefanr@s5r6.in-berlin.de", "time": "Fri Jul 23 13:36:27 2010 +0200" }, "message": "firewire: cdev: some clarifications to the API documentation\n\nResponse events:\n - are generated on more occasions than their documentation claimed.\n\nCSR allocation:\n - An already occupied CSR can be determined from errno\u003d\u003dEBUSY.\n\nBus resets:\n - Note that FW_CDEV_IOC_INITIATE_BUS_RESET is nonblocking and that the\n client is not required to observe a grace period since kernels\n 2.6.36+ will enforce it now (commit 02d37bed).\n\n - The possible values of fw_cdev_initiate_bus_reset.type are listed in\n the kerneldoc comment already.\n\n - Clarify that an application that uses FW_CDEV_IOC_ADD_DESCRIPTOR and\n FW_CDEV_IOC_REMOVE_DESCRIPTOR does not have to issue a bus reset.\n\nIsochronous I/O contexts:\n - At most one can be created per open file descriptor.\n\nSigned-off-by: Stefan Richter \u003cstefanr@s5r6.in-berlin.de\u003e\n" }, { "commit": "18d0cdfd1a4cc9028c0ef80f94538b31541f8fe5", "tree": "c28db7537da311e59e871aba7f6f0edaa46535b9", "parents": [ "80792d182e43bee89fce509e64fdea27e600530f" ], "author": { "name": "Stefan Richter", "email": "stefanr@s5r6.in-berlin.de", "time": "Sun Jul 18 12:44:01 2010 +0200" }, "committer": { "name": "Stefan Richter", "email": "stefanr@s5r6.in-berlin.de", "time": "Fri Jul 23 13:36:27 2010 +0200" }, "message": "firewire: normalize status values in packet callbacks\n\ncore-transaction.c transmit_complete_callback() and close_transaction()\nexpect packet callback status to be an ACK or RCODE, and ACKs get\ntranslated to RCODEs for transaction callbacks.\n\nAn old comment on the packet callback API (been there from the initial\nsubmission of the stack) and the dummy_driver implementation of\nsend_request/send_response deviated from this as they also included\n-ERRNO in the range of status values.\n\nLet\u0027s narrow status values down to ACK and RCODE to prevent surprises.\nRCODE_CANCELLED is chosen as the dummy_driver\u0027s RCODE as its meaning of\n\"transaction timed out\" comes closest to what happens when a transaction\ncoincides with card removal.\n\nSigned-off-by: Stefan Richter \u003cstefanr@s5r6.in-berlin.de\u003e\n" }, { "commit": "02d37bed188c500ee7afb0a2dc6b65a80704c58e", "tree": "a019891672a1505e35eb15fa2621caffecff2c80", "parents": [ "8b4f70ba4967cae90d128857af1382026a24230a" ], "author": { "name": "Stefan Richter", "email": "stefanr@s5r6.in-berlin.de", "time": "Thu Jul 08 16:09:06 2010 +0200" }, "committer": { "name": "Stefan Richter", "email": "stefanr@s5r6.in-berlin.de", "time": "Tue Jul 13 09:58:27 2010 +0200" }, "message": "firewire: core: integrate software-forced bus resets with bus management\n\nBus resets which are triggered\n - by the kernel drivers after updates of the local nodes\u0027 config ROM,\n - by userspace software via ioctl\nshall be deferred until after \u003e\u003d2 seconds after the last bus reset.\n\nIf multiple modifications of the local nodes\u0027 config ROM happen in a row,\nonly a single bus reset should happen after them.\n\nWhen the local node\u0027s link goes from inactive to active or vice versa,\nand at the two occasions of bus resets mentioned above --- and if the\ncurrent gap count differs from 63 --- the bus reset should be preceded\nby a PHY configuration packet that reaffirms the gap count. Otherwise a\nbus manager would have to reset the bus again right after that.\n\nThis is necessary to promote bus stability, e.g. leave grace periods for\nallocations and reallocations of isochronous channels and bandwidth,\nSBP-2 reconnections etc.; see IEEE 1394 clause 8.2.1.\n\nThis change implements all of the above by moving bus reset initiation\ninto a delayed work (except for bus resets which are triggered by the\nbus manager workqueue job and are performed there immediately). It\ncomes with a necessary addition to the card driver methods that allows\nto get the current gap count from PHY registers.\n\nSigned-off-by: Stefan Richter \u003cstefanr@s5r6.in-berlin.de\u003e\n" }, { "commit": "250b2b6dd421c9f8844a867d2ac06e0661e0ad93", "tree": "b86719d2c442676a52c6307471c9e278b1bd21f5", "parents": [ "ae948011071c12ff6a328348859c717ea885ed40" ], "author": { "name": "Stefan Richter", "email": "stefanr@s5r6.in-berlin.de", "time": "Mon Jun 21 23:24:35 2010 +0200" }, "committer": { "name": "Stefan Richter", "email": "stefanr@s5r6.in-berlin.de", "time": "Thu Jul 08 16:52:02 2010 +0200" }, "message": "firewire: cdev: fix fw_cdev_event_bus_reset.bm_node_id\n\nFix an obscure ABI feature that is a bit of a hassle to implement.\nHowever, somebody put it into the ABI, so let\u0027s fill in a sensible\nvalue there.\n\nSigned-off-by: Stefan Richter \u003cstefanr@s5r6.in-berlin.de\u003e\n" }, { "commit": "3b2b65d68fc87b02ac393a031a4ebb3de84a8218", "tree": "6adbd37cdaa63922d9f36c9a75e51c0178dd308d", "parents": [ "e205597d188a9ea69ce43f740a14f07b3f5b996a" ], "author": { "name": "Stefan Richter", "email": "stefanr@s5r6.in-berlin.de", "time": "Sun Jun 20 22:54:22 2010 +0200" }, "committer": { "name": "Stefan Richter", "email": "stefanr@s5r6.in-berlin.de", "time": "Sun Jun 20 23:11:56 2010 +0200" }, "message": "firewire: cdev: extend fw_cdev_event_iso_interrupt documentation\n\nAdd information regarding the 2.6.32 update to the xmit variant of\nfw_cdev_event_iso_interrupt.\n\nSigned-off-by: Stefan Richter \u003cstefanr@s5r6.in-berlin.de\u003e\n" }, { "commit": "e205597d188a9ea69ce43f740a14f07b3f5b996a", "tree": "9b894920db99c784c9abbe95269b972d0a1fc5c7", "parents": [ "c82f91f2663e79b150afd896ec72e798ba4e243d" ], "author": { "name": "Stefan Richter", "email": "stefanr@s5r6.in-berlin.de", "time": "Sun Jun 20 22:53:55 2010 +0200" }, "committer": { "name": "Stefan Richter", "email": "stefanr@s5r6.in-berlin.de", "time": "Sun Jun 20 23:11:56 2010 +0200" }, "message": "firewire: cdev: fix ABI for FCP and address range mapping, add fw_cdev_event_request2\n\nThe problem:\n\nA target-like userspace driver, e.g. AV/C target or SBP-2/3 target,\nneeds to be able to act as responder and requester. In the latter role,\nit needs to send requests to nods from which it received requests. This\nis currently impossible because fw_cdev_event_request lacks information\nabout sender node ID.\nReported-by: Jay Fenlason \u003cfenlason@redhat.com\u003e\n\nLibffado + libraw1394 + firewire-core is currently unable to drive two\nor more audio devices on the same bus.\nReported-by: Arnold Krille \u003carnold@arnoldarts.de\u003e\n\nThis is because libffado requires destination node ID of FCP requests\nand sender node ID of FCP responses to match. It even prohibits\nlibffado from working with a bus on which libraw1394 opens a /dev/fw* as\ndefault ioctl device that does not correspond with the audio device.\nThis is because libraw1394 does not receive the sender node ID from the\nkernel.\n\nMoreover, fw_cdev_event_request makes it impossible to tell unicast and\nbroadcast write requests apart.\n\nThe fix:\n\nAdd a replacement of struct fw_cdev_event_request request, boringly\ncalled struct fw_cdev_event_request2. The new event will be sent to a\nuserspace client instead of the old one if the client claims\ncompatibility with \u003clinux/firewire-cdev.h\u003e ABI version 4 or later.\n\nlibraw1394 needs to be extended to make use of the new event, in order\nto properly support libffado and other FCP or address range mapping\nusers who require correct sender node IDs.\n\nFurther notes:\n\nWhile we are at it, change back the range of possible values of\nfw_cdev_event_request.tcode to 0x0...0xb like in ABI version \u003c\u003d 3.\nThe preceding change \"firewire: expose extended tcode of incoming lock\nrequests to (userspace) drivers\" expanded it to 0x0...0x17 which could\ncatch sloppily coded clients by surprise. The extended range of codes\nis only used in the new fw_cdev_event_request2.tcode.\n\nJay and I also suggested an alternative approach to fix the ABI for\nincoming requests: Add an FW_CDEV_IOC_GET_REQUEST_INFO ioctl which can\nbe called after reception of an fw_cdev_event_request, before issuing of\nthe closing FW_CDEV_IOC_SEND_RESPONSE ioctl. The new ioctl would reveal\nthe vital information about a request that fw_cdev_event_request lacks.\nJay showed an implementation of this approach.\n\nThe former event approach adds 27 LOC of rather trivial code to\ncore-cdev.c, the ioctl approach 34 LOC, some of which is nontrivial.\nThe ioctl approach would certainly also add more LOC to userspace\nprograms which require the expanded information on inbound requests.\nThis approach is probably only on the lighter-weight side in case of\nclients that want to be compatible with kernels that lack the new\ncapability, like libraw1394. However, the code to be added to such\nlibraw1394-like clients in case of the event approach is a straight-\nforward additional switch () case in its event handler.\n\nSigned-off-by: Stefan Richter \u003cstefanr@s5r6.in-berlin.de\u003e\n" }, { "commit": "604f45167824e18ad5766e51ecf1d4d65f15118d", "tree": "40deeca88e1788e98d54d82f429a45ce276c4135", "parents": [ "0244f57302f7e8bebd2f1ab58767eac2e9f678a6" ], "author": { "name": "Stefan Richter", "email": "stefanr@s5r6.in-berlin.de", "time": "Sun Jun 20 22:52:55 2010 +0200" }, "committer": { "name": "Stefan Richter", "email": "stefanr@s5r6.in-berlin.de", "time": "Sun Jun 20 23:11:56 2010 +0200" }, "message": "firewire: cdev: freeze FW_CDEV_VERSION due to libraw1394 bug\n\nlibraw1394 v2.0.0...v2.0.5 takes FW_CDEV_VERSION from an externally\ninstalled header file and uses it to declare its own implementation\nlevel in FW_CDEV_IOC_GET_INFO. This is wrong; it should set the real\nversion for which it was actually written.\n\nIf we add features to the kernel ABI that require the kernel to check\na client\u0027s implementation level, we can not trust the client version if\nit was set from FW_CDEV_VERSION.\n\nHence freeze FW_CDEV_VERSION at the current value (no damage has been\ndone yet), clearly document FW_CDEV_VERSION as a dummy version and what\nclients are expected to do with fw_cdev_get_info.version, and use a new\ndefined constant (which is not placed into the exported header file) as\nkernel implementation level.\n\nNote, in order to check in client program source code which features are\npresent in an externally installed linux/firewire-cdev.h, use\npreprocessor directives like\n #ifdef FW_CDEV_IOC_ALLOCATE_ISO_RESOURCE\nor\n #ifdef FW_CDEV_EVENT_ISO_RESOURCE_ALLOCATED\ninstead of a check of FW_CDEV_VERSION.\n\nSigned-off-by: Stefan Richter \u003cstefanr@s5r6.in-berlin.de\u003e\n" }, { "commit": "33e553fe2b4a983ef34a57ab1440d8d33397bb12", "tree": "3a7098a935f0b678a6e6a565619d0d990f9122f3", "parents": [ "56d04cb189f955e5167c27944d61aa57ad69b598" ], "author": { "name": "Stefan Richter", "email": "stefanr@s5r6.in-berlin.de", "time": "Sun Jun 20 22:50:35 2010 +0200" }, "committer": { "name": "Stefan Richter", "email": "stefanr@s5r6.in-berlin.de", "time": "Sun Jun 20 23:11:55 2010 +0200" }, "message": "firewire: remove an unused function argument\n\nvoid (*fw_address_callback_t)(..., int speed, ...) is the speed that a\nremote node chose to transmit a request to us. In case of split\ntransactions, firewire-core will transmit the response at that speed.\n\nUpper layer drivers on the other hand (firewire-net, -sbp2, firedtv, and\nuserspace drivers) cannot do anything useful with that speed datum,\nexcept log it for debug purposes. But data that is merely potentially\n(not even actually) used for debug purposes does not belong into the API.\n\nSigned-off-by: Stefan Richter \u003cstefanr@s5r6.in-berlin.de\u003e\n" }, { "commit": "c8a94ded57e9cc2498d401b2f5c856213a3e19fb", "tree": "8fd6a196ff953270c03700dd682108baf3ee369b", "parents": [ "db3c9cc105ee844f6cd7a1beb9926fb8e9a093ae" ], "author": { "name": "Stefan Richter", "email": "stefanr@s5r6.in-berlin.de", "time": "Sat Jun 12 20:34:50 2010 +0200" }, "committer": { "name": "Stefan Richter", "email": "stefanr@s5r6.in-berlin.de", "time": "Sat Jun 19 13:01:41 2010 +0200" }, "message": "firewire: normalize STATE_CLEAR/SET CSR access interface\n\nPush the maintenance of STATE_CLEAR/SET.abdicate down into the card\ndriver. This way, the read/write_csr_reg driver method works uniformly\nacross all CSR offsets.\n\nSigned-off-by: Stefan Richter \u003cstefanr@s5r6.in-berlin.de\u003e\n" }, { "commit": "db3c9cc105ee844f6cd7a1beb9926fb8e9a093ae", "tree": "5fe981b7be4ffb97a506e23836d6c81a61dc8c91", "parents": [ "e847cc832bab50aad939a0c30414cd986637564d" ], "author": { "name": "Stefan Richter", "email": "stefanr@s5r6.in-berlin.de", "time": "Sat Jun 12 20:30:21 2010 +0200" }, "committer": { "name": "Stefan Richter", "email": "stefanr@s5r6.in-berlin.de", "time": "Sat Jun 19 13:01:41 2010 +0200" }, "message": "firewire: replace get_features card driver hook\n\nby feature variables in the fw_card struct. The hook appeared to be an\nunnecessary abstraction in the card driver interface.\n\nCleaner would be to pass those feature flags as arguments to\nfw_card_initialize() or fw_card_add(), but the FairnessControl register\nis in the SCLK domain and may therefore not be accessible while Link\nPower Status is off, i.e. before the card-\u003edriver-\u003eenable call from\nfw_card_add().\n\nSigned-off-by: Stefan Richter \u003cstefanr@s5r6.in-berlin.de\u003e\n" }, { "commit": "7e0e314f198d5048b74c8f0ef9f4c1c02e5ecfc9", "tree": "513fcf8f87f6b24121d4e4eb07e1345e29d81db2", "parents": [ "4ffb7a6a066e4be4577976d1c08e237c7479770a" ], "author": { "name": "Clemens Ladisch", "email": "clemens@ladisch.de", "time": "Thu Jun 10 08:37:15 2010 +0200" }, "committer": { "name": "Clemens Ladisch", "email": "clemens@ladisch.de", "time": "Thu Jun 10 08:37:15 2010 +0200" }, "message": "firewire: core: add CSR abdicate support\n\nImplement the abdicate bit, which is required for bus manager\ncapable nodes and tested by the Base 1394 Test Suite.\n\nFinally, something to do at a command reset! :-)\n\nSigned-off-by: Clemens Ladisch \u003cclemens@ladisch.de\u003e\n" }, { "commit": "3d1f46eb60b155c705e389ecdf313f11b4b91976", "tree": "6a28e68a7372d49f172f73a2c30e1a72dd124ffa", "parents": [ "a1a1132bd83d0aea51d4f19be4b4a58a064a0131" ], "author": { "name": "Clemens Ladisch", "email": "clemens@ladisch.de", "time": "Thu Jun 10 08:35:37 2010 +0200" }, "committer": { "name": "Clemens Ladisch", "email": "clemens@ladisch.de", "time": "Thu Jun 10 08:35:37 2010 +0200" }, "message": "firewire: core: add CSR MAINT_UTILITY support\n\nImplement the MAIN_UTILITY register, which is utterly optional\nbut useful as a safe target for diagnostic read/write/broadcast\ntransactions.\n\nSigned-off-by: Clemens Ladisch \u003cclemens@ladisch.de\u003e\n" }, { "commit": "a1a1132bd83d0aea51d4f19be4b4a58a064a0131", "tree": "93352d6aa9fd8eaa0521fbeb65853cd9f485666e", "parents": [ "27a2329f8235d6ce637463f5d83e98d760ef006e" ], "author": { "name": "Clemens Ladisch", "email": "clemens@ladisch.de", "time": "Thu Jun 10 08:35:06 2010 +0200" }, "committer": { "name": "Clemens Ladisch", "email": "clemens@ladisch.de", "time": "Thu Jun 10 08:35:06 2010 +0200" }, "message": "firewire: add CSR PRIORITY_BUDGET support\n\nIf supported by the OHCI controller, implement the PRIORITY_BUDGET\nregister, which is required for nodes that can use asynchronous\npriority arbitration.\n\nTo allow the core to determine what features the lowlevel device\nsupports, add a new card driver callback.\n\nSigned-off-by: Clemens Ladisch \u003cclemens@ladisch.de\u003e\n" }, { "commit": "8e4b50f94e8c1435a3e0ece42b7f97bc857d0145", "tree": "aad5b85a0bf67b5a7bbd80e1dad2d2a2d9b85470", "parents": [ "446eba0d6896787b2f02f7a665838d32aa7b9d3f" ], "author": { "name": "Clemens Ladisch", "email": "clemens@ladisch.de", "time": "Thu Jun 10 08:26:28 2010 +0200" }, "committer": { "name": "Clemens Ladisch", "email": "clemens@ladisch.de", "time": "Thu Jun 10 08:26:28 2010 +0200" }, "message": "firewire: core: add CSR SPLIT_TIMEOUT support\n\nImplement the SPLIT_TIMEOUT registers. Besides being required by the\nspec, this is desirable for some IIDC devices and necessary for many\naudio devices to be able to increase the timeout from userspace.\n\nSigned-off-by: Clemens Ladisch \u003cclemens@ladisch.de\u003e\n" }, { "commit": "5c40cbfefa828208c671e2f58789e4dd04f79563", "tree": "aa7c38eb0c9e19ee0153a1764b24c67abaf5746d", "parents": [ "753a8970f68594ea69c5fc13fbca18dbd9402996" ], "author": { "name": "Clemens Ladisch", "email": "clemens@ladisch.de", "time": "Tue Apr 27 09:07:00 2010 +0200" }, "committer": { "name": "Stefan Richter", "email": "stefanr@s5r6.in-berlin.de", "time": "Wed May 19 00:26:30 2010 +0200" }, "message": "firewire: core: use separate timeout for each transaction\n\nUsing a single timeout for all transaction that need to be flushed does\nnot work if the submission of new transactions can defer the timeout\nindefinitely into the future. We need to have timeouts that do not\nchange due to other transactions; the simplest way to do this is with a\nseparate timer for each transaction.\n\nSigned-off-by: Clemens Ladisch \u003cclemens@ladisch.de\u003e\nSigned-off-by: Stefan Richter \u003cstefanr@s5r6.in-berlin.de\u003e (+ one lockdep annotation)\n" }, { "commit": "edd5bdaf128e04066caac84fcb21377197ea0d64", "tree": "1b649a30c0c3263b1cbef23d0fcdc049228c5e8d", "parents": [ "7cfe21aae155c26193fde617dc61d37a79a63f86" ], "author": { "name": "Stefan Richter", "email": "stefanr@s5r6.in-berlin.de", "time": "Wed Apr 14 22:30:18 2010 +0200" }, "committer": { "name": "Stefan Richter", "email": "stefanr@s5r6.in-berlin.de", "time": "Mon Apr 19 20:00:44 2010 +0200" }, "message": "firewire: core: clean up config ROM related defined constants\n\nClemens Ladisch pointed out that\n - BIB_IMC is not named like the field is called in the standard,\n - readers of the code may get worried about the magic 0x0c0083c0,\n - a CSR_NODE_CAPABILITIES key is there in the header but not put to\n good use.\n\nSo let\u0027s rename BIB_IMC, add a defined constant for Node_Capabilities\nand a comment which reassures people that somebody thought about it and\nthey don\u0027t have to (or if they still do, tell them where they have to\nlook for confirmation), and prune our incomplete and arbitrary set of\ndefined constants of CSR key IDs. And there is a nother magic number,\nthat of Bus_Information_Block.Bus_Name, to be defined and commented.\n\nSigned-off-by: Stefan Richter \u003cstefanr@s5r6.in-berlin.de\u003e\n" }, { "commit": "ca658b1e29d6be939207532e337fb640eb697f71", "tree": "f22c747e718d12b5be2bc37cfccd6d02aff9fcbe", "parents": [ "aa6fec3cdeb14ecc916eb78c4cd9ed79e4f7fe8d" ], "author": { "name": "Stefan Richter", "email": "stefanr@s5r6.in-berlin.de", "time": "Sat Apr 10 12:23:09 2010 +0200" }, "committer": { "name": "Stefan Richter", "email": "stefanr@s5r6.in-berlin.de", "time": "Sat Apr 10 16:51:13 2010 +0200" }, "message": "firewire: cdev: comment fixlet\n\nSigned-off-by: Stefan Richter \u003cstefanr@s5r6.in-berlin.de\u003e\n" }, { "commit": "aa6fec3cdeb14ecc916eb78c4cd9ed79e4f7fe8d", "tree": "4beee35aa9f9e31ec542d11075b822de9adbacc6", "parents": [ "9cac00b8f0079d5d3d54ec4dae453d58dec30e7c" ], "author": { "name": "Clemens Ladisch", "email": "clemens@ladisch.de", "time": "Wed Mar 31 16:26:52 2010 +0200" }, "committer": { "name": "Stefan Richter", "email": "stefanr@s5r6.in-berlin.de", "time": "Sat Apr 10 16:51:13 2010 +0200" }, "message": "firewire: cdev: iso packet documentation\n\nAdd the missing documentation for iso packets.\n\nSigned-off-by: Clemens Ladisch \u003cclemens@ladisch.de\u003e\nSigned-off-by: Stefan Richter \u003cstefanr@s5r6.in-berlin.de\u003e\n" }, { "commit": "6498ba04aee69540f8f586438f90d58e5b8e6936", "tree": "07f085b966af88265cbf36f30464f6f3943ecd77", "parents": [ "64582298b9c29535188380f488873e7d2196a2eb" ], "author": { "name": "Stefan Richter", "email": "stefanr@s5r6.in-berlin.de", "time": "Sun Feb 21 17:57:05 2010 +0100" }, "committer": { "name": "Stefan Richter", "email": "stefanr@s5r6.in-berlin.de", "time": "Wed Feb 24 20:36:55 2010 +0100" }, "message": "firewire: ohci: remove unused dualbuffer IR code\n\nThis code was no longer used since 2.6.33, \"firewire: ohci: always use\npacket-per-buffer mode for isochronous reception\" commit 090699c0. If\nanybody needs this code in the future for special purposes, it can be\nbrought back in. But it must not be re-enabled by default; drivers\n(kernelspace or userspace drivers) should only get this mode if they\nexplicitly request it.\n\nSigned-off-by: Stefan Richter \u003cstefanr@s5r6.in-berlin.de\u003e\n" }, { "commit": "e94b6d7736107c07b1b089797651d02994d268c7", "tree": "f023111bfc0f65b9d8382b9bf5e6c4b5d3a427f3", "parents": [ "abfe5a01ef1e463cbafdae461b693db34e308c02" ], "author": { "name": "Stefan Richter", "email": "stefanr@s5r6.in-berlin.de", "time": "Sun Feb 21 12:48:57 2010 +0100" }, "committer": { "name": "Stefan Richter", "email": "stefanr@s5r6.in-berlin.de", "time": "Wed Feb 24 20:36:55 2010 +0100" }, "message": "firewire: cdev: increment ABI version number\n\nso that clients can detect whether the FW_CDEV_IOC_GET_CYCLE_TIMER ioctl\nis reliable (on all tested controllers, especially the widely used VIA\ncontrollers, also NEC controllers, see commits b677532b and 1c1517ef).\n\nAlso add a comment on the 2.6.32 iso xmit enhancement and on dual-buffer\nIR having been disabled in 2.6.33.\n\nSigned-off-by: Stefan Richter \u003cstefanr@s5r6.in-berlin.de\u003e\n" }, { "commit": "abfe5a01ef1e463cbafdae461b693db34e308c02", "tree": "e33056c7d8b80a3128f7714c31b083091be3ea9b", "parents": [ "fd6e0c518121d22b50060d26c8aec2b701c6aab7" ], "author": { "name": "Stefan Richter", "email": "stefanr@s5r6.in-berlin.de", "time": "Sat Feb 20 12:13:49 2010 +0100" }, "committer": { "name": "Stefan Richter", "email": "stefanr@s5r6.in-berlin.de", "time": "Wed Feb 24 20:36:54 2010 +0100" }, "message": "firewire: cdev: add more flexible cycle timer ioctl\n\nThe system time from CLOCK_REALTIME is not monotonic, hence problematic\nfor the main user of the FW_CDEV_IOC_GET_CYCLE_TIMER ioctl. This issue\nexists in its successor ABI, i.e. raw1394, too.\nhttp://subversion.ffado.org/ticket/242\n\nWe now offer an alternative ioctl which lets the caller choose between\nCLOCK_REALTIME, CLOCK_MONOTONIC, and CLOCK_MONOTONIC_RAW as source of\nthe local time, very similar to the clock_gettime libc function. The\nformat of the local time return value matches that of clock_gettime\n(seconds and nanoseconds, instead of a single microseconds value from\nthe existing ioctl).\n\nSigned-off-by: Stefan Richter \u003cstefanr@s5r6.in-berlin.de\u003e\n" }, { "commit": "109d28152b6e9d5de64cd23e3bc08885ccb3d1ef", "tree": "b7b8863faa05254781acfb85cc41da3eef467c6b", "parents": [ "168cf9af699e87d5a6f44b684583714ecabb8e71", "60b341b778cc2929df16c0a504c91621b3c6a4ad" ], "author": { "name": "Stefan Richter", "email": "stefanr@s5r6.in-berlin.de", "time": "Wed Feb 24 20:31:04 2010 +0100" }, "committer": { "name": "Stefan Richter", "email": "stefanr@s5r6.in-berlin.de", "time": "Wed Feb 24 20:33:45 2010 +0100" }, "message": "Merge tag \u0027v2.6.33\u0027 for its firewire changes since last branch point\n\nSigned-off-by: Stefan Richter \u003cstefanr@s5r6.in-berlin.de\u003e\n" }, { "commit": "79da0644a8e0838522828f106e4049639eea6baf", "tree": "4dbb8e1a3a4be78a79f14e8ebac5d6fe817a2fb4", "parents": [ "9f3a6284880ceea452903e2043c88d7226736318" ], "author": { "name": "Jens Axboe", "email": "jens.axboe@oracle.com", "time": "Tue Feb 23 08:40:43 2010 +0100" }, "committer": { "name": "Jens Axboe", "email": "jens.axboe@oracle.com", "time": "Tue Feb 23 08:40:43 2010 +0100" }, "message": "Revert \"block: improve queue_should_plug() by looking at IO depths\"\n\nThis reverts commit fb1e75389bd06fd5987e9cda1b4e0305c782f854.\n\n\"Benjamin S.\" \u003csbenni@gmx.de\u003e reports that the patch in question\ncauses a big drop in sequential throughput for him, dropping from\n200MB/sec down to only 70MB/sec.\n\nNeeds to be investigated more fully, for now lets just revert the\noffending commit.\n\nConflicts:\n\n\tinclude/linux/blkdev.h\n\nSigned-off-by: Jens Axboe \u003cjens.axboe@oracle.com\u003e\n" }, { "commit": "aea187c46f7d03ce985e55eb1398d0776a15b928", "tree": "a2f38121839fec4d91e06f2432478c00fba8df1b", "parents": [ "d0708b9739f4d184f74ef69fb15d9c26aecb3f10", "8f9941aeccc318f243ab3fa55aaa17f4c1cb33f9" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Sat Feb 20 16:58:03 2010 -0800" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Sat Feb 20 16:58:03 2010 -0800" }, "message": "Merge branch \u0027for-linus\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs-2.6\n\n* \u0027for-linus\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs-2.6:\n CacheFiles: Fix a race in cachefiles_delete_object() vs rename\n vfs: don\u0027t call ima_file_check() unconditionally in nfsd_open()\n fs: inode - remove 8 bytes of padding on 64bits allowing 1 more objects/slab under slub\n Switch proc/self to nd_set_link()\n fix LOOKUP_FOLLOW on automount \"symlinks\"\n" }, { "commit": "4e10ae11317b238609fc3ec9d50a5dee9473e045", "tree": "95cecdc421714f35671667463bb70a1d6004f54a", "parents": [ "1c8e170aaa7ba62c0160e96a52e25ad004419109" ], "author": { "name": "Linus Walleij", "email": "linus.walleij@stericsson.com", "time": "Sat Feb 20 09:41:30 2010 +0100" }, "committer": { "name": "Russell King", "email": "rmk+kernel@arm.linux.org.uk", "time": "Sat Feb 20 14:10:48 2010 +0000" }, "message": "ARM: 5951/1: ARM: fix documentation of the PrimeCell bus\n\nThis fixes the filepath encoded in \u003clinux/amba/bus.h\u003e and adds\nsome documentation as to what this bus really means.\n\nSigned-off-by: Linus Walleij \u003clinus.walleij@stericsson.com\u003e\nSigned-off-by: Russell King \u003crmk+kernel@arm.linux.org.uk\u003e\n" }, { "commit": "4e70af56319e56423d6eb1ce25fc321cdf8cd41d", "tree": "5bdc090bc52c2b341c880374574613ca12f50b6a", "parents": [ "7fee4868be91e71a3ee8e57289ebf5e10a12297e" ], "author": { "name": "Richard Kennedy", "email": "richard@rsk.demon.co.uk", "time": "Mon Feb 15 11:16:11 2010 +0000" }, "committer": { "name": "Al Viro", "email": "viro@zeniv.linux.org.uk", "time": "Fri Feb 19 10:41:13 2010 -0500" }, "message": "fs: inode - remove 8 bytes of padding on 64bits allowing 1 more objects/slab under slub\n\nThis removes 8 bytes of padding from struct inode on 64bit builds, and\nso allows 1 more object/slab in the inode_cache when using slub.\n\nSigned-off-by: Richard Kennedy \u003crichard@rsk.demon.co.uk\u003e\n----\npatch against 2.6.33-rc8\ncompiled \u0026 tested on x86_64 AMDX2\n\nI\u0027ve been running this patch for over a week with no obvious problems\nregards\nRichard\nSigned-off-by: Al Viro \u003cviro@zeniv.linux.org.uk\u003e\n" }, { "commit": "83c5aac175e182c30729650f2edee3294c3b8bb0", "tree": "33a3ad885a9c74da05b25a97d9cc6b448b07861f", "parents": [ "2fa298cf6d6bedf64f75644e9e8b0d64d2d83f27", "3b77fd8ee6a8ae34e349651e9d5f5000d1cc206e" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Thu Feb 18 08:31:14 2010 -0800" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Thu Feb 18 08:31:14 2010 -0800" }, "message": "Merge branch \u0027for-linus\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/dtor/input\n\n* \u0027for-linus\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/dtor/input:\n Input: add KEY_RFKILL\n Input: i8042 - fix KBC jam during hibernate\n" }, { "commit": "3b77fd8ee6a8ae34e349651e9d5f5000d1cc206e", "tree": "33de1f771f1d7bb4a5917004239af44a15f20e68", "parents": [ "c2d1a2a11b9b29c3be1dd781dc88518ffab8d4be" ], "author": { "name": "Matthew Garrett", "email": "mjg@redhat.com", "time": "Wed Feb 17 12:21:45 2010 -0800" }, "committer": { "name": "Dmitry Torokhov", "email": "dmitry.torokhov@gmail.com", "time": "Thu Feb 18 02:08:16 2010 -0800" }, "message": "Input: add KEY_RFKILL\n\nMost laptops have keys that are intended to toggle all device state, not\njust wifi. These are currently generally mapped to KEY_WLAN. As a result,\nrfkill will only kill or enable wifi in response to the key press. This\nconfuses users and can make it difficult for them to enable bluetooth\nand wwan devices.\n\nThis patch adds a new keycode, KEY_RFKILL. It indicates that the system\nshould toggle the state of all rfkillable devices.\n\nSigned-off-by: Matthew Garrett \u003cmjg@redhat.com\u003e\nAcked-by: Marcel Holtmann \u003cmarcel@holtmann.org\u003e\nSigned-off-by: Dmitry Torokhov \u003cdtor@mail.ru\u003e\n" }, { "commit": "5a5e0f4c7038168e38d1db6af09d1ac715ee9888", "tree": "6627b1e2ae1b4880d93c1c5f8d6db4f3aca0d38c", "parents": [ "4c743d0ae60462e91465483dd87f4458d71af550" ], "author": { "name": "Anton Vorontsov", "email": "avorontsov@ru.mvista.com", "time": "Wed Jan 27 17:09:38 2010 +0300" }, "committer": { "name": "Greg Kroah-Hartman", "email": "gregkh@suse.de", "time": "Tue Feb 16 15:11:08 2010 -0800" }, "message": "kfifo: Don\u0027t use integer as NULL pointer\n\nThis patch fixes following sparse warnings:\n\ninclude/linux/kfifo.h:127:25: warning: Using plain integer as NULL pointer\nkernel/kfifo.c:83:21: warning: Using plain integer as NULL pointer\n\nSigned-off-by: Anton Vorontsov \u003cavorontsov@ru.mvista.com\u003e\nAcked-by: Stefani Seibold \u003cstefani@seibold.net\u003e\nSigned-off-by: Greg Kroah-Hartman \u003cgregkh@suse.de\u003e\n\n\n" }, { "commit": "3d8b4bdef7e7c9d36ce90e563788c10051a91c34", "tree": "f98e4fc7cce54ea0b4b4466342c3ee06f9a7a9f7", "parents": [ "724e6d3fe8003c3f60bf404bf22e4e331327c596", "1a72cfa6856e7d58e049c42c6e6a789669478479" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Mon Feb 15 19:47:48 2010 -0800" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Mon Feb 15 19:47:48 2010 -0800" }, "message": "Merge branch \u0027perf-fixes-for-linus\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip\n\n* \u0027perf-fixes-for-linus\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip:\n perf top: Fix help text alignment\n perf: Fix hypervisor sample reporting\n perf: Make bp_len type to u64 generic across the arch\n" }, { "commit": "e8a47c10b20ee446e7badd0ec5625d0bdc4216b1", "tree": "117d4ac7107faa1d04b30bd5c114598057ad3e78", "parents": [ "85b9e4878f3b16993fba871c0c68d0948ec9c7c6", "13876c6e5fec94e9ea51b73ac025583dd7655345" ], "author": { "name": "Dave Airlie", "email": "airlied@redhat.com", "time": "Thu Feb 11 12:10:48 2010 +1000" }, "committer": { "name": "Dave Airlie", "email": "airlied@redhat.com", "time": "Thu Feb 11 12:10:52 2010 +1000" }, "message": "Merge remote branch \u0027nouveau/for-airlied\u0027 of nouveau-2.6\n\n* \u0027nouveau/for-airlied\u0027 of /home/airlied/kernel/drm-next:\n nouveau: fix state detection with switchable graphics\n drm/nouveau: move dereferences after null checks\n drm/nv50: make the pgraph irq handler loop like the pre-nv50 version\n drm/nv50: delete ramfc object after disabling fifo, not before\n drm/nv50: avoid unloading pgraph context when ctxprog is running\n drm/nv50: align size of buffer object to the right boundaries.\n drm/nv50: disregard dac outputs in nv50_sor_dpms()\n drm/nv50: prevent multiple init tables being parsed at the same time\n drm/nouveau: make dp auxch xfer len check for reads only\n drm/nv40: make INIT_COMPUTE_MEM a NOP, just like nv50\n drm/nouveau: Add proper vgaarb support.\n drm/nouveau: Fix fbcon on mixed pre-NV50 + NV50 multicard.\n drivers/gpu/drm/nouveau/nouveau_grctx.c: correct NULL test\n drm/nouveau: call ttm_bo_wait with the bo lock held to prevent hang\n drm/nouveau: Fixup semaphores on pre-nv50 cards.\n drm/nouveau: Add getparam to get available PGRAPH units.\n drm/nouveau: Add module options to disable acceleration.\n drm/nouveau: fix non-vram notifier blocks\n" }, { "commit": "a87897edbae2d60db7bcb6bb0a75e82013d68305", "tree": "b0d1891b5bf73cd9dbad8ec22ab87813ad029522", "parents": [ "3bef35721018d2bac08d0d03979606b65347211e" ], "author": { "name": "Jakob Bornecrantz", "email": "jakob@vmware.com", "time": "Tue Feb 09 21:29:47 2010 +0000" }, "committer": { "name": "Dave Airlie", "email": "airlied@redhat.com", "time": "Thu Feb 11 12:03:26 2010 +1000" }, "message": "drm/vmwgfx: Drop scanout flag compat and add execbuf ioctl parameter members. Bumps major.\n\nEven if this bumps the version to 1 it does not mean the driver is\nout of staging. From what we know this is the last backwards\nincompatible change to the driver.\n\nSigned-off-by: Jakob Bornecrantz \u003cjakob@vmware.com\u003e\nSigned-off-by: Thomas Hellstrom \u003cthellstrom@vmware.com\u003e\nSigned-off-by: Dave Airlie \u003cairlied@redhat.com\u003e\n" }, { "commit": "f77cef3db357aeea22d82a2aa4f0ef8fbae41d47", "tree": "55e05387f639cfeb9f2c610f13ec2b77453ed9a6", "parents": [ "e28cab42f384745c8a947a9ccd51e4aae52f5d51" ], "author": { "name": "Thomas Hellstrom", "email": "thellstrom@vmware.com", "time": "Tue Feb 09 19:41:55 2010 +0000" }, "committer": { "name": "Dave Airlie", "email": "airlied@redhat.com", "time": "Thu Feb 11 11:58:09 2010 +1000" }, "message": "drm/vmwgfx: Update the user-space interface.\n\nWhen time-based throttling is implemented, we need to bump minor.\nWhen the old way of detecting scanout is removed, we need to bump major.\nIn the meantime, this change should not break existing user-space.\n\nSigned-off-by: Thomas Hellstrom \u003cthellstrom@vmware.com\u003e\nSigned-off-by: Jakob Bornecrantz \u003cjakob@vmware.com\u003e\nSigned-off-by: Dave Airlie \u003cairlied@redhat.com\u003e\n" }, { "commit": "0ea457839d050370e0f7c75c81f9abd573e1f420", "tree": "02446fa44f2f20885fe5739c571029fed4d283b7", "parents": [ "ac73fddfc523bf3c3525d16356b44527c44fae6d", "44bfce5c3ec91baf8ffcd075c66711740f29a949" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Wed Feb 10 07:15:21 2010 -0800" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Wed Feb 10 07:15:21 2010 -0800" }, "message": "Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-2.6\n\n* git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-2.6: (29 commits)\n drivers/net: Correct NULL test\n MAINTAINERS: networking drivers - Add git net-next tree\n net/sched: Fix module name in Kconfig\n cxgb3: fix GRO checksum check\n dst: call cond_resched() in dst_gc_task()\n netfilter: nf_conntrack: fix hash resizing with namespaces\n netfilter: xtables: compat out of scope fix\n netfilter: nf_conntrack: restrict runtime expect hashsize modifications\n netfilter: nf_conntrack: per netns nf_conntrack_cachep\n netfilter: nf_conntrack: fix memory corruption with multiple namespaces\n Bluetooth: Keep a copy of each HID device\u0027s report descriptor\n pktgen: Fix freezing problem\n igb: make certain to reassign legacy interrupt vectors after reset\n irda: add missing BKL in irnet_ppp ioctl\n irda: unbalanced lock_kernel in irnet_ppp\n ixgbe: Fix return of invalid txq\n ixgbe: Fix ixgbe_tx_map error path\n netxen: protect resource cleanup by rtnl lock\n netxen: fix tx timeout recovery for NX2031 chip\n Bluetooth: Enter active mode before establishing a SCO link.\n ...\n" }, { "commit": "69c9700b544e496dc3ccf472a4f3a76dcf4abaf7", "tree": "2d80752bfabdf77a42f7d432dfafed5be85f02f5", "parents": [ "a32ed69d7bb3cd259d813d71281d62993b9a70fd" ], "author": { "name": "Marcin Kościelnicki", "email": "koriakin@0x04.net", "time": "Tue Jan 26 18:39:20 2010 +0000" }, "committer": { "name": "Ben Skeggs", "email": "bskeggs@redhat.com", "time": "Tue Feb 09 12:48:08 2010 +1000" }, "message": "drm/nouveau: Add getparam to get available PGRAPH units.\n\nOn nv50, this will be needed by applications using CUDA to know\nhow much stack/local memory to allocate.\n\nSigned-off-by: Marcin Kościelnicki \u003ckoriakin@0x04.net\u003e\nSigned-off-by: Ben Skeggs \u003cbskeggs@redhat.com\u003e\n" }, { "commit": "d696c7bdaa55e2208e56c6f98e6bc1599f34286d", "tree": "628782197c21b1e8611a41914865cdba586a1c65", "parents": [ "14c7dbe043d01a83a30633ab6b109ba2ac61d9f7" ], "author": { "name": "Patrick McHardy", "email": "kaber@trash.net", "time": "Mon Feb 08 11:18:07 2010 -0800" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Mon Feb 08 11:18:07 2010 -0800" }, "message": "netfilter: nf_conntrack: fix hash resizing with namespaces\n\nAs noticed by Jon Masters \u003cjonathan@jonmasters.org\u003e, the conntrack hash\nsize is global and not per namespace, but modifiable at runtime through\n/sys/module/nf_conntrack/hashsize. Changing the hash size will only\nresize the hash in the current namespace however, so other namespaces\nwill use an invalid hash size. This can cause crashes when enlarging\nthe hashsize, or false negative lookups when shrinking it.\n\nMove the hash size into the per-namespace data and only use the global\nhash size to initialize the per-namespace value when instanciating a\nnew namespace. Additionally restrict hash resizing to init_net for\nnow as other namespaces are not handled currently.\n\nCc: stable@kernel.org\nSigned-off-by: Patrick McHardy \u003ckaber@trash.net\u003e\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "5b3501faa8741d50617ce4191c20061c6ef36cb3", "tree": "fd3ac41baea9db5d795144da48cef46aca3e01f6", "parents": [ "9edd7ca0a3e3999c260642c92fa008892d82ca6e" ], "author": { "name": "Eric Dumazet", "email": "eric.dumazet@gmail.com", "time": "Mon Feb 08 11:16:56 2010 -0800" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Mon Feb 08 11:16:56 2010 -0800" }, "message": "netfilter: nf_conntrack: per netns nf_conntrack_cachep\n\nnf_conntrack_cachep is currently shared by all netns instances, but\nbecause of SLAB_DESTROY_BY_RCU special semantics, this is wrong.\n\nIf we use a shared slab cache, one object can instantly flight between\none hash table (netns ONE) to another one (netns TWO), and concurrent\nreader (doing a lookup in netns ONE, \u0027finding\u0027 an object of netns TWO)\ncan be fooled without notice, because no RCU grace period has to be\nobserved between object freeing and its reuse.\n\nWe dont have this problem with UDP/TCP slab caches because TCP/UDP\nhashtables are global to the machine (and each object has a pointer to\nits netns).\n\nIf we use per netns conntrack hash tables, we also *must* use per netns\nconntrack slab caches, to guarantee an object can not escape from one\nnamespace to another one.\n\nSigned-off-by: Eric Dumazet \u003ceric.dumazet@gmail.com\u003e\n[Patrick: added unique slab name allocation]\nCc: stable@kernel.org\nSigned-off-by: Patrick McHardy \u003ckaber@trash.net\u003e\n" }, { "commit": "9bbb6cad0173e6220f3ac609e26beb48dab3b7cd", "tree": "680e0de3071c938ca9858fa9ed5bd5ca8ff2f20f", "parents": [ "54bb6552bd9405dc7685653157a4ec260c77a71c" ], "author": { "name": "Mimi Zohar", "email": "zohar@linux.vnet.ibm.com", "time": "Tue Jan 26 17:02:40 2010 -0500" }, "committer": { "name": "Al Viro", "email": "viro@zeniv.linux.org.uk", "time": "Sun Feb 07 03:06:22 2010 -0500" }, "message": "ima: rename ima_path_check to ima_file_check\n\nima_path_check actually deals with files! call it ima_file_check instead.\n\nSigned-off-by: Eric Paris \u003ceparis@redhat.com\u003e\nAcked-by: Mimi Zohar \u003czohar@linux.vnet.ibm.com\u003e\nSigned-off-by: Al Viro \u003cviro@zeniv.linux.org.uk\u003e\n" }, { "commit": "8eb988c70e7709b7bd1a69f0ec53d19ac20dea84", "tree": "6d0283a9fbca5cc104f591b9cc628edf39bc0b05", "parents": [ "1e41568d7378d1ba8c64ba137b9ddd00b59f893a" ], "author": { "name": "Mimi Zohar", "email": "zohar@linux.vnet.ibm.com", "time": "Wed Jan 20 15:35:41 2010 -0500" }, "committer": { "name": "Al Viro", "email": "viro@zeniv.linux.org.uk", "time": "Sun Feb 07 03:06:22 2010 -0500" }, "message": "fix ima breakage\n\nThe \"Untangling ima mess, part 2 with counters\" patch messed\nup the counters. Based on conversations with Al Viro, this patch\nstreamlines ima_path_check() by removing the counter maintaince.\nThe counters are now updated independently, from measuring the file,\nin __dentry_open() and alloc_file() by calling ima_counts_get().\nima_path_check() is called from nfsd and do_filp_open().\nIt also did not measure all files that should have been measured.\nReason: ima_path_check() got bogus value passed as mask.\n[AV: mea culpa]\n[AV: add missing nfsd bits]\n\nSigned-off-by: Mimi Zohar \u003czohar@us.ibm.com\u003e\nSigned-off-by: Al Viro \u003cviro@zeniv.linux.org.uk\u003e\n" }, { "commit": "56dca4ceb7b39aa4173aa1cb822c860ced2be1ec", "tree": "8e20946b7247aa32a83619b481f83efe335e7da0", "parents": [ "73d2eaac8a3f1ec1d6d0a80ea7302a439ca9b933", "2d68b7fe55d9e19a8a868224ed0dfd6526568521" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Fri Feb 05 07:58:21 2010 -0800" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Fri Feb 05 07:58:21 2010 -0800" }, "message": "Merge branch \u0027upstream-linus\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/jgarzik/libata-dev\n\n* \u0027upstream-linus\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/jgarzik/libata-dev:\n [libata] Call flush_dcache_page after PIO data transfers in libata-sff.c\n ahci: add Acer G725 to broken suspend list\n libata: fix ata_id_logical_per_physical_sectors\n libata-scsi passthru: fix bug which truncated LBA48 return values\n" }, { "commit": "2938429501b73f6aeb312236eac7ed0416a07cd5", "tree": "59d92b0d2a5063fa8c93216750f83d1fe3822a2c", "parents": [ "cbee4751f612692c1de3b8e420ebcb0fb16c7c56" ], "author": { "name": "Stephen Rothwell", "email": "sfr@canb.auug.org.au", "time": "Fri Feb 05 16:09:11 2010 +1100" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Fri Feb 05 07:35:05 2010 -0800" }, "message": "percpu: add __percpu for sparse\n\nThis is to make the annotation of percpu variables during the next merge\nwindow less painfull.\n\nExtracted from a patch by Rusty Russell.\n\nSigned-off-by: Stephen Rothwell \u003csfr@canb.auug.org.au\u003e\nAcked-by: Tejun Heo \u003ctj@kernel.org\u003e\nSigned-off-by: Linus Torvalds \u003ctorvalds@linux-foundation.org\u003e\n" }, { "commit": "aa16cd8d12352ccb5b921995ab3901110779f24a", "tree": "bc93b1e96dda7e1dc6f1aff498767c627f2de638", "parents": [ "a3a71ca9a715776cf3eda605dafdb4a383782c4f", "59647b6ac3050dd964bc556fe6ef22f4db5b935c" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Thu Feb 04 16:07:41 2010 -0800" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Thu Feb 04 16:07:41 2010 -0800" }, "message": "Merge branch \u0027core-fixes-for-linus\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip\n\n* \u0027core-fixes-for-linus\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip:\n futex: Handle futex value corruption gracefully\n futex: Handle user space corruption gracefully\n futex_lock_pi() key refcnt fix\n softlockup: Add sched_clock_tick() to avoid kernel warning on kgdb resume\n" }, { "commit": "f7acede65d6b65919aee5b6a360a17cedb11f2f7", "tree": "ac1adbda9b14e2820e8bee2407bf6895c357d9b0", "parents": [ "bc496ed00ab1411d3efaf295b72e0c9eb343e1a3" ], "author": { "name": "Christoph Hellwig", "email": "hch@lst.de", "time": "Thu Jan 28 13:30:11 2010 +0100" }, "committer": { "name": "Jeff Garzik", "email": "jgarzik@redhat.com", "time": "Thu Feb 04 01:01:32 2010 -0500" }, "message": "libata: fix ata_id_logical_per_physical_sectors\n\nThe value we get from the low byte of the ATA_ID_SECTOR_SIZE word is not not\na plain multiple, but the log of it, so fix the helper to give the correct\nanswer. Without this we\u0027ll get an incorrect minimal I/O size in the block\nlimits VPD page for 4k sector drives.\n\nAlso change the return value of ata_id_logical_per_physical_sectors to u16\nfor the unlikely case of very large logical sectors.\n\nSigned-off-by: Christoph Hellwig \u003chch@lst.de\u003e\nSigned-off-by: Jeff Garzik \u003cjgarzik@redhat.com\u003e\n" }, { "commit": "cd757645fbdc34a8343c04bb0e74e06fccc2cb10", "tree": "b06a5b92674731846b4d22aa53c99d6099b304b7", "parents": [ "c80d292f137275a1ed88e6ed515ecb457051f1a4" ], "author": { "name": "Mahesh Salgaonkar", "email": "mahesh@linux.vnet.ibm.com", "time": "Sat Jan 30 10:25:18 2010 +0530" }, "committer": { "name": "Frederic Weisbecker", "email": "fweisbec@gmail.com", "time": "Thu Feb 04 01:07:12 2010 +0100" }, "message": "perf: Make bp_len type to u64 generic across the arch\n\nChange \u0027bp_len\u0027 type to __u64 to make it work across archs as\nthe s390 architecture watch point length can be upto 2^64.\n\nreference:\n\thttp://lkml.org/lkml/2010/1/25/212\n\nThis is an ABI change that is not backward compatible with\nthe previous hardware breakpoint info layout integrated in this\ndevelopment cycle, a rebuilt of perf tools is necessary for\nversions based on 2.6.33-rc1 - 2.6.33-rc6 to work with a\nkernel based on this patch.\n\nSigned-off-by: Mahesh Salgaonkar \u003cmahesh@linux.vnet.ibm.com\u003e\nAcked-by: Peter Zijlstra \u003cpeterz@infradead.org\u003e\nCc: Ananth N Mavinakayanahalli \u003cananth@in.ibm.com\u003e\nCc: \"K. Prasad\" \u003cprasad@linux.vnet.ibm.com\u003e\nCc: Maneesh Soni \u003cmaneesh@in.ibm.com\u003e\nCc: Heiko Carstens \u003cheiko.carstens@de.ibm.com\u003e\nCc: Martin \u003cschwidefsky@de.ibm.com\u003e\nLKML-Reference: \u003c20100130045518.GA20776@in.ibm.com\u003e\nSigned-off-by: Frederic Weisbecker \u003cfweisbec@gmail.com\u003e\n" }, { "commit": "2a2a5660f10a468016fed594ab09d77ef0bb6079", "tree": "7990efd295869854bfb3de100628206c3682dbf9", "parents": [ "ca0bf64d99f6e3f6e2fe2585e52a0ac57354beac", "f98bfbd78c37c5946cc53089da32a5f741efdeb7" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Tue Feb 02 18:11:52 2010 -0800" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Tue Feb 02 18:11:52 2010 -0800" }, "message": "Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-2.6\n\n* git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-2.6: (23 commits)\n connector: Delete buggy notification code.\n be2net: use eq-id to calculate cev-isr reg offset\n Bluetooth: Use the control channel for raw HID reports\n Bluetooth: Add DFU driver for Atheros Bluetooth chipset AR3011\n Bluetooth: Redo checks in IRQ handler for shared IRQ support\n Bluetooth: Fix memory leak in L2CAP\n Bluetooth: Remove double free of SKB pointer in L2CAP\n cdc_ether: Partially revert \"usbnet: Set link down initially ...\"\n be2net: Fix memset() arg ordering.\n bonding: bond_open error return value\n ixgbe: if ixgbe_copy_dcb_cfg is going to fail learn about it early\n ixgbe: set the correct DCB bit for pg tx settings\n igbvf: fix issue w/ mapped_as_page being left set after unmap\n drivers/net: ks8851_mll ethernet network driver\n be2net: Bug fix to support newer generation of BE ASIC\n starfire: clean up properly if firmware loading fails\n mac80211: fix NULL pointer dereference when ftrace is enabled\n netfilter: ctnetlink: fix expectation mask dump\n ipv6: conntrack: Add member of user to nf_ct_frag6_queue structure\n ath9k: fix eeprom INI values override for 2GHz-only cards\n ...\n" }, { "commit": "f98bfbd78c37c5946cc53089da32a5f741efdeb7", "tree": "885c756a95f28d4d00868f6eb06ab9c45f11b2e2", "parents": [ "a4c89051c83693e6cd5655b90300ec23a35e04f1" ], "author": { "name": "Evgeniy Polyakov", "email": "zbr@ioremap.net", "time": "Tue Feb 02 15:58:48 2010 -0800" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Tue Feb 02 15:58:48 2010 -0800" }, "message": "connector: Delete buggy notification code.\n\nOn Tue, Feb 02, 2010 at 02:57:14PM -0800, Greg KH (gregkh@suse.de) wrote:\n\u003e \u003e There are at least two ways to fix it: using a big cannon and a small\n\u003e \u003e one. The former way is to disable notification registration, since it is\n\u003e \u003e not used by anyone at all. Second way is to check whether calling\n\u003e \u003e process is root and its destination group is -1 (kind of priveledged\n\u003e \u003e one) before command is dispatched to workqueue.\n\u003e \n\u003e Well if no one is using it, removing it makes the most sense, right?\n\u003e \n\u003e No objection from me, care to make up a patch either way for this?\n\nGetting it is not used, let\u0027s drop support for notifications about\n(un)registered events from connector.\nAnother option was to check credentials on receiving, but we can always\nrestore it without bugs if needed, but genetlink has a wider code base\nand none complained, that userspace can not get notification when some\nother clients were (un)registered.\n\nKudos for Sebastian Krahmer \u003ckrahmer@suse.de\u003e, who found a bug in the\ncode.\n\nSigned-off-by: Evgeniy Polyakov \u003czbr@ioremap.net\u003e\nAcked-by: Greg Kroah-Hartman \u003cgregkh@suse.de\u003e\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "9ce929078af868ce5f5b0b3537184dad642fba43", "tree": "8d61d65f46ba894bbc346f5e0cfde72e7b2308de", "parents": [ "13af75740f345a5ddb5f7020a688c0f96b0d9f1f", "17aafccab4352b422aa01fa6ebf82daff693a5b3" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Mon Feb 01 10:46:49 2010 -0800" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Mon Feb 01 10:46:49 2010 -0800" }, "message": "Merge branch \u0027drm-linus\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/airlied/drm-2.6\n\n* \u0027drm-linus\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/airlied/drm-2.6:\n drm/radeon/kms: Fix oops after radeon_cs_parser_init() failure.\n drm/radeon/kms: move radeon KMS on/off switch out of staging.\n drm/radeon/kms: Bailout of blit if error happen \u0026 protect with mutex V3\n drm/vmwgfx: Don\u0027t send bad flags to the host\n drm/vmwgfx: Request SVGA version 2 and bail if not found\n drm/vmwgfx: Correctly detect 3D\n drm/ttm: remove unnecessary save_flags and ttm_flag_masked in ttm_bo_util.c\n drm/kms: Remove incorrect comment in struct drm_mode_modeinfo\n drm/ttm: remove padding from ttm_ref_object on 64bit builds\n drm/radeon/kms: release agp on error.\n drm/kms/radeon/agp: Move the check of the aper_size after drm_acp_acquire and drm_agp_info\n drm/kms/radeon/agp: Fix warning, format ‘%d’ expects type ‘int’, but argument 4 has type ‘size_t’\n drm/ttm: Avoid conflicting reserve_memtype during ttm_tt_set_page_caching.\n drm/kms/radeon: pick digitial encoders smarter. (v3)\n drm/radeon/kms: use active device to pick connector for encoder\n drm/radeon/kms: fix incorrect logic in DP vs eDP connector checking.\n" }, { "commit": "834db333eda46246f6290f0e1a7525af04fc8cb4", "tree": "4809b5da82a76a9924cde7a2db8986636f8be727", "parents": [ "8ea85c2817301adb986b3b86dc20414595b776be", "5352ae638e2d7d5c9b2e4d528676bbf2af6fd6f3" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Mon Feb 01 10:45:00 2010 -0800" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Mon Feb 01 10:45:00 2010 -0800" }, "message": "Merge branch \u0027perf-fixes-for-linus\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip\n\n* \u0027perf-fixes-for-linus\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip:\n perf, hw_breakpoint, kgdb: Do not take mutex for kernel debugger\n x86, hw_breakpoints, kgdb: Fix kgdb to use hw_breakpoint API\n hw_breakpoints: Release the bp slot if arch_validate_hwbkpt_settings() fails.\n perf: Ignore perf.data.old\n perf report: Fix segmentation fault when running with \u0027-g none\u0027\n" }, { "commit": "32337f8a7020676b5fd6387def9ccb9060440c5c", "tree": "7688f053cc9a3be1e99a492c33b85473cd57c859", "parents": [ "abe94c756c08d50566c09a65b9c7fe72f83071c5", "94f28da8409c6059135e89ac64a0839993124155" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Mon Feb 01 10:37:58 2010 -0800" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Mon Feb 01 10:37:58 2010 -0800" }, "message": "Merge branch \u0027merge\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/benh/powerpc\n\n* \u0027merge\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/benh/powerpc:\n powerpc: TIF_ABI_PENDING bit removal\n powerpc/pseries: Fix xics build without CONFIG_SMP\n powerpc/4xx: Add pcix type 1 transactions\n powerpc/pci: Add missing call to header fixup\n powerpc/pci: Add missing hookup to pci_slot\n powerpc/pci: Add calls to set_pcie_port_type() and set_pcie_hotplug_bridge()\n powerpc/40x: Update the PowerPC 40x board defconfigs\n powerpc/44x: Update PowerPC 44x board defconfigs\n" }, { "commit": "d6ad3e286d2c075a60b9f11075a2c55aeeeca2ad", "tree": "24f374a6cb1ef36c2aec41b9de6b8f3b1b09780d", "parents": [ "48d50674179981e41f432167b2441cec782d5484" ], "author": { "name": "Jason Wessel", "email": "jason.wessel@windriver.com", "time": "Wed Jan 27 16:25:22 2010 -0600" }, "committer": { "name": "Ingo Molnar", "email": "mingo@elte.hu", "time": "Mon Feb 01 08:22:32 2010 +0100" }, "message": "softlockup: Add sched_clock_tick() to avoid kernel warning on kgdb resume\n\nWhen CONFIG_HAVE_UNSTABLE_SCHED_CLOCK is set, sched_clock() gets\nthe time from hardware such as the TSC on x86. In this\nconfiguration kgdb will report a softlock warning message on\nresuming or detaching from a debug session.\n\nSequence of events in the problem case:\n\n 1) \"cpu sched clock\" and \"hardware time\" are at 100 sec prior\n to a call to kgdb_handle_exception()\n\n 2) Debugger waits in kgdb_handle_exception() for 80 sec and on\n exit the following is called ... touch_softlockup_watchdog() --\u003e\n __raw_get_cpu_var(touch_timestamp) \u003d 0;\n\n 3) \"cpu sched clock\" \u003d 100s (it was not updated, because the\n interrupt was disabled in kgdb) but the \"hardware time\" \u003d 180 sec\n\n 4) The first timer interrupt after resuming from\n kgdb_handle_exception updates the watchdog from the \"cpu sched clock\"\n\nupdate_process_times() { ... run_local_timers() --\u003e\nsoftlockup_tick() --\u003e check (touch_timestamp \u003d\u003d 0) (it is \"YES\"\nhere, we have set \"touch_timestamp \u003d 0\" at kgdb) --\u003e\n__touch_softlockup_watchdog() ***(A)--\u003e reset \"touch_timestamp\"\nto \"get_timestamp()\" (Here, the \"touch_timestamp\" will still be\nset to 100s.) ...\n\n scheduler_tick() ***(B)--\u003e sched_clock_tick() (update \"cpu sched\n clock\" to \"hardware time\" \u003d 180s) ... }\n\n 5) The Second timer interrupt handler appears to have a large\n jump and trips the softlockup warning.\n\nupdate_process_times() { ... run_local_timers() --\u003e\nsoftlockup_tick() --\u003e \"cpu sched clock\" - \"touch_timestamp\" \u003d\n180s-100s \u003e 60s --\u003e printk \"soft lockup error messages\" ... }\n\nnote: ***(A) reset \"touch_timestamp\" to\n\"get_timestamp(this_cpu)\"\n\nWhy is \"touch_timestamp\" 100 sec, instead of 180 sec?\n\nWhen CONFIG_HAVE_UNSTABLE_SCHED_CLOCK is set, the call trace of\nget_timestamp() is:\n\nget_timestamp(this_cpu)\n --\u003ecpu_clock(this_cpu)\n --\u003esched_clock_cpu(this_cpu)\n --\u003e__update_sched_clock(sched_clock_data, now)\n\nThe __update_sched_clock() function uses the GTOD tick value to\ncreate a window to normalize the \"now\" values. So if \"now\"\nvalue is too big for sched_clock_data, it will be ignored.\n\nThe fix is to invoke sched_clock_tick() to update \"cpu sched\nclock\" in order to recover from this state. This is done by\nintroducing the function touch_softlockup_watchdog_sync(). This\nallows kgdb to request that the sched clock is updated when the\nwatchdog thread runs the first time after a resume from kgdb.\n\n[yong.zhang0@gmail.com: Use per cpu instead of an array]\nSigned-off-by: Jason Wessel \u003cjason.wessel@windriver.com\u003e\nSigned-off-by: Dongdong Deng \u003cDongdong.Deng@windriver.com\u003e\nCc: kgdb-bugreport@lists.sourceforge.net\nCc: peterz@infradead.org\nLKML-Reference: \u003c1264631124-4837-2-git-send-email-jason.wessel@windriver.com\u003e\nSigned-off-by: Ingo Molnar \u003cmingo@elte.hu\u003e\n" }, { "commit": "fa5829b36539067f3c675f5d437531dedcfc4ad8", "tree": "cd2ec2bf02d88393e798cc7f6e1d00a39e0f522d", "parents": [ "dd5fde6041d7ea30fcfedcc159a4cec8b01f73b2" ], "author": { "name": "Marcin Kościelnicki", "email": "koriakin@0x04.net", "time": "Sat Jan 23 10:25:28 2010 +1000" }, "committer": { "name": "Dave Airlie", "email": "airlied@redhat.com", "time": "Mon Feb 01 11:26:39 2010 +1000" }, "message": "drm/kms: Remove incorrect comment in struct drm_mode_modeinfo\n\nSigned-off-by: Dave Airlie \u003cairlied@redhat.com\u003e\n" }, { "commit": "5352ae638e2d7d5c9b2e4d528676bbf2af6fd6f3", "tree": "95bab4d28f7c91bc5b7e79b3e1c879dfe96c52b9", "parents": [ "cc0967490c1c3824bc5b75718b6ca8a51d9f2617" ], "author": { "name": "Jason Wessel", "email": "jason.wessel@windriver.com", "time": "Thu Jan 28 17:04:43 2010 -0600" }, "committer": { "name": "Ingo Molnar", "email": "mingo@elte.hu", "time": "Sat Jan 30 08:42:21 2010 +0100" }, "message": "perf, hw_breakpoint, kgdb: Do not take mutex for kernel debugger\n\nThis patch fixes the regression in functionality where the\nkernel debugger and the perf API do not nicely share hw\nbreakpoint reservations.\n\nThe kernel debugger cannot use any mutex_lock() calls because it\ncan start the kernel running from an invalid context.\n\nA mutex free version of the reservation API needed to get\ncreated for the kernel debugger to safely update hw breakpoint\nreservations.\n\nThe possibility for a breakpoint reservation to be concurrently\nprocessed at the time that kgdb interrupts the system is\nimprobable. Should this corner case occur the end user is\nwarned, and the kernel debugger will prohibit updating the\nhardware breakpoint reservations.\n\nAny time the kernel debugger reserves a hardware breakpoint it\nwill be a system wide reservation.\n\nSigned-off-by: Jason Wessel \u003cjason.wessel@windriver.com\u003e\nAcked-by: Frederic Weisbecker \u003cfweisbec@gmail.com\u003e\nCc: kgdb-bugreport@lists.sourceforge.net\nCc: K.Prasad \u003cprasad@linux.vnet.ibm.com\u003e\nCc: Peter Zijlstra \u003cpeterz@infradead.org\u003e\nCc: Alan Stern \u003cstern@rowland.harvard.edu\u003e\nCc: torvalds@linux-foundation.org\nLKML-Reference: \u003c1264719883-7285-3-git-send-email-jason.wessel@windriver.com\u003e\nSigned-off-by: Ingo Molnar \u003cmingo@elte.hu\u003e\n" }, { "commit": "499a2673713c85734a54c37dd90b4b729de399c4", "tree": "426f8e4c7c792dad998beeefb094c439a81b776b", "parents": [ "a7016235a61d520e6806f38129001d935c4b6661", "f6bdc2303da6786cc22a7d24b6790e9f75b4cfdc" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Fri Jan 29 11:15:32 2010 -0800" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Fri Jan 29 11:15:32 2010 -0800" }, "message": "Merge branch \u0027for-linus\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/dtor/input\n\n* \u0027for-linus\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/dtor/input:\n Input: update multi-touch protocol documentation\n Input: add the ABS_MT_PRESSURE event\n Input: winbond-cir - remove dmesg spam\n Input: lifebook - add another Lifebook DMI signature\n Input: ad7879 - support auxiliary GPIOs via gpiolib\n" }, { "commit": "221af7f87b97431e3ee21ce4b0e77d5411cf1549", "tree": "480126aada06d87c09cb62e7c8fa292572438c18", "parents": [ "64a028a6de08545a2c94f302bc7694bf48aee5b5" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Thu Jan 28 22:14:42 2010 -0800" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Fri Jan 29 08:22:01 2010 -0800" }, "message": "Split \u0027flush_old_exec\u0027 into two functions\n\n\u0027flush_old_exec()\u0027 is the point of no return when doing an execve(), and\nit is pretty badly misnamed. It doesn\u0027t just flush the old executable\nenvironment, it also starts up the new one.\n\nWhich is very inconvenient for things like setting up the new\npersonality, because we want the new personality to affect the starting\nof the new environment, but at the same time we do _not_ want the new\npersonality to take effect if flushing the old one fails.\n\nAs a result, the x86-64 \u002732-bit\u0027 personality is actually done using this\ninsane \"I\u0027m going to change the ABI, but I haven\u0027t done it yet\" bit\n(TIF_ABI_PENDING), with SET_PERSONALITY() not actually setting the\npersonality, but just the \"pending\" bit, so that \"flush_thread()\" can do\nthe actual personality magic.\n\nThis patch in no way changes any of that insanity, but it does split the\n\u0027flush_old_exec()\u0027 function up into a preparatory part that can fail\n(still called flush_old_exec()), and a new part that will actually set\nup the new exec environment (setup_new_exec()). All callers are changed\nto trivially comply with the new world order.\n\nSigned-off-by: H. Peter Anvin \u003chpa@zytor.com\u003e\nCc: stable@kernel.org\nSigned-off-by: Linus Torvalds \u003ctorvalds@linux-foundation.org\u003e\n" }, { "commit": "cb6ecf6f7afece066265e243657b0ac28150a7b2", "tree": "063906ad19c8bd9d1796312723f8e77b9b7ad5e7", "parents": [ "93fb84b50fe03aabca8d9dea5d3ba521a07e8571" ], "author": { "name": "Henrik Rydberg", "email": "rydberg@euromail.se", "time": "Thu Jan 28 22:28:27 2010 -0800" }, "committer": { "name": "Dmitry Torokhov", "email": "dmitry.torokhov@gmail.com", "time": "Thu Jan 28 22:32:45 2010 -0800" }, "message": "Input: add the ABS_MT_PRESSURE event\n\nFor pressure-based multi-touch devices, a direct way to send sensor\nintensity data per finger is needed. This patch adds the ABS_MT_PRESSURE\nevent to the MT protocol.\n\nRequested-by: Yoonyoung Shim \u003cjy0922.shim@samsung.com\u003e\nRequested-by: Mika Kuoppala \u003cmika.kuoppala@nokia.com\u003e\nRequested-by: Peter Hutterer \u003cpeter.hutterer@who-t.net\u003e\nSigned-off-by: Henrik Rydberg \u003crydberg@euromail.se\u003e\nSigned-off-by: Dmitry Torokhov \u003cdtor@mail.ru\u003e\n" }, { "commit": "bb209c8287d2d55ec4a67e3933346e0a3ee0da76", "tree": "2e444f273e631fa4dded4ee13ac779565e5efb43", "parents": [ "b04da8bfdfbbd79544cab2fadfdc12e87eb01600" ], "author": { "name": "Benjamin Herrenschmidt", "email": "benh@kernel.crashing.org", "time": "Tue Jan 26 17:10:03 2010 +0000" }, "committer": { "name": "Benjamin Herrenschmidt", "email": "benh@kernel.crashing.org", "time": "Fri Jan 29 16:51:10 2010 +1100" }, "message": "powerpc/pci: Add calls to set_pcie_port_type() and set_pcie_hotplug_bridge()\n\nWe are missing these when building the pci_dev from scratch off\nthe Open Firmware device-tree\n\nSigned-off-by: Benjamin Herrenschmidt \u003cbenh@kernel.crashing.org\u003e\nAcked-by: Jesse Barnes \u003cjbarnes@virtuousgeek.org\u003e\n" }, { "commit": "b39bda6e7329b1be6dfc2741ed298b6e814532a5", "tree": "c1d8f0bad47b45e47cc8aaa814aaba502ec28ea9", "parents": [ "be8cde8b24c9dca1e54598690115eee5b1476519", "7a481436787cbc932af6c407b317ac603969a242" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Thu Jan 28 12:56:23 2010 -0800" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Thu Jan 28 12:56:23 2010 -0800" }, "message": "Merge branch \u0027for-linus\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/ieee1394/linux1394-2.6\n\n* \u0027for-linus\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/ieee1394/linux1394-2.6:\n firewire: ohci: fix crashes with TSB43AB23 on 64bit systems\n firewire: core: fix use-after-free regression in FCP handler\n firewire: cdev: add_descriptor documentation fix\n firewire: core: add_descriptor size check\n" }, { "commit": "be8cde8b24c9dca1e54598690115eee5b1476519", "tree": "5142cedbf08050eb2af074f00979cf89d90b744f", "parents": [ "981a2edd1922c00e747680f30734ea50c86af28d", "534ef056db8a8fb6b9d50188d88ed5d1fbc66673" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Wed Jan 27 09:54:08 2010 -0800" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Wed Jan 27 09:54:08 2010 -0800" }, "message": "Merge git://git.kernel.org/pub/scm/linux/kernel/git/jejb/scsi-rc-fixes-2.6\n\n* git://git.kernel.org/pub/scm/linux/kernel/git/jejb/scsi-rc-fixes-2.6:\n [SCSI] aic79xx: check for non-NULL scb in ahd_handle_nonpkt_busfree\n [SCSI] zfcp: Set hardware timeout as requested by BSG request.\n [SCSI] zfcp: Introduce bsg_timeout callback.\n [SCSI] scsi_transport_fc: Allow LLD to reset FC BSG timeout\n [SCSI] zfcp: add missing compat ptr conversion\n [SCSI] zfcp: Fix linebreak in hba trace\n [SCSI] zfcp: Issue zfcp_fc_wka_port_put after FC CT BSG request\n [SCSI] qla2xxx: Update version number to 8.03.01-k10.\n [SCSI] fc-transport: Use packed modifier for fc_bsg_request structure.\n [SCSI] qla2xxx: Perform fast mailbox read of flash regardless of size nor address alignment.\n [SCSI] qla2xxx: Correct FCP2 recovery handling.\n [SCSI] scsi_lib: Fix bug in completion of bidi commands\n [SCSI] mptsas: Fix issue with chain pools allocation on katmai\n [SCSI] aacraid: fix File System going into read-only mode\n [SCSI] lpfc: fix file permissions\n" }, { "commit": "0531b2aac59c2296570ac52bfc032ef2ace7d5e1", "tree": "4ca454bdc03c24654529bab9c882c1cd5f99a88c", "parents": [ "caf0801e0cc482497c14a9ce349469c33c60beec" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Wed Jan 27 09:20:03 2010 -0800" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Wed Jan 27 09:20:03 2010 -0800" }, "message": "mm: add new \u0027read_cache_page_gfp()\u0027 helper function\n\nIt\u0027s a simplified \u0027read_cache_page()\u0027 which takes a page allocation\nflag, so that different paths can control how aggressive the memory\nallocations are that populate a address space.\n\nIn particular, the intel GPU object mapping code wants to be able to do\na certain amount of own internal memory management by automatically\nshrinking the address space when memory starts getting tight. This\nallows it to dynamically use different memory allocation policies on a\nper-allocation basis, rather than depend on the (static) address space\ngfp policy.\n\nThe actual new function is a one-liner, but re-organizing the helper\nfunctions to the point where you can do this with a single line of code\nis what most of the patch is all about.\n\nTested-by: Chris Wilson \u003cchris@chris-wilson.co.uk\u003e\nSigned-off-by: Linus Torvalds \u003ctorvalds@linux-foundation.org\u003e\n" }, { "commit": "6d3faf6f431bafb25f4b9926c50a7e5c267738c6", "tree": "60063da2636d6394c6aee7a5d273cb7bc73234f2", "parents": [ "e300839da40e99581581c5d053a95a172651fec8" ], "author": { "name": "Stefan Richter", "email": "stefanr@s5r6.in-berlin.de", "time": "Sun Jan 24 14:48:00 2010 +0100" }, "committer": { "name": "Stefan Richter", "email": "stefanr@s5r6.in-berlin.de", "time": "Tue Jan 26 20:54:50 2010 +0100" }, "message": "firewire: cdev: add_descriptor documentation fix\n\nstruct fw_cdev_add_descriptor.length is in quadlets, not in bytes.\nAlso remove any doubts about the endianess of descriptor data.\n\nSigned-off-by: Stefan Richter \u003cstefanr@s5r6.in-berlin.de\u003e\n" }, { "commit": "486d35e2220acfe45d85131c557d94fe889184a2", "tree": "6be42a8a0d82e7e09bb4ac05edcbdb96adf650dc", "parents": [ "a8d0b6666ecfe14226f1e46d693d5e2cde072337", "443c39bc9ef7d8f648408d74c97e943f3bb3f48a" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Mon Jan 25 19:02:31 2010 -0800" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Mon Jan 25 19:02:31 2010 -0800" }, "message": "Merge branch \u0027kvm-updates/2.6.33\u0027 of git://git.kernel.org/pub/scm/virt/kvm/kvm\n\n* \u0027kvm-updates/2.6.33\u0027 of git://git.kernel.org/pub/scm/virt/kvm/kvm:\n KVM: x86: Fix leak of free lapic date in kvm_arch_vcpu_init()\n KVM: x86: Fix probable memory leak of vcpu-\u003earch.mce_banks\n KVM: S390: fix potential array overrun in intercept handling\n KVM: fix spurious interrupt with irqfd\n eventfd - allow atomic read and waitqueue remove\n KVM: MMU: bail out pagewalk on kvm_read_guest error\n KVM: properly check max PIC pin in irq route setup\n KVM: only allow one gsi per fd\n KVM: x86: Fix host_mapping_level()\n KVM: powerpc: Show timing option only on embedded\n KVM: Fix race between APIC TMR and IRR\n" }, { "commit": "abefedd538f57f63199d821ade33f282e7fe0921", "tree": "d5b442c1d504ac0ed12c2801b98b6418a7f79764", "parents": [ "840f51ffe126123e748df0f36c411a90db1efd93", "7087e16286913b41ba9a5186360645b57b8508dd" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Mon Jan 25 18:59:47 2010 -0800" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Mon Jan 25 18:59:47 2010 -0800" }, "message": "Merge branch \u0027drm-linus\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/airlied/drm-2.6\n\n* \u0027drm-linus\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/airlied/drm-2.6: (95 commits)\n drm/radeon/kms: preface warning printk with driver name\n drm/radeon/kms: drop unnecessary printks.\n drm: fix regression in fb blank handling\n drm/radeon/kms: make hibernate work on IGPs\n drm/vmwgfx: Optimize memory footprint for DMA buffers.\n drm/ttm: Allow system memory as a busy placement.\n drm/ttm: Fix race condition in ttm_bo_delayed_delete (v3, final)\n drm/nv50: prevent switching off SOR when in use for DVI-over-DP\n drm/nv50: fail auxch transaction if reply count not what we expect\n drm/nouveau: fix failure path if userspace specifies no valid memtypes\n drm/nouveau: report LVDS as disconnected if lid closed\n drm/radeon/kms: fix legacy get_engine/memory clock\n drm/radeon/kms/atom: atom parser fixes\n drm/radeon/kms: clean up atombios pll code\n drm/radeon/kms: clean up pll struct\n drm/radeon/kms/atom: fix crtc lock ordering\n drm/radeon: r6xx/r7xx possible security issue, system ram access\n drm/radeon/kms: r600/r700 don\u0027t test ib if ib initialization fails\n drm/radeon/kms: Forbid creation of framebuffer with no valid GEM object\n drm/radeon/kms: r600 handle irq vector ring overflow\n ...\n" }, { "commit": "e2197787efe54c0dcbdc4f6acb6dabb65f27f347", "tree": "fb9bbf08293f0f43954f128708e6422f1d21a404", "parents": [ "4f4e65d2484811210a2826fa9d59712c7fcf1b49", "39d321577405e8e269fd238b278aaf2425fa788a" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Mon Jan 25 18:57:07 2010 -0800" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Mon Jan 25 18:57:07 2010 -0800" }, "message": "Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-2.6\n\n* git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-2.6: (42 commits)\n virtio_net: Make delayed refill more reliable\n sfc: Use fixed-size buffers for MCDI NVRAM requests\n sfc: Add workspace for GMAC bug workaround to MCDI MAC_STATS buffer\n tcp_probe: avoid modulus operation and wrap fix\n qlge: Only free resources if they were allocated\n netns xfrm: deal with dst entries in netns\n sky2: revert config space change\n vlan: fix vlan_skb_recv()\n netns xfrm: fix \"ip xfrm state|policy count\" misreport\n sky2: Enable/disable WOL per hardware device\n net: Fix IPv6 GSO type checks in Intel ethernet drivers\n igb/igbvf: cleanup exception handling in tx_map_adv\n MAINTAINERS: Add Intel igbvf maintainer\n e1000/e1000e: don\u0027t use small hardware rx buffers\n fmvj18x_cs: add new id (Panasonic lan \u0026 modem card)\n be2net: swap only first 2 fields of mcc_wrb\n Please add support for Microsoft MN-120 PCMCIA network card\n be2net: fix bug in rx page posting\n wimax/i2400m: Add support for more i6x50 SKUs\n e1000e: enhance frame fragment detection\n ...\n" }, { "commit": "cb289d6244a37cf932c571d6deb0daa8030f931b", "tree": "05bea15a25c9d9a4dcc0658a6a8bf845daca535a", "parents": [ "a6085fbaf65ab09bfb5ec8d902d6d21680fe1895" ], "author": { "name": "Davide Libenzi", "email": "davidel@xmailserver.org", "time": "Wed Jan 13 09:34:36 2010 -0800" }, "committer": { "name": "Marcelo Tosatti", "email": "mtosatti@redhat.com", "time": "Mon Jan 25 12:26:38 2010 -0200" }, "message": "eventfd - allow atomic read and waitqueue remove\n\nKVM needs a wait to atomically remove themselves from the eventfd -\u003epoll()\nwait queue head, in order to handle correctly their IRQfd deassign\noperation.\n\nThis patch introduces such API, plus a way to read an eventfd from its\ncontext.\n\nSigned-off-by: Davide Libenzi \u003cdavidel@xmailserver.org\u003e\nSigned-off-by: Avi Kivity \u003cavi@redhat.com\u003e\n" }, { "commit": "d7c7544c3d5f59033d1bf3236bc7b289f5f26b75", "tree": "1a3c9e7b6c0c9158ddb73faa05b07697c3493cf1", "parents": [ "a40ccc6868943e74ec12f26a266ce1d0373b2b32" ], "author": { "name": "Alexey Dobriyan", "email": "adobriyan@gmail.com", "time": "Sun Jan 24 22:47:53 2010 -0800" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Sun Jan 24 22:47:53 2010 -0800" }, "message": "netns xfrm: deal with dst entries in netns\n\nGC is non-existent in netns, so after you hit GC threshold, no new\ndst entries will be created until someone triggers cleanup in init_net.\n\nMake xfrm4_dst_ops and xfrm6_dst_ops per-netns.\nThis is not done in a generic way, because it woule waste\n(AF_MAX - 2) * sizeof(struct dst_ops) bytes per-netns.\n\nReorder GC threshold initialization so it\u0027d be done before registering\nXFRM policies.\n\nSigned-off-by: Alexey Dobriyan \u003cadobriyan@gmail.com\u003e\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "b8be634e01b400fa2528848ad0cd6a5580a15bc4", "tree": "f36da264249540727a60e13a54d1d44c8821b48d", "parents": [ "298a4c3a57fed38df365a6807728d1930a72c728", "f5e2bae0aad03164ffc7ce9dfeee6608e2c87dba" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Sun Jan 24 10:31:34 2010 -0800" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Sun Jan 24 10:31:34 2010 -0800" }, "message": "Merge git://git.infradead.org/~dwmw2/mtd-2.6.33\n\n* git://git.infradead.org/~dwmw2/mtd-2.6.33:\n mtd: tests: fix read, speed and stress tests on NOR flash\n mtd: Really add ARM pismo support\n kmsg_dump: Dump on crash_kexec as well\n" }, { "commit": "e071041be037eca208b62b84469a06bdfc692bea", "tree": "c78506a4a582555959ffeb94980cb0cd7f86eab5", "parents": [ "2ca4231de7f7a5fd7137bac152030ba71f15e8c3" ], "author": { "name": "Alexey Dobriyan", "email": "adobriyan@gmail.com", "time": "Sat Jan 23 13:37:10 2010 +0000" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Sat Jan 23 23:10:42 2010 -0800" }, "message": "netns xfrm: fix \"ip xfrm state|policy count\" misreport\n\n\"ip xfrm state|policy count\" report SA/SP count from init_net,\nnot from netns of caller process.\n\nSigned-off-by: Alexey Dobriyan \u003cadobriyan@gmail.com\u003e\nSigned-off-by: Herbert Xu \u003cherbert@gondor.apana.org.au\u003e\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "6be325719b3e54624397e413efd4b33a997e55a3", "tree": "57f321a56794cab2222e179b16731e0d76a4a68a", "parents": [ "26d92f9276a56d55511a427fb70bd70886af647a", "92dcffb916d309aa01778bf8963a6932e4014d07" ], "author": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Fri Jan 22 22:45:46 2010 -0800" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Fri Jan 22 22:45:46 2010 -0800" }, "message": "Merge branch \u0027master\u0027 of /home/davem/src/GIT/linux-2.6/\n" }, { "commit": "e80b1359858df17b0034bdf7d1b6f3e0d5b97257", "tree": "c0ce7b9abcef8910ee78327285d85b04b0512d33", "parents": [ "341031caec0cd730e84d248d95851bf54ec4e41f", "b27d515a49169e5e2a92d621faac761074a8c5b1" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Thu Jan 21 08:50:04 2010 -0800" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Thu Jan 21 08:50:04 2010 -0800" }, "message": "Merge branch \u0027perf-fixes-for-linus\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip\n\n* \u0027perf-fixes-for-linus\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip:\n perf: x86: Add support for the ANY bit\n perf: Change the is_software_event() definition\n perf: Honour event state for aux stream data\n perf: Fix perf_event_do_pending() fallback callsite\n perf kmem: Print usage help for unknown commands\n perf kmem: Increase \"Hit\" column length\n hw-breakpoints, perf: Fix broken mmiotrace due to dr6 by reference change\n perf timechart: Use tid not pid for COMM change\n" }, { "commit": "341031caec0cd730e84d248d95851bf54ec4e41f", "tree": "f9531f3bef8446e0eb2f9f4ba1ed6fa1000585c8", "parents": [ "836f48c5f8c6ef004419f1605514aa05eb58eefb", "6d558c3ac9b6508d26fd5cadccce51fc9d726b1c" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Thu Jan 21 08:49:52 2010 -0800" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Thu Jan 21 08:49:52 2010 -0800" }, "message": "Merge branch \u0027sched-fixes-for-linus\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip\n\n* \u0027sched-fixes-for-linus\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip:\n sched: Reassign prev and switch_count when reacquire_kernel_lock() fail\n sched: Fix vmark regression on big machines\n" }, { "commit": "c9140487b4601ea0b4479af3d92ceb0cda2c691f", "tree": "6ff23dfe9d7366accade95b6aaad9ffd434690d0", "parents": [ "456eac94789e1b512515e6974e091ef655f343de", "0a2fea2e0dea9df8ead1cb45e4b9cd68e1b1d29b" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Thu Jan 21 07:35:43 2010 -0800" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Thu Jan 21 07:35:43 2010 -0800" }, "message": "Merge git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/usb-2.6\n\n* git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/usb-2.6:\n USB: isp1362: fix build failure on ARM systems via irq_flags cleanup\n USB: isp1362: better 64bit printf warning fixes\n USB: fix usbstorage for 2770:915d delivers no FAT\n USB: Fix level of isp1760 Reloading ptd error message\n USB: FHCI: avoid NULL pointer dereference\n USB: Fix duplicate sysfs problem after device reset.\n USB: add speed values for USB 3.0 and wireless controllers\n USB: add missing delay during remote wakeup\n USB: EHCI \u0026 UHCI: fix race between root-hub suspend and port resume\n USB: EHCI: fix handling of unusual interrupt intervals\n USB: Don\u0027t use GFP_KERNEL while we cannot reset a storage device\n USB: fix bitmask merge error\n usb: serial: fix memory leak in generic driver\n USB: serial: fix USB serial fix kfifo_len locking\n" }, { "commit": "456eac94789e1b512515e6974e091ef655f343de", "tree": "79f277d02e5e480a373c129bdce7564421d360c7", "parents": [ "dedd0c2a48d1eb779373de5eddd04a3e059ce540", "f06f135d8642e2f6812cfcb4ea8e4e9122d4d58c" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Thu Jan 21 07:32:11 2010 -0800" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Thu Jan 21 07:32:11 2010 -0800" }, "message": "Merge branch \u0027for-linus\u0027 of git://git.kernel.dk/linux-2.6-block\n\n* \u0027for-linus\u0027 of git://git.kernel.dk/linux-2.6-block:\n fs/bio.c: fix shadows sparse warning\n drbd: The kernel code is now equivalent to out of tree release 8.3.7\n drbd: Allow online resizing of DRBD devices while peer not reachable (needs to be explicitly forced)\n drbd: Don\u0027t go into StandAlone mode when authentification failes because of network error\n drivers/block/drbd/drbd_receiver.c: correct NULL test\n cfq-iosched: Respect ioprio_class when preempting\n genhd: overlapping variable definition\n block: removed unused as_io_context\n DM: Fix device mapper topology stacking\n block: bdev_stack_limits wrapper\n block: Fix discard alignment calculation and printing\n block: Correct handling of bottom device misaligment\n drbd: check on CONFIG_LBDAF, not LBD\n drivers/block/drbd: Correct NULL test\n drbd: Silenced an assert that could triggered after changing write ordering method\n drbd: Kconfig fix\n drbd: Fix for a race between IO and a detach operation [Bugz 262]\n drbd: Use drbd_crypto_is_hash() instead of an open coded check\n" }, { "commit": "92b6759857ea3ad19bc6871044e373f6251841d3", "tree": "99da01c3d9578b1494e3459d56ba98048f750d22", "parents": [ "22e190851f8709c48baf00ed9ce6144cdc54d025" ], "author": { "name": "Peter Zijlstra", "email": "a.p.zijlstra@chello.nl", "time": "Mon Jan 18 14:02:16 2010 +0100" }, "committer": { "name": "Ingo Molnar", "email": "mingo@elte.hu", "time": "Thu Jan 21 13:40:40 2010 +0100" }, "message": "perf: Change the is_software_event() definition\n\nThe is_software_event() definition always confuses me because its an\nexclusive expression, make it an inclusive one.\n\nSigned-off-by: Peter Zijlstra \u003ca.p.zijlstra@chello.nl\u003e\nLKML-Reference: \u003cnew-submission\u003e\nSigned-off-by: Ingo Molnar \u003cmingo@elte.hu\u003e\n" }, { "commit": "50b926e439620c469565e8be0f28be78f5fca1ce", "tree": "3eb4b4aa89ed7c6d61457cdf745c5d52f577671a", "parents": [ "24bc7347da73a9ed3383056c3d0f28c0e361621e" ], "author": { "name": "Mike Galbraith", "email": "efault@gmx.de", "time": "Mon Jan 04 14:44:56 2010 +0100" }, "committer": { "name": "Ingo Molnar", "email": "mingo@elte.hu", "time": "Thu Jan 21 13:39:03 2010 +0100" }, "message": "sched: Fix vmark regression on big machines\n\nSD_PREFER_SIBLING is set at the CPU domain level if power saving isn\u0027t\nenabled, leading to many cache misses on large machines as we traverse\nlooking for an idle shared cache to wake to. Change the enabler of\nselect_idle_sibling() to SD_SHARE_PKG_RESOURCES, and enable same at the\nsibling domain level.\n\nReported-by: Lin Ming \u003cming.m.lin@intel.com\u003e\nSigned-off-by: Mike Galbraith \u003cefault@gmx.de\u003e\nSigned-off-by: Peter Zijlstra \u003ca.p.zijlstra@chello.nl\u003e\nLKML-Reference: \u003c1262612696.15495.15.camel@marge.simson.net\u003e\nSigned-off-by: Ingo Molnar \u003cmingo@elte.hu\u003e\n" }, { "commit": "04a723ea9c53ba608b0411aa36948bb57c51a08e", "tree": "1a5d7395ccc864b8bdf8688396688951e28a4ca8", "parents": [ "b132b04e193908a94d95065d0628f8fb0159cc55" ], "author": { "name": "Sarah Sharp", "email": "sarah.a.sharp@linux.intel.com", "time": "Wed Jan 06 10:16:51 2010 -0800" }, "committer": { "name": "Greg Kroah-Hartman", "email": "gregkh@suse.de", "time": "Wed Jan 20 15:24:35 2010 -0800" }, "message": "USB: Fix duplicate sysfs problem after device reset.\n\nBorislav Petkov reports issues with duplicate sysfs endpoint files after a\nresume from a hibernate. It turns out that the code to support alternate\nsettings under xHCI has issues when a device with a non-default alternate\nsetting is reset during the hibernate:\n\n[ 427.681810] Restarting tasks ...\n[ 427.681995] hub 1-0:1.0: state 7 ports 6 chg 0004 evt 0000\n[ 427.682019] usb usb3: usb resume\n[ 427.682030] ohci_hcd 0000:00:12.0: wakeup root hub\n[ 427.682191] hub 1-0:1.0: port 2, status 0501, change 0000, 480 Mb/s\n[ 427.682205] usb 1-2: usb wakeup-resume\n[ 427.682226] usb 1-2: finish reset-resume\n[ 427.682886] done.\n[ 427.734658] ehci_hcd 0000:00:12.2: port 2 high speed\n[ 427.734663] ehci_hcd 0000:00:12.2: GetStatus port 2 status 001005 POWER sig\u003dse0 PE CONNECT\n[ 427.746682] hub 3-0:1.0: hub_reset_resume\n[ 427.746693] hub 3-0:1.0: trying to enable port power on non-switchable hub\n[ 427.786715] usb 1-2: reset high speed USB device using ehci_hcd and address 2\n[ 427.839653] ehci_hcd 0000:00:12.2: port 2 high speed\n[ 427.839666] ehci_hcd 0000:00:12.2: GetStatus port 2 status 001005 POWER sig\u003dse0 PE CONNECT\n[ 427.847717] ohci_hcd 0000:00:12.0: GetStatus roothub.portstatus [1] \u003d 0x00010100 CSC PPS\n[ 427.915497] hub 1-2:1.0: remove_intf_ep_devs: if: ffff88022f9e8800 -\u003eep_devs_created: 1\n[ 427.915774] hub 1-2:1.0: remove_intf_ep_devs: bNumEndpoints: 1\n[ 427.915934] hub 1-2:1.0: if: ffff88022f9e8800: endpoint devs removed.\n[ 427.916158] hub 1-2:1.0: create_intf_ep_devs: if: ffff88022f9e8800 -\u003eep_devs_created: 0, -\u003eunregistering: 0\n[ 427.916434] hub 1-2:1.0: create_intf_ep_devs: bNumEndpoints: 1\n[ 427.916609] ep_81: create, parent hub\n[ 427.916632] ------------[ cut here ]------------\n[ 427.916644] WARNING: at fs/sysfs/dir.c:477 sysfs_add_one+0x82/0x96()\n[ 427.916649] Hardware name: System Product Name\n[ 427.916653] sysfs: cannot create duplicate filename \u0027/devices/pci0000:00/0000:00:12.2/usb1/1-2/1-2:1.0/ep_81\u0027\n[ 427.916658] Modules linked in: binfmt_misc kvm_amd kvm powernow_k8 cpufreq_ondemand cpufreq_powersave cpufreq_userspace freq_table cpufreq_conservative ipv6 vfat fat\n+8250_pnp 8250 pcspkr ohci_hcd serial_core k10temp edac_core\n[ 427.916694] Pid: 278, comm: khubd Not tainted 2.6.33-rc2-00187-g08d869a-dirty #13\n[ 427.916699] Call Trace:\n\nThe problem is caused by a mismatch between the USB core\u0027s view of the\ndevice state and the USB device and xHCI host\u0027s view of the device state.\n\nAfter the device reset and re-configuration, the device and the xHCI host\nthink they are using alternate setting 0 of all interfaces. However, the\nUSB core keeps track of the old state, which may include non-zero\nalternate settings. It uses intf-\u003ecur_altsetting to keep the endpoint\nsysfs files for the old state across the reset.\n\nThe bandwidth allocation functions need to know what the xHCI host thinks\nthe current alternate settings are, so original patch set\nintf-\u003ecur_altsetting to the alternate setting 0. This caused duplicate\nendpoint files to be created.\n\nThe solution is to not set intf-\u003ecur_altsetting before calling\nusb_set_interface() in usb_reset_and_verify_device(). Instead, we add a\nnew flag to struct usb_interface to tell usb_hcd_alloc_bandwidth() to use\nalternate setting 0 as the currently installed alternate setting.\n\nSigned-off-by: Sarah Sharp \u003csarah.a.sharp@linux.intel.com\u003e\nTested-by: Borislav Petkov \u003cpetkovbb@googlemail.com\u003e\nCc: Alan Stern \u003cstern@rowland.harvard.edu\u003e\nSigned-off-by: Greg Kroah-Hartman \u003cgregkh@suse.de\u003e\n\n" }, { "commit": "be6066f34c948ccf4adcc90bbeb1fd335d663303", "tree": "551d2cf4934e7101e2e668347d85f47663a77e7c", "parents": [ "b4cdd6ac4f9b73118542a5c4e796e6b9f287d0dd", "7f07a605a3929d2d94dcbad8ccb7d280958d21f9" ], "author": { "name": "Len Brown", "email": "len.brown@intel.com", "time": "Wed Jan 20 01:23:27 2010 -0500" }, "committer": { "name": "Len Brown", "email": "len.brown@intel.com", "time": "Wed Jan 20 01:23:27 2010 -0500" }, "message": "Merge branch \u0027misc\u0027 into release\n" }, { "commit": "378fa825f63b026ecb8660370298d74678cac319", "tree": "7b4bf165e13cbac6bdce713330c3bfaa21bb1d21", "parents": [ "093e2961fea5b3b1075dce5b0112c676206988da", "c084ca704a3661bf77690a05bc6bd2c305d87c34" ], "author": { "name": "Len Brown", "email": "len.brown@intel.com", "time": "Wed Jan 20 01:14:50 2010 -0500" }, "committer": { "name": "Len Brown", "email": "len.brown@intel.com", "time": "Wed Jan 20 01:14:50 2010 -0500" }, "message": "Merge branch \u0027bugzilla-14483\u0027 into release\n" }, { "commit": "4f9c85a1b03bfa5c0a0d8488a3a7766f3c9fb756", "tree": "33e56a2d442274aeb0baa2f2b61f7bb5759dd17b", "parents": [ "de4ef86cfce60d2250111f34f8a084e769f23b16" ], "author": { "name": "Anton Vorontsov", "email": "avorontsov@ru.mvista.com", "time": "Mon Jan 18 05:37:16 2010 +0000" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Tue Jan 19 01:59:02 2010 -0800" }, "message": "phylib: Move workqueue initialization to a proper place\n\ncommit 541cd3ee00a4fe975b22fac6a3bc846bacef37f7 (\"phylib: Fix deadlock\non resume\") caused TI DaVinci EMAC ethernet driver to oops upon resume:\n\n PM: resume of devices complete after 237.098 msecs\n Restarting tasks ... done.\n kernel BUG at kernel/workqueue.c:354!\n Unable to handle kernel NULL pointer dereference at virtual address 00000000\n [...]\n Backtrace:\n [\u003cc002c598\u003e] (__bug+0x0/0x2c) from [\u003cc0052a54\u003e] (queue_delayed_work_on+0x74/0xf8)\n [\u003cc00529e0\u003e] (queue_delayed_work_on+0x0/0xf8) from [\u003cc0052b30\u003e] (queue_delayed_work+0x2c/0x30)\n\nThe oops pops up because TI DaVinci EMAC driver detaches PHY on\nsuspend and attaches it back on resume. Attaching makes phylib call\nphy_start_machine() that initializes a workqueue. On the other hand,\nPHY\u0027s resume routine will call phy_start_machine() again, and that\nwill cause the oops since we just destroyed the already scheduled\nworkqueue.\n\nThis patch fixes the issue by moving workqueue initialization to\nphy_device_create().\n\np.s. We don\u0027t see this oops with ucc_geth and gianfar drivers because\nthey perform a fine-grained suspend, i.e. they just stop the PHYs\nwithout detaching.\n\nReported-by: Sekhar Nori \u003cnsekhar@ti.com\u003e\nSigned-off-by: Anton Vorontsov \u003cavorontsov@ru.mvista.com\u003e\nTested-by: Sekhar Nori \u003cnsekhar@ti.com\u003e\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "ec51b7f538c440bfa5a4d538133c659071c02155", "tree": "0c3fb518adb6852440a58887e9ea90ccd212b9a9", "parents": [ "c332e9fcc5289698350d39d4d22c3ed5257d7a80" ], "author": { "name": "Michael Hennerich", "email": "michael.hennerich@analog.com", "time": "Tue Jan 19 00:27:58 2010 -0800" }, "committer": { "name": "Dmitry Torokhov", "email": "dmitry.torokhov@gmail.com", "time": "Tue Jan 19 00:31:51 2010 -0800" }, "message": "Input: ad7879 - support auxiliary GPIOs via gpiolib\n\nDrop the simple fancy sysfs hooks for the aux GPIOs and expose these via\nthe gpiolib interface so that other drivers can use them.\n\nSigned-off-by: Michael Hennerich \u003cmichael.hennerich@analog.com\u003e\nSigned-off-by: Mike Frysinger \u003cvapier@gentoo.org\u003e\nSigned-off-by: Dmitry Torokhov \u003cdtor@mail.ru\u003e\n" }, { "commit": "64e8867ba8098b69889c1af94997a5ba2348fb26", "tree": "3391806575ec3435a26043a22ba45c9d76f0b791", "parents": [ "6f2af72a2451b7491fba820b1d1b0b91c6a84027" ], "author": { "name": "Ian Molton", "email": "ian@mnementh.co.uk", "time": "Wed Jan 06 13:51:48 2010 +0100" }, "committer": { "name": "Samuel Ortiz", "email": "sameo@linux.intel.com", "time": "Mon Jan 18 12:30:27 2010 +0100" }, "message": "mfd: tmio_mmc hardware abstraction for CNF area\n\nThis patch abstracts out the CNF area code from tmio_mmc which\nis not present in all hardware that can use this driver. This\nis required so that we can support non-toshiba based hardware.\n\nASIC3 support by Philipp Zabel\n\nSigned-off-by: Ian Molton \u003cian@mnementh.co.uk\u003e\nSigned-off-by: Magnus Damm \u003cdamm@opensource.se\u003e\nSigned-off-by: Samuel Ortiz \u003csameo@linux.intel.com\u003e\n" }, { "commit": "9dffe2a32b0deef52605d50527c0d240b15cabf7", "tree": "84d406d5c82f47010f2c59abeb512414283db971", "parents": [ "7dc9c484a71525794ca05cf7a47f283f1b54cd12" ], "author": { "name": "Mark Brown", "email": "broonie@opensource.wolfsonmicro.com", "time": "Mon Jan 04 18:05:00 2010 +0000" }, "committer": { "name": "Samuel Ortiz", "email": "sameo@linux.intel.com", "time": "Mon Jan 18 12:30:25 2010 +0100" }, "message": "mfd: Correct WM835x ISINK ramp time defines\n\nThe constants used to specify ISINK ramp times for WM835x had the\nwrong shifts so that the on times applied to the off ramp and vice\nversa. The masks for the bitfields are correct.\n\nSigned-off-by: Mark Brown \u003cbroonie@opensource.wolfsonmicro.com\u003e\nCc: stable@kernel.org\nSigned-off-by: Samuel Ortiz \u003csameo@linux.intel.com\u003e\n" }, { "commit": "7dc9c484a71525794ca05cf7a47f283f1b54cd12", "tree": "e150ea705069b06af5c6e0d077a94437f24e991a", "parents": [ "3a5dd791abef032fe57fc652c0232913c696e59b", "27d55f1f4c190b14092fcca3069c7d15df83514f" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Sun Jan 17 11:01:16 2010 -0800" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Sun Jan 17 11:01:16 2010 -0800" }, "message": "Merge branch \u0027for-linus\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs-2.6\n\n* \u0027for-linus\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs-2.6:\n do_add_mount() should sanitize mnt_flags\n CIFS shouldn\u0027t make mountpoints shrinkable\n mnt_flags fixes in do_remount()\n attach_recursive_mnt() needs to hold vfsmount_lock over set_mnt_shared()\n may_umount() needs namespace_sem\n Fix configfs leak\n Fix the -ESTALE handling in do_filp_open()\n ecryptfs: Fix refcnt leak on ecryptfs_follow_link() error path\n Fix ACC_MODE() for real\n Unrot uml mconsole a bit\n hppfs: handle -\u003eput_link()\n Kill 9p readlink()\n fix autofs/afs/etc. magic mountpoint breakage\n" }, { "commit": "eda05a28ec52be40086400a1b606d211276f0e41", "tree": "8a5ff4c4bb93d66a414ed292455b58013e1a9d10", "parents": [ "368bbe077739fa1ef6fc0195b2810ed50ef87df6" ], "author": { "name": "Harish Zunjarrao", "email": "harish.zunjarrao@qlogic.com", "time": "Tue Jan 12 12:59:50 2010 -0800" }, "committer": { "name": "James Bottomley", "email": "James.Bottomley@suse.de", "time": "Sun Jan 17 12:36:33 2010 -0600" }, "message": "[SCSI] fc-transport: Use packed modifier for fc_bsg_request structure.\n\nThe 32bit kernel does not add padding bytes in the fc_bsg_request structure\nwhereas the 64bit kernel adds padding bytes in the fc_bsg_request structure.\nDue to this, structure elements gets mismatched with 32bit application and\n64bit kernel.To resolve this, used packed modifier to avoid adding padding bytes.\nSigned-off-by: Giridhar Malavali \u003cgiridhar.malavali@qlogic.com\u003e\nSigned-off-by: James Bottomley \u003cJames.Bottomley@suse.de\u003e\n" }, { "commit": "6ccc347b699681a0b21c2f7b1a1f85500a58c6b8", "tree": "abe33c75ae53d445abde0e5986b96ef696501d38", "parents": [ "eb29a5cc0b601c458bae9df2f6c3696d75c2d383", "d1303dd1d6b220cab375f24fa91a5640e54e169e" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Sat Jan 16 12:27:25 2010 -0800" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Sat Jan 16 12:27:25 2010 -0800" }, "message": "Merge branch \u0027tracing-fixes-for-linus\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip\n\n* \u0027tracing-fixes-for-linus\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip:\n tracing/filters: Add comment for match callbacks\n tracing/filters: Fix MATCH_FULL filter matching for PTR_STRING\n tracing/filters: Fix MATCH_MIDDLE_ONLY filter matching\n lib: Introduce strnstr()\n tracing/filters: Fix MATCH_END_ONLY filter matching\n tracing/filters: Fix MATCH_FRONT_ONLY filter matching\n ftrace: Fix MATCH_END_ONLY function filter\n tracing/x86: Derive arch from bits argument in recordmcount.pl\n ring-buffer: Add rb_list_head() wrapper around new reader page next field\n ring-buffer: Wrap a list.next reference with rb_list_head()\n" }, { "commit": "7e6608724c640924aad1d556d17df33ebaa6124d", "tree": "b2d90646f5ee52f5b7807bbc0abe09db9adbe478", "parents": [ "81759b5b221107488bda99fe7beeb7b734f61133" ], "author": { "name": "David Howells", "email": "dhowells@redhat.com", "time": "Fri Jan 15 17:01:39 2010 -0800" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Sat Jan 16 12:15:40 2010 -0800" }, "message": "nommu: fix shared mmap after truncate shrinkage problems\n\nFix a problem in NOMMU mmap with ramfs whereby a shared mmap can happen\nover the end of a truncation. The problem is that\nramfs_nommu_check_mappings() checks that the reduced file size against the\nVMA tree, but not the vm_region tree.\n\nThe following sequence of events can cause the problem:\n\n\tfd \u003d open(\"/tmp/x\", O_RDWR|O_TRUNC|O_CREAT, 0600);\n\tftruncate(fd, 32 * 1024);\n\ta \u003d mmap(NULL, 32 * 1024, PROT_READ|PROT_WRITE, MAP_SHARED, fd, 0);\n\tb \u003d mmap(NULL, 16 * 1024, PROT_READ|PROT_WRITE, MAP_SHARED, fd, 0);\n\tmunmap(a, 32 * 1024);\n\tftruncate(fd, 16 * 1024);\n\tc \u003d mmap(NULL, 32 * 1024, PROT_READ|PROT_WRITE, MAP_SHARED, fd, 0);\n\nMapping \u0027a\u0027 creates a vm_region covering 32KB of the file. Mapping \u0027b\u0027\nsees that the vm_region from \u0027a\u0027 is covering the region it wants and so\nshares it, pinning it in memory.\n\nMapping \u0027a\u0027 then goes away and the file is truncated to the end of VMA\n\u0027b\u0027. However, the region allocated by \u0027a\u0027 is still in effect, and has\n_not_ been reduced.\n\nMapping \u0027c\u0027 is then created, and because there\u0027s a vm_region covering the\ndesired region, get_unmapped_area() is _not_ called to repeat the check,\nand the mapping is granted, even though the pages from the latter half of\nthe mapping have been discarded.\n\nHowever:\n\n\td \u003d mmap(NULL, 16 * 1024, PROT_READ|PROT_WRITE, MAP_SHARED, fd, 0);\n\nMapping \u0027d\u0027 should work, and should end up sharing the region allocated by\n\u0027a\u0027.\n\nTo deal with this, we shrink the vm_region struct during the truncation,\nlest do_mmap_pgoff() take it as licence to share the full region\nautomatically without calling the get_unmapped_area() file op again.\n\nSigned-off-by: David Howells \u003cdhowells@redhat.com\u003e\nAcked-by: Al Viro \u003cviro@zeniv.linux.org.uk\u003e\nCc: Greg Ungerer \u003cgerg@snapgear.com\u003e\nSigned-off-by: Andrew Morton \u003cakpm@linux-foundation.org\u003e\nSigned-off-by: Linus Torvalds \u003ctorvalds@linux-foundation.org\u003e\n" }, { "commit": "efc1a3b16930c41d64ffefde16b87d82f603a8a0", "tree": "1f651e22f534f1b3eacd2fab97e9351aa75abd0b", "parents": [ "779c10232ceb11c1b259232c4845cfb2850287b7" ], "author": { "name": "David Howells", "email": "dhowells@redhat.com", "time": "Fri Jan 15 17:01:35 2010 -0800" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Sat Jan 16 12:15:40 2010 -0800" }, "message": "nommu: don\u0027t need get_unmapped_area() for NOMMU\n\nget_unmapped_area() is unnecessary for NOMMU as no-one calls it.\n\nSigned-off-by: David Howells \u003cdhowells@redhat.com\u003e\nAcked-by: Al Viro \u003cviro@zeniv.linux.org.uk\u003e\nCc: Greg Ungerer \u003cgerg@snapgear.com\u003e\nSigned-off-by: Andrew Morton \u003cakpm@linux-foundation.org\u003e\nSigned-off-by: Linus Torvalds \u003ctorvalds@linux-foundation.org\u003e\n" }, { "commit": "1e2ae599d37e60958c03ca5e46b1f657619a30cd", "tree": "0a0c9ff0370fbefd4eb8fe3a44106880c1aae8cb", "parents": [ "ed5e5894b234ce4793d78078c026915b853e0678" ], "author": { "name": "David Howells", "email": "dhowells@redhat.com", "time": "Fri Jan 15 17:01:33 2010 -0800" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Sat Jan 16 12:15:40 2010 -0800" }, "message": "nommu: struct vm_region\u0027s vm_usage count need not be atomic\n\nThe vm_usage count field in struct vm_region does not need to be atomic as\nit\u0027s only even modified whilst nommu_region_sem is write locked.\n\nSigned-off-by: David Howells \u003cdhowells@redhat.com\u003e\nAcked-by: Al Viro \u003cviro@zeniv.linux.org.uk\u003e\nCc: Greg Ungerer \u003cgerg@snapgear.com\u003e\nSigned-off-by: Andrew Morton \u003cakpm@linux-foundation.org\u003e\nSigned-off-by: Linus Torvalds \u003ctorvalds@linux-foundation.org\u003e\n" }, { "commit": "cc8ef6eb21e964b1c5eb97b2d0e8ac9893e1bf86", "tree": "c30758f4f980a71acd662f55006af80c8a11b27f", "parents": [ "d2dbe08ddceb4ba2b274abb84326d7e69d454e5c" ], "author": { "name": "Roland Dreier", "email": "rdreier@cisco.com", "time": "Fri Jan 15 17:01:22 2010 -0800" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Sat Jan 16 12:15:39 2010 -0800" }, "message": "kernel.h: add BUILD_BUG_ON_NOT_POWER_OF_2()\n\nAdd BUILD_BUG_ON_NOT_POWER_OF_2()\n\nWhen code relies on a constant being a power of 2:\n\n\t#define FOO\t512\t/* must be a power of 2 */\n\nit would be nice to be able to do:\n\n\tBUILD_BUG_ON(!is_power_of_2(FOO));\n\nHowever applying an inline function does not result in a compile-time\nconstant that can be used with BUILD_BUG_ON(), so trying that gives\nresults in:\n\n\terror: bit-field \u0027\u003canonymous\u003e\u0027 width not an integer constant\n\nAs suggested by akpm, rather than monkeying around with is_power_of_2()\nand risking gcc warts about constant expressions, just create a macro\nBUILD_BUG_ON_NOT_POWER_OF_2() to encapsulate this common requirement.\n\nSigned-off-by: Roland Dreier \u003crolandd@cisco.com\u003e\nCc: Bart Van Assche \u003cbvanassche@acm.org\u003e\nCc: David Dillow \u003cdave@thedillows.org\u003e\nCc: \"Robert P. J. Day\" \u003crpjday@crashcourse.ca\u003e\nSigned-off-by: Andrew Morton \u003cakpm@linux-foundation.org\u003e\nSigned-off-by: Linus Torvalds \u003ctorvalds@linux-foundation.org\u003e\n" }, { "commit": "5dab600e6a153ceb64832f608069e6c08185411a", "tree": "866d05be2255bd4f0c146534741b10c60afe9b79", "parents": [ "d994ffc247f7c4a48b848f10c4c01c9b06411ada" ], "author": { "name": "Andi Kleen", "email": "andi@firstfloor.org", "time": "Fri Jan 15 17:01:17 2010 -0800" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Sat Jan 16 12:15:38 2010 -0800" }, "message": "kfifo: document everywhere that size has to be power of two\n\nOn my first try using them I missed that the fifos need to be power of\ntwo, resulting in a runtime bug. Document that requirement everywhere\n(and fix one grammar bug)\n\nSigned-off-by: Andi Kleen \u003cak@linux.intel.com\u003e\nAcked-by: Stefani Seibold \u003cstefani@seibold.net\u003e\nCc: Roland Dreier \u003crdreier@cisco.com\u003e\nCc: Dmitry Torokhov \u003cdmitry.torokhov@gmail.com\u003e\nCc: Andy Walls \u003cawalls@radix.net\u003e\nCc: Vikram Dhillon \u003cdhillonv10@gmail.com\u003e\nSigned-off-by: Andrew Morton \u003cakpm@linux-foundation.org\u003e\nSigned-off-by: Linus Torvalds \u003ctorvalds@linux-foundation.org\u003e\n" }, { "commit": "d994ffc247f7c4a48b848f10c4c01c9b06411ada", "tree": "1ccfe9997a504d556e368553c26661d0ce543f82", "parents": [ "a5b9e2c1063046421ce01dcf5ddd7ec12567f3e1" ], "author": { "name": "Andi Kleen", "email": "andi@firstfloor.org", "time": "Fri Jan 15 17:01:17 2010 -0800" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Sat Jan 16 12:15:38 2010 -0800" }, "message": "kfifo: add kfifo_initialized\n\nSimple inline that checks if kfifo_init() has been executed on a fifo.\n\nThis is useful for walking all per CPU fifos, when some of them might not\nhave been brought up yet.\n\nSigned-off-by: Andi Kleen \u003cak@linux.intel.com\u003e\nAcked-by: Stefani Seibold \u003cstefani@seibold.net\u003e\nCc: Roland Dreier \u003crdreier@cisco.com\u003e\nCc: Dmitry Torokhov \u003cdmitry.torokhov@gmail.com\u003e\nCc: Andy Walls \u003cawalls@radix.net\u003e\nCc: Vikram Dhillon \u003cdhillonv10@gmail.com\u003e\nSigned-off-by: Andrew Morton \u003cakpm@linux-foundation.org\u003e\nSigned-off-by: Linus Torvalds \u003ctorvalds@linux-foundation.org\u003e\n" }, { "commit": "a5b9e2c1063046421ce01dcf5ddd7ec12567f3e1", "tree": "09cef2a043af96491497db380abe89af2aee5176", "parents": [ "64ce1037c5434b1d036cd99ecaee6e00496bc2e9" ], "author": { "name": "Andi Kleen", "email": "andi@firstfloor.org", "time": "Fri Jan 15 17:01:16 2010 -0800" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Sat Jan 16 12:15:38 2010 -0800" }, "message": "kfifo: add kfifo_out_peek\n\nIn some upcoming code it\u0027s useful to peek into a FIFO without permanentely\nremoving data. This patch implements a new kfifo_out_peek() to do this.\n\nSigned-off-by: Andi Kleen \u003cak@linux.intel.com\u003e\nAcked-by: Stefani Seibold \u003cstefani@seibold.net\u003e\nCc: Roland Dreier \u003crdreier@cisco.com\u003e\nCc: Dmitry Torokhov \u003cdmitry.torokhov@gmail.com\u003e\nCc: Andy Walls \u003cawalls@radix.net\u003e\nCc: Vikram Dhillon \u003cdhillonv10@gmail.com\u003e\nSigned-off-by: Andrew Morton \u003cakpm@linux-foundation.org\u003e\nSigned-off-by: Linus Torvalds \u003ctorvalds@linux-foundation.org\u003e\n" }, { "commit": "64ce1037c5434b1d036cd99ecaee6e00496bc2e9", "tree": "37a8c8f1dccdcdb3d00bf07d36d86fe6ea05f3f9", "parents": [ "8ecc2951534af10e04ddb5e5ff5c6d217b79f5c2" ], "author": { "name": "Andi Kleen", "email": "andi@firstfloor.org", "time": "Fri Jan 15 17:01:15 2010 -0800" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Sat Jan 16 12:15:38 2010 -0800" }, "message": "kfifo: sanitize *_user error handling\n\nRight now for kfifo_*_user it\u0027s not easily possible to distingush between\na user copy failing and the FIFO not containing enough data. The problem\nis that both conditions are multiplexed into the same return code.\n\nAvoid this by moving the \"copy length\" into a separate output parameter\nand only return 0/-EFAULT in the main return value.\n\nI didn\u0027t fully adapt the weird \"record\" variants, those seem\nto be unused anyways and were rather messy (should they be just removed?)\n\nI would appreciate some double checking if I did all the conversions\ncorrectly.\n\nSigned-off-by: Andi Kleen \u003cak@linux.intel.com\u003e\nCc: Stefani Seibold \u003cstefani@seibold.net\u003e\nCc: Roland Dreier \u003crdreier@cisco.com\u003e\nCc: Dmitry Torokhov \u003cdmitry.torokhov@gmail.com\u003e\nCc: Andy Walls \u003cawalls@radix.net\u003e\nCc: Vikram Dhillon \u003cdhillonv10@gmail.com\u003e\nSigned-off-by: Andrew Morton \u003cakpm@linux-foundation.org\u003e\nSigned-off-by: Linus Torvalds \u003ctorvalds@linux-foundation.org\u003e\n" }, { "commit": "8ecc2951534af10e04ddb5e5ff5c6d217b79f5c2", "tree": "44c8400754bc42a072fe7dc117696ebb5699920e", "parents": [ "2427b8e3eaea3719e53bbed7b3375382c3aa6f13" ], "author": { "name": "Andi Kleen", "email": "andi@firstfloor.org", "time": "Fri Jan 15 17:01:12 2010 -0800" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Sat Jan 16 12:15:38 2010 -0800" }, "message": "kfifo: use void * pointers for user buffers\n\nThe pointers to user buffers are currently unsigned char *, which requires\na lot of casting in the caller for any non-char typed buffers. Use void *\ninstead.\n\nSigned-off-by: Andi Kleen \u003cak@linux.intel.com\u003e\nAcked-by: Stefani Seibold \u003cstefani@seibold.net\u003e\nCc: Roland Dreier \u003crdreier@cisco.com\u003e\nCc: Dmitry Torokhov \u003cdmitry.torokhov@gmail.com\u003e\nCc: Andy Walls \u003cawalls@radix.net\u003e\nCc: Vikram Dhillon \u003cdhillonv10@gmail.com\u003e\nSigned-off-by: Andrew Morton \u003cakpm@linux-foundation.org\u003e\nSigned-off-by: Linus Torvalds \u003ctorvalds@linux-foundation.org\u003e\n" }, { "commit": "2427b8e3eaea3719e53bbed7b3375382c3aa6f13", "tree": "83d4b8d0bc442a8971584c0d2b8cf3c553484a48", "parents": [ "118f3e1afd5534c15f9701f33514186cfc841a27" ], "author": { "name": "Randy Dunlap", "email": "randy.dunlap@oracle.com", "time": "Fri Jan 15 17:01:11 2010 -0800" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Sat Jan 16 12:15:38 2010 -0800" }, "message": "tty.h: make tty_port_get() static inline\n\nI get a few dozen of these warnings when using\n gcc (GCC) 4.4.1 20090725 (Red Hat 4.4.1-2):\n\nIn file included from mmotm-2010-0113-1217/init/do_mounts.c:5:\nmmotm-2010-0113-1217/include/linux/tty.h: In function \u0027tty_port_get\u0027:\nmmotm-2010-0113-1217/include/linux/tty.h:469: warning: \u0027______f\u0027 is static but declared in inline function \u0027tty_port_get\u0027 which is not static\n\nso make the function static inline.\n\n[akpm@linux-foundation.org: may as well convert tty_port_users() also]\nSigned-off-by: Randy Dunlap \u003crandy.dunlap@oracle.com\u003e\nCc: Alan Cox \u003calan@lxorguk.ukuu.org.uk\u003e\nSigned-off-by: Andrew Morton \u003cakpm@linux-foundation.org\u003e\nSigned-off-by: Linus Torvalds \u003ctorvalds@linux-foundation.org\u003e\n" }, { "commit": "7e105057a34c83cea542dacc55ff0528bce67afa", "tree": "2603ae4ef6b310d8a26f779761cff8cfb4815c09", "parents": [ "33f724eb9e3d6e33aad410318d3ac720fecbdbcd" ], "author": { "name": "Stefani Seibold", "email": "stefani@seibold.net", "time": "Fri Jan 15 17:01:02 2010 -0800" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Sat Jan 16 12:15:37 2010 -0800" }, "message": "kfifo: fix kfifo_out_locked race bug\n\nFix a wrong optimization in include/linux/kfifo.h which could cause a race\nin kfifo_out_locked.\n\nSigned-off-by: Stefani Seibold \u003cstefani@seibold.net\u003e\nReported-by: Johan Hovold \u003cjhovold@gmail.com\u003e\nCc: Pete Zaitcev \u003czaitcev@redhat.com\u003e\nSigned-off-by: Andrew Morton \u003cakpm@linux-foundation.org\u003e\nSigned-off-by: Linus Torvalds \u003ctorvalds@linux-foundation.org\u003e\n" }, { "commit": "d00c362f1b0ff54161e0a42b4554ac621a9ef92d", "tree": "33ffeef90727309ad67690b2b7b63e1161b052ec", "parents": [ "2a04cd4c7d41c4549764734dcf5a883d304e3229" ], "author": { "name": "Jarek Poplawski", "email": "jarkao2@gmail.com", "time": "Sat Jan 16 01:04:04 2010 -0800" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Sat Jan 16 01:04:04 2010 -0800" }, "message": "ax25: netrom: rose: Fix timer oopses\n\nWrong ax25_cb refcounting in ax25_send_frame() and by its callers can\ncause timer oopses (first reported with 2.6.29.6 kernel).\n\nFixes: http://bugzilla.kernel.org/show_bug.cgi?id\u003d14905\n\nReported-by: Bernard Pidoux \u003cbpidoux@free.fr\u003e\nTested-by: Bernard Pidoux \u003cbpidoux@free.fr\u003e\nSigned-off-by: Jarek Poplawski \u003cjarkao2@gmail.com\u003e\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" } ], "next": "c084ca704a3661bf77690a05bc6bd2c305d87c34" }