)]}' { "log": [ { "commit": "4fa64dae8c55ea9d3be4eb5f23ad0c9a60fa6d95", "tree": "fff70142edbe08004cd2d1ddb741de56a2004d02", "parents": [ "0f4272188dd1c815d9d7f05d593474a67da76594" ], "author": { "name": "Kamil Debski", "email": "k.debski@samsung.com", "time": "Mon Jul 04 13:25:50 2011 -0300" }, "committer": { "name": "Mauro Carvalho Chehab", "email": "mchehab@redhat.com", "time": "Wed Jul 27 17:55:39 2011 -0300" }, "message": "[media] v4l: add fourcc definitions for compressed formats\n\nAdd fourcc definitions and documentation for the following\ncompressed formats: H264, H264 without start codes,\nMPEG1/2/4 ES, XVID, VC1 Annex G and Annex L compliant.\n\nSigned-off-by: Kamil Debski \u003ck.debski@samsung.com\u003e\nSigned-off-by: Kyungmin Park \u003ckyungmin.park@samsung.com\u003e\nSigned-off-by: Mauro Carvalho Chehab \u003cmchehab@redhat.com\u003e\n" }, { "commit": "13abadad177074b84f6697639e1d4f64a55b1773", "tree": "007a906c959474d2ced1848ad2a4c791a8b5f1ca", "parents": [ "7ba85fa4fdbbe800e92a937ca567120ef32fe49f" ], "author": { "name": "Sakari Ailus", "email": "sakari.ailus@iki.fi", "time": "Thu May 05 15:39:25 2011 -0300" }, "committer": { "name": "Mauro Carvalho Chehab", "email": "mchehab@redhat.com", "time": "Wed Jul 27 17:55:39 2011 -0300" }, "message": "[media] adp1653: Add driver for LED flash controller\n\nThis patch adds the driver for the adp1653 LED flash controller. This\ncontroller supports a high power led in flash and torch modes and an\nindicator light, sometimes also called privacy light.\n\nThe adp1653 is used on the Nokia N900.\n\nSigned-off-by: Sakari Ailus \u003csakari.ailus@iki.fi\u003e\nSigned-off-by: Tuukka Toivonen \u003ctuukkat76@gmail.com\u003e\nSigned-off-by: Laurent Pinchart \u003claurent.pinchart@ideasonboard.com\u003e\nSigned-off-by: David Cohen \u003cdacohen@gmail.com\u003e\nAcked-by: Laurent Pinchart \u003claurent.pinchart@ideasonboard.com\u003e\nSigned-off-by: Mauro Carvalho Chehab \u003cmchehab@redhat.com\u003e\n" }, { "commit": "0b159acdd577dfd961ad14177c23e97d3ad33009", "tree": "d64a23e926dc056efb619a1f34364d12643c5138", "parents": [ "aec67f054205da77f83ba52f83239225d6cbe366" ], "author": { "name": "Sakari Ailus", "email": "sakari.ailus@iki.fi", "time": "Mon Mar 21 12:52:51 2011 -0300" }, "committer": { "name": "Mauro Carvalho Chehab", "email": "mchehab@redhat.com", "time": "Wed Jul 27 17:55:39 2011 -0300" }, "message": "[media] v4l: Add a class and a set of controls for flash devices\n\nAdd a control class and a set of controls to support LED and Xenon flash\ndevices. An example of such a device is the adp1653.\n\nSigned-off-by: Sakari Ailus \u003csakari.ailus@iki.fi\u003e\nAcked-by: Laurent Pinchart \u003claurent.pinchart@ideasonboard.com\u003e\nSigned-off-by: Mauro Carvalho Chehab \u003cmchehab@redhat.com\u003e\n" }, { "commit": "fa4d7096d1fb7c012ebaacefee132007a21e0965", "tree": "b33643476d3df4c675b7edaada6a0f35d3837272", "parents": [ "1de5be5e91ee10d8f42be2aebc1cede718b48d50" ], "author": { "name": "Hans Verkuil", "email": "hans.verkuil@cisco.com", "time": "Mon May 23 04:07:05 2011 -0300" }, "committer": { "name": "Mauro Carvalho Chehab", "email": "mchehab@redhat.com", "time": "Wed Jul 27 17:55:38 2011 -0300" }, "message": "[media] v4l2-ctrls: add new bitmask control type\n\nSigned-off-by: Hans Verkuil \u003chans.verkuil@cisco.com\u003e\nReviewed-by: Laurent Pinchart \u003claurent.pinchart@ideasonboard.com\u003e\nAcked-by: Sakari Ailus \u003csakari.ailus@iki.fi\u003e\nSigned-off-by: Mauro Carvalho Chehab \u003cmchehab@redhat.com\u003e\n" }, { "commit": "21144ea601f1fea37c7add15a099affec7c08425", "tree": "7b795e665feb87bf1d83ac674c074ebc58573a6b", "parents": [ "0fdee88e54f0b8bd737810517ba70bde5fd7a70c" ], "author": { "name": "Hans de Goede", "email": "hdegoede@redhat.com", "time": "Sun Jun 05 08:32:27 2011 -0300" }, "committer": { "name": "Mauro Carvalho Chehab", "email": "mchehab@redhat.com", "time": "Wed Jul 27 17:53:39 2011 -0300" }, "message": "[media] videodev2.h Add SE401 compressed RGB format\n\nSigned-off-by: Hans de Goede \u003chdegoede@redhat.com\u003e\nSigned-off-by: Mauro Carvalho Chehab \u003cmchehab@redhat.com\u003e\n" }, { "commit": "60c0732244164f14e376cfae493dba368f761514", "tree": "104e04777d3239dabb1c4dba20ec17a7b1089c86", "parents": [ "3ad57c33846d884cfeed770238b27f3dcf3742f1" ], "author": { "name": "Hans Verkuil", "email": "hans.verkuil@cisco.com", "time": "Wed Jun 29 08:56:22 2011 -0300" }, "committer": { "name": "Mauro Carvalho Chehab", "email": "mchehab@redhat.com", "time": "Wed Jul 27 17:53:34 2011 -0300" }, "message": "[media] v4l2-ctrls.c: add support for V4L2_EVENT_SUB_FL_ALLOW_FEEDBACK\n\nNormally no control events will go to the filehandle that called the\nVIDIOC_S_CTRL/VIDIOC_S_EXT_CTRLS ioctls. This is to prevent a feedback\nloop.\n\nThis can now be overridden by setting the new V4L2_EVENT_SUB_FL_ALLOW_FEEDBACK\nflag.\n\nBased on suggestions from Mauro Carvalho Chehab \u003cmchehab@redhat.com\u003e and\nLaurent Pinchart \u003claurent.pinchart@ideasonboard.com\u003e.\n\nSigned-off-by: Hans Verkuil \u003chans.verkuil@cisco.com\u003e\nSigned-off-by: Mauro Carvalho Chehab \u003cmchehab@redhat.com\u003e\n" }, { "commit": "3ad57c33846d884cfeed770238b27f3dcf3742f1", "tree": "64736a199f7b727fa408a5fa769774986e8b8727", "parents": [ "3f66f0ed319505555f45ceac04775b23f9279ee6" ], "author": { "name": "Hans Verkuil", "email": "hans.verkuil@cisco.com", "time": "Mon Jun 20 12:00:36 2011 -0300" }, "committer": { "name": "Mauro Carvalho Chehab", "email": "mchehab@redhat.com", "time": "Wed Jul 27 17:53:34 2011 -0300" }, "message": "[media] v4l2-event.h: add overview documentation to the header\n\nIt\u0027s getting confusing who is linking to what, so add an overview at\nthe start of the header.\n\nSigned-off-by: Hans Verkuil \u003chans.verkuil@cisco.com\u003e\nSigned-off-by: Mauro Carvalho Chehab \u003cmchehab@redhat.com\u003e\n" }, { "commit": "3f66f0ed319505555f45ceac04775b23f9279ee6", "tree": "27796db307bf941b8297b639b4cb2b9a48ffc689", "parents": [ "e969084030b03f4997d63b3f718ba814290e0705" ], "author": { "name": "Hans Verkuil", "email": "hans.verkuil@cisco.com", "time": "Mon Jun 20 11:56:24 2011 -0300" }, "committer": { "name": "Mauro Carvalho Chehab", "email": "mchehab@redhat.com", "time": "Wed Jul 27 17:53:34 2011 -0300" }, "message": "[media] v4l2-ctrls/v4l2-events: small coding style cleanups\n\nThanks to Laurent Pinchart \u003claurent.pinchart@ideasonboard.com\u003e.\n\nSigned-off-by: Hans Verkuil \u003chans.verkuil@cisco.com\u003e\nSigned-off-by: Mauro Carvalho Chehab \u003cmchehab@redhat.com\u003e\n" }, { "commit": "eb5b16efb26ff5b2d0ba25a114394db69c433f86", "tree": "df68e2737553e18218e94247fd6924eeaf09051f", "parents": [ "c12fcfd676e16a82e47ee44fe2d13dc21717063a" ], "author": { "name": "Hans Verkuil", "email": "hans.verkuil@cisco.com", "time": "Tue Jun 14 10:04:06 2011 -0300" }, "committer": { "name": "Mauro Carvalho Chehab", "email": "mchehab@redhat.com", "time": "Wed Jul 27 17:53:31 2011 -0300" }, "message": "[media] v4l2-ctrls: improve discovery of controls of the same cluster\n\nThe implementation of VIDIOC_G/S/TRY_EXT_CTRLS in the control framework has\nto figure out which controls in the control list belong to the same cluster.\nSince controls belonging to the same cluster need to be handled as a unit,\nthis is important information.\n\nIt did that by going over the controls in the list and for each control that\nbelonged to a multi-control cluster it would walk the remainder of the list\nto try and find controls that belong to that same cluster.\n\nThis approach has two disadvantages:\n\n1) it was a potentially quadratic algorithm (although highly unlikely that\nit would ever be that bad in practice).\n2) it took place with the control handler\u0027s lock held.\n\nSince we want to make it possible in the future to change control values\nfrom interrupt context, doing a lot of work while holding a lock is not a\ngood idea.\n\nIn the new code the algorithm is no longer quadratic but linear in the\nnumber of controls in the list. Also, it now can be done beforehand.\n\nAnother change that was made was to so the try and set at the same time.\nBefore when S_TRY_EXT_CTRLS was called it would \u0027try\u0027 the controls first,\nand then it would \u0027set\u0027 them. The idea was that any \u0027try\u0027 errors would\nprevent the \u0027set\u0027 from happening, thus avoiding having partially set\ncontrol lists.\n\nHowever, this caused more problems than it solved because between the \u0027try\u0027\nand the \u0027set\u0027 changes might have happened, so it had to try a second time,\nand since actual controls with a try_ctrl op are very rare (and those that\nwe have just adjust values and do not return an error), I\u0027ve decided to\ndrop that two-stage approach and just combine try and set.\n\nSigned-off-by: Hans Verkuil \u003chans.verkuil@cisco.com\u003e\nSigned-off-by: Mauro Carvalho Chehab \u003cmchehab@redhat.com\u003e\n" }, { "commit": "2151bdc887acfd6dc2c931b4d3c01f95e30b7df8", "tree": "429683c0f6de68971d74fa379cf1dcfe4540c5a3", "parents": [ "f1e393de382af9b9bd2462a42bfa16b8c501d81b" ], "author": { "name": "Hans Verkuil", "email": "hans.verkuil@cisco.com", "time": "Sat Jun 18 07:02:20 2011 -0300" }, "committer": { "name": "Mauro Carvalho Chehab", "email": "mchehab@redhat.com", "time": "Wed Jul 27 17:53:31 2011 -0300" }, "message": "[media] v4l2-event: add optional merge and replace callbacks\n\nWhen the event queue for a subscribed event is full, then the oldest\nevent is dropped. It would be nice if the contents of that oldest\nevent could be merged with the next-oldest. That way no information is\nlost, only intermediate steps are lost.\n\nThis patch adds optional replace() (called when only one kevent was allocated)\nand merge() (called when more than one kevent was allocated) callbacks that\nwill be called to do this job.\n\nThese two callbacks are implemented for the V4L2_EVENT_CTRL event.\n\nSigned-off-by: Hans Verkuil \u003chans.verkuil@cisco.com\u003e\nSigned-off-by: Mauro Carvalho Chehab \u003cmchehab@redhat.com\u003e\n" }, { "commit": "f1e393de382af9b9bd2462a42bfa16b8c501d81b", "tree": "1135a4a27166d3947ebfcf2be171efa2d8cd3228", "parents": [ "77068d36d8b9e9902a89b4bb01011d41926f5420" ], "author": { "name": "Hans Verkuil", "email": "hans.verkuil@cisco.com", "time": "Mon Jun 13 19:24:17 2011 -0300" }, "committer": { "name": "Mauro Carvalho Chehab", "email": "mchehab@redhat.com", "time": "Wed Jul 27 17:53:31 2011 -0300" }, "message": "[media] v4l2-event/ctrls/fh: allocate events per fh and per type instead of just per-fh\n\nThe driver had to decide how many events to allocate when the v4l2_fh struct\nwas created. It was possible to add more events afterwards, but there was no\nway to ensure that you wouldn\u0027t miss important events if the event queue\nwould fill up for that filehandle.\n\nIn addition, once there were no more free events, any new events were simply\ndropped on the floor.\n\nFor the control event in particular this made life very difficult since\ncontrol status/value changes could just be missed if the number of allocated\nevents and the speed at which the application read events was too low to keep\nup with the number of generated events. The application would have no idea\nwhat the latest state was for a control since it could have missed the latest\ncontrol change.\n\nSo this patch makes some major changes in how events are allocated. Instead\nof allocating events per-filehandle they are now allocated when subscribing an\nevent. So for that particular event type N events (determined by the driver)\nare allocated. Those events are reserved for that particular event type.\nThis ensures that you will not miss events for a particular type altogether.\n\nIn addition, if there are N events in use and a new event is raised, then\nthe oldest event is dropped and the new one is added. So the latest event\nis always available.\n\nThis can be further improved by adding the ability to merge the state of\ntwo events together, ensuring that no data is lost at all. This will be\nadded in the next patch.\n\nThis also makes it possible to allow the user to determine the number of\nevents that will be allocated. This is not implemented at the moment, but\nwould be trivial.\n\nSigned-off-by: Hans Verkuil \u003chans.verkuil@cisco.com\u003e\nSigned-off-by: Mauro Carvalho Chehab \u003cmchehab@redhat.com\u003e\n" }, { "commit": "77068d36d8b9e9902a89b4bb01011d41926f5420", "tree": "4fde4974ce56e52acac5c7c8d873d300e946adcc", "parents": [ "523f46d6aba9dcb0a2d0fc474ca884e93a7cf198" ], "author": { "name": "Hans Verkuil", "email": "hans.verkuil@cisco.com", "time": "Mon Jun 13 18:55:58 2011 -0300" }, "committer": { "name": "Mauro Carvalho Chehab", "email": "mchehab@redhat.com", "time": "Wed Jul 27 17:53:31 2011 -0300" }, "message": "[media] v4l2-ctrls/event: remove struct v4l2_ctrl_fh, instead use v4l2_subscribed_event\n\nThe v4l2_ctrl_fh struct connected v4l2_ctrl with v4l2_fh so the control\nwould know which filehandles subscribed to it. However, it is much easier\nto use struct v4l2_subscribed_event directly for that and get rid of that\nintermediate struct.\n\nSigned-off-by: Hans Verkuil \u003chans.verkuil@cisco.com\u003e\nSigned-off-by: Mauro Carvalho Chehab \u003cmchehab@redhat.com\u003e\n" }, { "commit": "523f46d6aba9dcb0a2d0fc474ca884e93a7cf198", "tree": "5c73cecf3d9786868ac03c93f7df2df6a465d9a6", "parents": [ "95904d4b6a188ea2f0f1781498f6ca626e21b9ac" ], "author": { "name": "Hans Verkuil", "email": "hans.verkuil@cisco.com", "time": "Mon Jun 13 17:44:42 2011 -0300" }, "committer": { "name": "Mauro Carvalho Chehab", "email": "mchehab@redhat.com", "time": "Wed Jul 27 17:53:31 2011 -0300" }, "message": "[media] v4l2-events/fh: merge v4l2_events into v4l2_fh\n\nDrivers that supported events used to be rare, but now that controls can also\nraise events this will become much more common since almost all drivers have\ncontrols.\n\nThis means that keeping struct v4l2_events as a separate struct make no more\nsense. Merging it into struct v4l2_fh simplifies things substantially as it\nis now an integral part of the filehandle struct.\n\nSigned-off-by: Hans Verkuil \u003chans.verkuil@cisco.com\u003e\nSigned-off-by: Mauro Carvalho Chehab \u003cmchehab@redhat.com\u003e\n" }, { "commit": "195ebc43bf76df2232d8c55ae284725e73d7a80e", "tree": "93d932437fefebfa5a3b006795191e8ca005e870", "parents": [ "8318a64b892a4de629c3365b3acd8f7d2d7e6100" ], "author": { "name": "Josh Wu", "email": "josh.wu@atmel.com", "time": "Tue Jun 07 22:40:19 2011 -0300" }, "committer": { "name": "Mauro Carvalho Chehab", "email": "mchehab@redhat.com", "time": "Wed Jul 27 17:53:23 2011 -0300" }, "message": "[media] V4L: at91: add Atmel Image Sensor Interface (ISI) support\n\nThis patch is to enable Atmel Image Sensor Interface (ISI) driver support.\n\nSigned-off-by: Josh Wu \u003cjosh.wu@atmel.com\u003e\nAcked-by: Jean-Christophe PLAGNIOL-VILLARD \u003cplagnioj@jcrosoft.com\u003e\nSigned-off-by: Guennadi Liakhovetski \u003cg.liakhovetski@gmx.de\u003e\nSigned-off-by: Mauro Carvalho Chehab \u003cmchehab@redhat.com\u003e\n" }, { "commit": "8318a64b892a4de629c3365b3acd8f7d2d7e6100", "tree": "ea9693cdfabcb5993d4bfbbf4e6814a839dacf12", "parents": [ "14c5ea9bb411f094160626daed03c67641be076a" ], "author": { "name": "Guennadi Liakhovetski", "email": "g.liakhovetski@gmx.de", "time": "Tue Jun 07 06:24:32 2011 -0300" }, "committer": { "name": "Mauro Carvalho Chehab", "email": "mchehab@redhat.com", "time": "Wed Jul 27 17:53:23 2011 -0300" }, "message": "[media] V4L: soc-camera: remove several now unused soc-camera client operations\n\nThis patch removes .enum_input(), .suspend() and .resume() soc-camera\nclient operations.\n\nFunctionality, provided by .enum_input(), if needed, can be implemented\nusing the v4l2-subdev API.\n\nAs for .suspend() and .resume(), the only client driver, implementing\nthese methods has been mt9m111, and the only host driver, using them\nhas been pxa-camera. Now that both those drivers have been converted\nto the standard subdev .s_power() operation, .suspend() and .resume()\ncan be removed.\n\nSigned-off-by: Guennadi Liakhovetski \u003cg.liakhovetski@gmx.de\u003e\nSigned-off-by: Mauro Carvalho Chehab \u003cmchehab@redhat.com\u003e\n" }, { "commit": "b7ccdba02aaa5100eec85d41c56c37c78d3ab407", "tree": "03e625bcbfb438786a15def91d1703ecbea813b9", "parents": [ "4df4ada936dad1cd8bcf3ee7c97841da189ecfc1" ], "author": { "name": "Guennadi Liakhovetski", "email": "g.liakhovetski@gmx.de", "time": "Sat Jun 04 17:24:22 2011 -0300" }, "committer": { "name": "Mauro Carvalho Chehab", "email": "mchehab@redhat.com", "time": "Wed Jul 27 17:53:22 2011 -0300" }, "message": "[media] V4L: soc-camera: MIPI flags are not sensor flags\n\nSOCAM_MIPI_[1234]LANE flags are not board-specific sensor flags, they\nare bus configuration flags.\n\nSigned-off-by: Guennadi Liakhovetski \u003cg.liakhovetski@gmx.de\u003e\nSigned-off-by: Mauro Carvalho Chehab \u003cmchehab@redhat.com\u003e\n" }, { "commit": "82a7c049449ec5a2194249da341ec8bde14e968b", "tree": "689a71f2988b585608e41e7dee4d096c73c7ca22", "parents": [ "2330fb8242c3efc281ab8a2d3e22686023699955" ], "author": { "name": "Hans Verkuil", "email": "hans.verkuil@cisco.com", "time": "Tue Jun 28 10:43:13 2011 -0300" }, "committer": { "name": "Mauro Carvalho Chehab", "email": "mchehab@redhat.com", "time": "Wed Jul 27 17:53:21 2011 -0300" }, "message": "[media] v4l2-ctrls: make manual_mode_value 8 bits and check against control range\n\nSigned-off-by: Hans Verkuil \u003chans.verkuil@cisco.com\u003e\nSigned-off-by: Mauro Carvalho Chehab \u003cmchehab@redhat.com\u003e\n" }, { "commit": "ce7275747bd548e0da7425ba0b7edb6f2c7657a2", "tree": "5e230670266e64ed7f4317df5f39700bb92d5825", "parents": [ "6e239399e5807132f86f64af6c659411c6a3d1a5" ], "author": { "name": "Hans Verkuil", "email": "hans.verkuil@cisco.com", "time": "Fri Jun 10 05:56:39 2011 -0300" }, "committer": { "name": "Mauro Carvalho Chehab", "email": "mchehab@redhat.com", "time": "Wed Jul 27 17:53:20 2011 -0300" }, "message": "[media] v4l2-ctrls: simplify event subscription\n\nSigned-off-by: Hans Verkuil \u003chans.verkuil@cisco.com\u003e\nSigned-off-by: Mauro Carvalho Chehab \u003cmchehab@redhat.com\u003e\n" }, { "commit": "6e239399e5807132f86f64af6c659411c6a3d1a5", "tree": "eeb564a25341111f1c7d6e92137e910c4e4d37f3", "parents": [ "ab892bac8438c5c2ff09a60d765d9b0c14941ba9" ], "author": { "name": "Hans Verkuil", "email": "hans.verkuil@cisco.com", "time": "Tue Jun 07 11:13:44 2011 -0300" }, "committer": { "name": "Mauro Carvalho Chehab", "email": "mchehab@redhat.com", "time": "Wed Jul 27 17:53:20 2011 -0300" }, "message": "[media] v4l2-ctrls: add control events\n\nWhenever a control changes value or state an event is sent to anyone\nthat subscribed to it.\n\nThis functionality is useful for control panels but also for applications\nthat need to wait for (usually status) controls to change value.\n\nSigned-off-by: Hans Verkuil \u003chans.verkuil@cisco.com\u003e\nSigned-off-by: Mauro Carvalho Chehab \u003cmchehab@redhat.com\u003e\n" }, { "commit": "ab892bac8438c5c2ff09a60d765d9b0c14941ba9", "tree": "f0c96b30275086c26b9e17b0092b7587b6f0ac10", "parents": [ "a1c894fba3c306a738576710ca35e70a32b74a6d" ], "author": { "name": "Hans Verkuil", "email": "hans.verkuil@cisco.com", "time": "Tue Jun 07 06:47:18 2011 -0300" }, "committer": { "name": "Mauro Carvalho Chehab", "email": "mchehab@redhat.com", "time": "Wed Jul 27 17:53:19 2011 -0300" }, "message": "[media] v4l2-ctrls: add v4l2_fh pointer to the set control functions\n\nWhen an application changes a control you want to generate an event.\nHowever, you want to avoid sending such an event back to the application\n(file handle) that caused the change.\n\nAdd the filehandle to the various set control functions.\n\nThe filehandle isn\u0027t used yet, but the control event patches will need\nthis.\n\nSigned-off-by: Hans Verkuil \u003chans.verkuil@cisco.com\u003e\nSigned-off-by: Mauro Carvalho Chehab \u003cmchehab@redhat.com\u003e\n" }, { "commit": "72d877cac07c8d996918977c3162dd78b8097ca8", "tree": "03b03db2d5c44c6cca946cb7f24d61a1c15cce24", "parents": [ "78866efe8ae2862fef7ff37af36c6972651c2d0b" ], "author": { "name": "Hans Verkuil", "email": "hans.verkuil@cisco.com", "time": "Fri Jun 10 05:44:36 2011 -0300" }, "committer": { "name": "Mauro Carvalho Chehab", "email": "mchehab@redhat.com", "time": "Wed Jul 27 17:53:18 2011 -0300" }, "message": "[media] v4l2-ctrls: add v4l2_ctrl_auto_cluster to simplify autogain/gain scenarios\n\nIt is a bit tricky to handle autogain/gain type scenerios correctly. Such\ncontrols need to be clustered and the V4L2_CTRL_FLAG_UPDATE should be set on\nthe autofoo controls. In addition, the manual controls should be marked\ninactive when the automatic mode is on, and active when the manual mode is on.\nThis also requires specialized volatile handling.\n\nThe chances of drivers doing all these things correctly are pretty remote.\nSo a new v4l2_ctrl_auto_cluster function was added that takes care of these\nissues.\n\nSigned-off-by: Hans Verkuil \u003chans.verkuil@cisco.com\u003e\nSigned-off-by: Mauro Carvalho Chehab \u003cmchehab@redhat.com\u003e\n" }, { "commit": "2d28b686adc18567b388362e1f7b86658cfd81fc", "tree": "233ac5fb1aeb920cb0539719b1761c01ad109049", "parents": [ "7ebbc39fa0b469243b985e5e26755f1e6184213f" ], "author": { "name": "Hans Verkuil", "email": "hverkuil@xs4all.nl", "time": "Sat Mar 12 08:54:43 2011 -0300" }, "committer": { "name": "Mauro Carvalho Chehab", "email": "mchehab@redhat.com", "time": "Wed Jul 27 17:53:17 2011 -0300" }, "message": "[media] v4l2-ioctl: add ctrl_handler to v4l2_fh\n\nThis is required to implement control events and is also needed to allow\nfor per-filehandle control handlers.\n\nSigned-off-by: Hans Verkuil \u003chverkuil@xs4all.nl\u003e\nSigned-off-by: Mauro Carvalho Chehab \u003cmchehab@redhat.com\u003e\n" }, { "commit": "606b69e9b9442dc283cc2ed1ed73c39f3c5d0ca5", "tree": "f97b99fa59fb469f86117ad05a18cb4b9616d162", "parents": [ "ff0f23dd0edf4a5bd5fa3ee0eda71d8a1c8201d4" ], "author": { "name": "Manjunath Hadli", "email": "manjunath.hadli@ti.com", "time": "Fri Jun 17 04:01:34 2011 -0300" }, "committer": { "name": "Mauro Carvalho Chehab", "email": "mchehab@redhat.com", "time": "Wed Jul 27 17:53:10 2011 -0300" }, "message": "[media] davinci vpbe: VENC( Video Encoder) implementation\n\nThis patch adds the VENC or the Video encoder, which is responsible\nfor the blending of all source planes and timing generation for Video\nmodes like NTSC, PAL and other digital outputs. the VENC implementation\ncurrently supports COMPOSITE and COMPONENT outputs and NTSC and PAL\nresolutions through the analog DACs. The venc block is implemented\nas a subdevice, allowing for additional external and internal encoders\nof other kind to plug-in.\n\nSigned-off-by: Manjunath Hadli \u003cmanjunath.hadli@ti.com\u003e\nAcked-by: Muralidharan Karicheri \u003cm-karicheri2@ti.com\u003e\nAcked-by: Hans Verkuil \u003chverkuil@xs4all.nl\u003e\nSigned-off-by: Mauro Carvalho Chehab \u003cmchehab@redhat.com\u003e\n" }, { "commit": "ff0f23dd0edf4a5bd5fa3ee0eda71d8a1c8201d4", "tree": "596ace1af7c7603752f61b4846a287cbebb96c87", "parents": [ "66715cdc3224a4e241c1a92856b9a4af3b70e06d" ], "author": { "name": "Manjunath Hadli", "email": "manjunath.hadli@ti.com", "time": "Fri Jun 17 04:01:33 2011 -0300" }, "committer": { "name": "Mauro Carvalho Chehab", "email": "mchehab@redhat.com", "time": "Wed Jul 27 17:53:10 2011 -0300" }, "message": "[media] davinci vpbe: OSD(On Screen Display) block\n\nThis patch implements the functionality of the OSD block\nof the VPBE. The OSD in total supports 4 planes or Video\nsources - 2 mainly RGB and 2 Video. The patch implements general\nhandling of all the planes, with specific emphasis on the Video\nplane capabilities as the Video planes are supported through the\nV4L2 driver.\n\nSigned-off-by: Manjunath Hadli \u003cmanjunath.hadli@ti.com\u003e\nAcked-by: Muralidharan Karicheri \u003cm-karicheri2@ti.com\u003e\nAcked-by: Hans Verkuil \u003chverkuil@xs4all.nl\u003e\nSigned-off-by: Mauro Carvalho Chehab \u003cmchehab@redhat.com\u003e\n" }, { "commit": "66715cdc3224a4e241c1a92856b9a4af3b70e06d", "tree": "12f6651b8b717a090d1f71708be13aebf6e0066c", "parents": [ "a2c25b444e99f2369b29e507568c8703186174d0" ], "author": { "name": "Manjunath Hadli", "email": "manjunath.hadli@ti.com", "time": "Fri Jun 17 04:01:32 2011 -0300" }, "committer": { "name": "Mauro Carvalho Chehab", "email": "mchehab@redhat.com", "time": "Wed Jul 27 17:53:09 2011 -0300" }, "message": "[media] davinci vpbe: VPBE display driver\n\nThis patch implements the core functionality of the display driver,\nmainly controlling the VENC and other encoders, and acting as\nthe one point interface for the main V4L2 driver. This implements\nthe core of each of the V4L2 IOCTLs.\n\nSigned-off-by: Manjunath Hadli \u003cmanjunath.hadli@ti.com\u003e\nAcked-by: Muralidharan Karicheri \u003cm-karicheri2@ti.com\u003e\nAcked-by: Hans Verkuil \u003chverkuil@xs4all.nl\u003e\nSigned-off-by: Mauro Carvalho Chehab \u003cmchehab@redhat.com\u003e\n" }, { "commit": "a2c25b444e99f2369b29e507568c8703186174d0", "tree": "c67e95cb9f0a3b83274b1f0c79c6c25fba3dc687", "parents": [ "9a78efc8fbd6776cd0f704be9cac7b013f3d3d16" ], "author": { "name": "Manjunath Hadli", "email": "manjunath.hadli@ti.com", "time": "Fri Jun 17 04:01:31 2011 -0300" }, "committer": { "name": "Mauro Carvalho Chehab", "email": "mchehab@redhat.com", "time": "Wed Jul 27 17:53:09 2011 -0300" }, "message": "[media] davinci vpbe: V4L2 display driver for DM644X SoC\n\nThis is the display driver for Texas Instruments\u0027s DM644X family\nSoC. This patch contains the main implementation of the driver with the\nV4L2 interface. The driver implements the streaming model with\nsupport for both kernel allocated buffers and user pointers. It also\nimplements all of the necessary IOCTLs necessary and supported by the\nvideo display device.\n\nSigned-off-by: Manjunath Hadli \u003cmanjunath.hadli@ti.com\u003e\nAcked-by: Muralidharan Karicheri \u003cm-karicheri2@ti.com\u003e\nAcked-by: Hans Verkuil \u003chverkuil@xs4all.nl\u003e\nSigned-off-by: Mauro Carvalho Chehab \u003cmchehab@redhat.com\u003e\n" }, { "commit": "6a529c1a4a87e0f5d143ad3bc0d37179332f210e", "tree": "50b293832428289f8d8bcea7effabaee3be0b6d6", "parents": [ "9cd49719fda38613e9d7c712b11a54ea4ea005dc" ], "author": { "name": "Ondrej Zary", "email": "linux@rainbow-software.org", "time": "Sat Jun 11 10:28:59 2011 -0300" }, "committer": { "name": "Mauro Carvalho Chehab", "email": "mchehab@redhat.com", "time": "Wed Jul 27 17:53:07 2011 -0300" }, "message": "[media] tea575x: allow multiple opens\n\nChange locking to allow tea575x-radio device to be opened multiple times.\n\nSigned-off-by: Ondrej Zary \u003clinux@rainbow-software.org\u003e\nSigned-off-by: Hans Verkuil \u003chverkuil@xs4all.nl\u003e\nSigned-off-by: Mauro Carvalho Chehab \u003cmchehab@redhat.com\u003e\n" }, { "commit": "9cd49719fda38613e9d7c712b11a54ea4ea005dc", "tree": "f5f949a754ce248d833bb5e327c8e75eb89eda15", "parents": [ "8c528d5e51af26fd71ca6b5e39dfd1b4bd34c505" ], "author": { "name": "Richard Röjfors", "email": "richard.rojfors@pelagicore.com", "time": "Fri Jun 10 11:48:48 2011 -0300" }, "committer": { "name": "Mauro Carvalho Chehab", "email": "mchehab@redhat.com", "time": "Wed Jul 27 17:53:07 2011 -0300" }, "message": "[media] radio-timb: Simplified platform data\n\nThis patch simplifies the platform data slightly, by removing\nunused elements.\n\nSigned-off-by: Richard Röjfors \u003crichard.rojfors@pelagicore.com\u003e\nSigned-off-by: Mauro Carvalho Chehab \u003cmchehab@redhat.com\u003e\n" }, { "commit": "67a8dbbc4e04cd256987b189352472a59aff73be", "tree": "767486631bf85293111a634737dfabb954f98950", "parents": [ "595a93a47a3b7dc1be84160fbd73b1406074f411" ], "author": { "name": "Jonathan Corbet", "email": "corbet@lwn.net", "time": "Sat Jun 11 14:46:49 2011 -0300" }, "committer": { "name": "Mauro Carvalho Chehab", "email": "mchehab@redhat.com", "time": "Wed Jul 27 17:53:01 2011 -0300" }, "message": "[media] marvell-cam: Basic working MMP camera driver\n\nNow we have a camera working over the marvell cam controller core. It\nworks like the cafe driver and has all the same limitations, contiguous DMA\nonly being one of them. But it\u0027s a start.\n\nSigned-off-by: Jonathan Corbet \u003ccorbet@lwn.net\u003e\nSigned-off-by: Mauro Carvalho Chehab \u003cmchehab@redhat.com\u003e\n" }, { "commit": "f8fc729870ee82662ae6e3a713d59b2fbf3b04c6", "tree": "84c00d006269c28e0799a2ca6c2823b81cb1e3d2", "parents": [ "bd7319dc325ac327ddb3777564361bd4186ecdb6" ], "author": { "name": "Jonathan Corbet", "email": "corbet@lwn.net", "time": "Sat Jun 11 17:46:42 2011 +0000" }, "committer": { "name": "Mauro Carvalho Chehab", "email": "mchehab@redhat.com", "time": "Wed Jul 27 17:53:00 2011 -0300" }, "message": "[media] marvell-cam: Move cafe-ccic into its own directory\n\nThis driver will soon become a family of drivers, so let\u0027s give it its own\nplace to live. This move requires putting ov7670.h into include/media, but\nthere are no code changes.\n\nCc: Daniel Drake \u003cdsd@laptop.org\u003e\nSigned-off-by: Jonathan Corbet \u003ccorbet@lwn.net\u003e\nSigned-off-by: Mauro Carvalho Chehab \u003cmchehab@redhat.com\u003e\n" }, { "commit": "5588dc2b025fd8b2188142b8d59efe562bd57d80", "tree": "d8ee1ff6a70569424d5553a003f05cc50c5f4b96", "parents": [ "8a8cc952d3fe0eca3ded22a01d4f7e642d676be0" ], "author": { "name": "David Härdeman", "email": "david@hardeman.nu", "time": "Thu Apr 28 12:13:58 2011 -0300" }, "committer": { "name": "Mauro Carvalho Chehab", "email": "mchehab@redhat.com", "time": "Wed Jul 27 17:52:59 2011 -0300" }, "message": "[media] rc-core: lirc use unsigned int\n\nDurations can never be negative, so it makes sense to consistently use\nunsigned int for LIRC transmission. Contrary to the initial impression,\nthis shouldn\u0027t actually change the userspace API.\n\nSigned-off-by: David Härdeman \u003cdavid@hardeman.nu\u003e\nSigned-off-by: Mauro Carvalho Chehab \u003cmchehab@redhat.com\u003e\n" }, { "commit": "7a2b66b1bd26d717763985bad401410665fa0672", "tree": "71ec1242c3f83f2f00f28ad04dfed6a5d3e98930", "parents": [ "84b01c1633497e748d98ca0d100faaca13579148" ], "author": { "name": "Mauro Carvalho Chehab", "email": "mchehab@redhat.com", "time": "Thu Jun 09 16:26:32 2011 -0300" }, "committer": { "name": "Mauro Carvalho Chehab", "email": "mchehab@redhat.com", "time": "Wed Jul 27 17:52:58 2011 -0300" }, "message": "Revert \"[media] dvb/audio.h: Remove definition for AUDIO_GET_PTS\"\n\nBased on those feedback:\n\thttp://www.spinics.net/lists/linux-media/msg33704.html\n\thttp://www.spinics.net/lists/linux-media/msg33700.html\n\nI\u0027m reverting the removal of this unused ioctl, as it seems that some\ndrivers under development may be using. So, I\u0027ll wait until the next\nmerge window before removing those unused ioctls, to give a chance for\ndevelopers to submit their pending work.\n\nThis reverts commit db48923da6c528d461b5e764692239eb9c1b7a00.\n\nCc: Andreas Oberritter \u003cobi@linuxtv.org\u003e\nCc: Manu Abraham \u003cabraham.manu@gmail.com\u003e\nSigned-off-by: Mauro Carvalho Chehab \u003cmchehab@redhat.com\u003e\n" }, { "commit": "fa24198897ff0e8d34876be0e61f9b35d3c0d467", "tree": "866cef8ed8344c4e4dec1b7c67b0c6763018407b", "parents": [ "a2eb7c020008d664823323aba9fb428fdccc8ba6" ], "author": { "name": "Mauro Carvalho Chehab", "email": "mchehab@redhat.com", "time": "Wed Jun 08 11:25:26 2011 -0300" }, "committer": { "name": "Mauro Carvalho Chehab", "email": "mchehab@redhat.com", "time": "Wed Jul 27 17:52:56 2011 -0300" }, "message": "[media] dvb/audio.h: Remove definition for AUDIO_GET_PTS\n\nWhile this ioctl is defined inside dvb/audio.h, it is not docummented\nat the API specs, nor implemented on any driver inside the Linux Kernel.\nSo, it doesn\u0027t make sense to keep it here.\n\nAs this is not used anywere, removing it is not a regression. So,\nthere\u0027s no need to use the normal features-to-be-removed process.\n\nSigned-off-by: Mauro Carvalho Chehab \u003cmchehab@redhat.com\u003e\n" }, { "commit": "34452432d125a846591523cf4999311c987c0bf4", "tree": "084af62663ad639494d74e779b5d9444eac795f7", "parents": [ "4cde378b3b7cfc65000deab14bfc1b314cb4075b" ], "author": { "name": "Mauro Carvalho Chehab", "email": "mchehab@redhat.com", "time": "Wed Jun 08 10:55:57 2011 -0300" }, "committer": { "name": "Mauro Carvalho Chehab", "email": "mchehab@redhat.com", "time": "Wed Jul 27 17:52:56 2011 -0300" }, "message": "[media] DocBook/audio.xml: synchronize attribute changes\n\nSome attributes suffered some changes since DVBv1. Sync them with the\ncurrent API header files.\n\nSigned-off-by: Mauro Carvalho Chehab \u003cmchehab@redhat.com\u003e\n" }, { "commit": "8d009a0c41475a482aca17d2a9fc8e6965f2fdf9", "tree": "aeb7a8772eb1ad4d2f52198beacfd7e6480ba345", "parents": [ "32127363eebdf63be2f375ed94838a4cdb1d6fe0" ], "author": { "name": "Davide Ferri", "email": "davidef1986@gmail.com", "time": "Tue Jun 23 22:34:06 2009 -0300" }, "committer": { "name": "Mauro Carvalho Chehab", "email": "mchehab@redhat.com", "time": "Wed Jul 27 17:52:25 2011 -0300" }, "message": "[media] dib0700: add initial code for PCTV 340e by Davide Ferri\n\nThis is initial code written by Davide Ferri for the PCTV 340e, including\na new xc4000 driver. I am checking in all the code unmodified, and making\nno assertions about its quality (other than confirming it compiles).\n\n[mchehab@redhat.com: rebased on the top of the current tree]\nSigned-off-by: Devin Heitmueller \u003cdheitmueller@kernellabs.com\u003e\nSigned-off-by: Davide Ferri \u003cdavidef1986@gmail.com\u003e\nCc: Patrick Boettcher \u003cpboettcher@kernellabs.com\u003e\nSigned-off-by: Mauro Carvalho Chehab \u003cmchehab@redhat.com\u003e\n" }, { "commit": "4522e825dbfc19537a08f65719dc3d69c46fe661", "tree": "174e008ad224d01104f92e4e247431c749c91d6a", "parents": [ "2ef403708880c6e00854fb81bbffb9a4036327e6" ], "author": { "name": "Ondrej Zary", "email": "linux@rainbow-software.org", "time": "Mon May 23 09:17:19 2011 -0300" }, "committer": { "name": "Mauro Carvalho Chehab", "email": "mchehab@redhat.com", "time": "Wed Jul 27 17:52:20 2011 -0300" }, "message": "[media] tea575x: convert to control framework\n\nConvert tea575x-tuner to use the new V4L2 control framework. Also add\next_init() callback that can be used by a card driver for additional\ninitialization right before registering the video device (for SF16-FMR2).\n\nAlso embed struct video_device to struct snd_tea575x to simplify the code.\n\nSigned-off-by: Ondrej Zary \u003clinux@rainbow-software.org\u003e\nAcked-by: Hans Verkuil \u003chverkuil@xs4all.nl\u003e\nSigned-off-by: Mauro Carvalho Chehab \u003cmchehab@redhat.com\u003e\n" }, { "commit": "cf6ace16a3cd8b728fb0afa68368fd40bbeae19f", "tree": "489c64380668e8c5a29d3f36f37554e4b081a647", "parents": [ "acc11eab70591744369722280c9ce162a6193494", "d1e9ae47a0285d3f1699e8219ce50f656243b93f" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Wed Jul 20 15:56:25 2011 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Wed Jul 20 15:56:25 2011 -0700" }, "message": "Merge branch \u0027core-urgent-for-linus\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip\n\n* \u0027core-urgent-for-linus\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip:\n signal: align __lock_task_sighand() irq disabling and RCU\n softirq,rcu: Inform RCU of irq_exit() activity\n sched: Add irq_{enter,exit}() to scheduler_ipi()\n rcu: protect __rcu_read_unlock() against scheduler-using irq handlers\n rcu: Streamline code produced by __rcu_read_unlock()\n rcu: Fix RCU_BOOST race handling current-\u003ercu_read_unlock_special\n rcu: decrease rcu_report_exp_rnp coupling with scheduler\n" }, { "commit": "d1e9ae47a0285d3f1699e8219ce50f656243b93f", "tree": "2f5a68b5ba1677bcd49ee759f09ffc5ccccb1455", "parents": [ "e6625fa48e6580a74b7e700efd7e6463e282810b", "a841796f11c90d53dbac773be56b04fbee8af272" ], "author": { "name": "Ingo Molnar", "email": "mingo@elte.hu", "time": "Wed Jul 20 20:59:26 2011 +0200" }, "committer": { "name": "Ingo Molnar", "email": "mingo@elte.hu", "time": "Wed Jul 20 20:59:26 2011 +0200" }, "message": "Merge branch \u0027rcu/urgent\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/paulmck/linux-2.6-rcu into core/urgent\n" }, { "commit": "e3589f6c81e4764d32a25d2a2a0afe54fa344f5c", "tree": "414bf6bdbad3f04f629fa2a72254ea85acf723f4", "parents": [ "9c3f75cbd144014bea6af866a154cc2e73ab2287" ], "author": { "name": "Peter Zijlstra", "email": "a.p.zijlstra@chello.nl", "time": "Fri Jul 15 10:35:52 2011 +0200" }, "committer": { "name": "Ingo Molnar", "email": "mingo@elte.hu", "time": "Wed Jul 20 18:32:41 2011 +0200" }, "message": "sched: Allow for overlapping sched_domain spans\n\nAllow for sched_domain spans that overlap by giving such domains their\nown sched_group list instead of sharing the sched_groups amongst\neach-other.\n\nThis is needed for machines with more than 16 nodes, because\nsched_domain_node_span() will generate a node mask from the\n16 nearest nodes without regard if these masks have any overlap.\n\nCurrently sched_domains have a sched_group that maps to their child\nsched_domain span, and since there is no overlap we share the\nsched_group between the sched_domains of the various CPUs. If however\nthere is overlap, we would need to link the sched_group list in\ndifferent ways for each cpu, and hence sharing isn\u0027t possible.\n\nIn order to solve this, allocate private sched_groups for each CPU\u0027s\nsched_domain but have the sched_groups share a sched_group_power\nstructure such that we can uniquely track the power.\n\nReported-and-tested-by: Anton Blanchard \u003canton@samba.org\u003e\nSigned-off-by: Peter Zijlstra \u003ca.p.zijlstra@chello.nl\u003e\nCc: Linus Torvalds \u003ctorvalds@linux-foundation.org\u003e\nCc: Andrew Morton \u003cakpm@linux-foundation.org\u003e\nLink: http://lkml.kernel.org/n/tip-08bxqw9wis3qti9u5inifh3y@git.kernel.org\nSigned-off-by: Ingo Molnar \u003cmingo@elte.hu\u003e\n" }, { "commit": "9c3f75cbd144014bea6af866a154cc2e73ab2287", "tree": "2a565f7ff0820269973415c5605e313cfff903b4", "parents": [ "e6625fa48e6580a74b7e700efd7e6463e282810b" ], "author": { "name": "Peter Zijlstra", "email": "a.p.zijlstra@chello.nl", "time": "Thu Jul 14 13:00:06 2011 +0200" }, "committer": { "name": "Ingo Molnar", "email": "mingo@elte.hu", "time": "Wed Jul 20 18:32:40 2011 +0200" }, "message": "sched: Break out cpu_power from the sched_group structure\n\nIn order to prepare for non-unique sched_groups per domain, we need to\ncarry the cpu_power elsewhere, so put a level of indirection in.\n\nReported-and-tested-by: Anton Blanchard \u003canton@samba.org\u003e\nSigned-off-by: Peter Zijlstra \u003ca.p.zijlstra@chello.nl\u003e\nCc: Linus Torvalds \u003ctorvalds@linux-foundation.org\u003e\nCc: Andrew Morton \u003cakpm@linux-foundation.org\u003e\nLink: http://lkml.kernel.org/n/tip-qkho2byuhe4482fuknss40ad@git.kernel.org\nSigned-off-by: Ingo Molnar \u003cmingo@elte.hu\u003e\n" }, { "commit": "7765be2fec0f476fcd61812d5f9406b04c765020", "tree": "e89ccb3fbd5655090b05f608f8e1d39924f23a9a", "parents": [ "131906b0062ddde7f85bbe67754983c754648bd8" ], "author": { "name": "Paul E. McKenney", "email": "paul.mckenney@linaro.org", "time": "Thu Jul 14 12:24:11 2011 -0700" }, "committer": { "name": "Paul E. McKenney", "email": "paulmck@linux.vnet.ibm.com", "time": "Tue Jul 19 21:38:52 2011 -0700" }, "message": "rcu: Fix RCU_BOOST race handling current-\u003ercu_read_unlock_special\n\nThe RCU_BOOST commits for TREE_PREEMPT_RCU introduced an other-task\nwrite to a new RCU_READ_UNLOCK_BOOSTED bit in the task_struct structure\u0027s\n-\u003ercu_read_unlock_special field, but, as noted by Steven Rostedt, without\ncorrectly synchronizing all accesses to -\u003ercu_read_unlock_special.\nThis could result in bits in -\u003ercu_read_unlock_special being spuriously\nset and cleared due to conflicting accesses, which in turn could result\nin deadlocks between the rcu_node structure\u0027s -\u003elock and the scheduler\u0027s\nrq and pi locks. These deadlocks would result from RCU incorrectly\nbelieving that the just-ended RCU read-side critical section had been\npreempted and/or boosted. If that RCU read-side critical section was\nexecuted with either rq or pi locks held, RCU\u0027s ensuing (incorrect)\ncalls to the scheduler would cause the scheduler to attempt to once\nagain acquire the rq and pi locks, resulting in deadlock. More complex\ndeadlock cycles are also possible, involving multiple rq and pi locks\nas well as locks from multiple rcu_node structures.\n\nThis commit fixes synchronization by creating -\u003ercu_boosted field in\ntask_struct that is accessed and modified only when holding the -\u003elock\nin the rcu_node structure on which the task is queued (on that rcu_node\nstructure\u0027s -\u003eblkd_tasks list). This results in tasks accessing only\ntheir own current-\u003ercu_read_unlock_special fields, making unsynchronized\naccess once again legal, and keeping the rcu_read_unlock() fastpath free\nof atomic instructions and memory barriers.\n\nThe reason that the rcu_read_unlock() fastpath does not need to access\nthe new current-\u003ercu_boosted field is that this new field cannot\nbe non-zero unless the RCU_READ_UNLOCK_BLOCKED bit is set in the\ncurrent-\u003ercu_read_unlock_special field. Therefore, rcu_read_unlock()\nneed only test current-\u003ercu_read_unlock_special: if that is zero, then\ncurrent-\u003ercu_boosted must also be zero.\n\nThis bug does not affect TINY_PREEMPT_RCU because this implementation\nof RCU accesses current-\u003ercu_read_unlock_special with irqs disabled,\nthus preventing races on the !SMP systems that TINY_PREEMPT_RCU runs on.\n\nMaybe-reported-by: Dave Jones \u003cdavej@redhat.com\u003e\nMaybe-reported-by: Sergey Senozhatsky \u003csergey.senozhatsky@gmail.com\u003e\nReported-by: Steven Rostedt \u003crostedt@goodmis.org\u003e\nSigned-off-by: Paul E. McKenney \u003cpaul.mckenney@linaro.org\u003e\nSigned-off-by: Paul E. McKenney \u003cpaulmck@linux.vnet.ibm.com\u003e\nReviewed-by: Steven Rostedt \u003crostedt@goodmis.org\u003e\n" }, { "commit": "a07c7964a29b6dc515b120f1e1c223ac2f8666f5", "tree": "cf45e084be0437ca921c0623569932bf1d142c1d", "parents": [ "0b8f6273eb6fd0611849d6fb432151f04e042434" ], "author": { "name": "WANG Cong", "email": "xiyou.wangcong@gmail.com", "time": "Sat Jul 16 22:22:20 2011 +0000" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Mon Jul 18 11:06:03 2011 -0700" }, "message": "include/linux/sdla.h: remove the prototype of sdla()\n\n`make headers_check` complains that\n\nlinux-2.6/usr/include/linux/sdla.h:116: userspace cannot reference\nfunction or variable defined in the kernel\n\nthis is due to that there is no such a kernel function,\n\nvoid sdla(void *cfg_info, char *dev, struct frad_conf *conf, int quiet);\n\nI don\u0027t know why we have it in a kernel header, so remove it.\n\nSigned-off-by: WANG Cong \u003cxiyou.wangcong@gmail.com\u003e\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "3d68bd0010d2c9bc9ad6004fdcc4d6a56dcae199", "tree": "013ac9bd1bc68d1d9dda17346eefc617aeb47265", "parents": [ "efcbae253f97bf82e7befd372da3ad5995a53f1a", "05e9a2f67849e427f8900bad0a3f2a939e8dd3d6" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Sun Jul 17 12:49:28 2011 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Sun Jul 17 12:49:28 2011 -0700" }, "message": "Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-2.6\n\n* git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-2.6:\n Bluetooth: Fix crash with incoming L2CAP connections\n Bluetooth: Fix regression in L2CAP connection procedure\n gianfar: rx parser\n r6040: only disable RX interrupt if napi_schedule_prep is successful\n net: remove NETIF_F_ALL_TX_OFFLOADS\n net: sctp: fix checksum marking for outgoing packets\n" }, { "commit": "a6b52a9db891e2a39e8a0fed6005935d8b1aa59c", "tree": "3fbef9df274667d1e96894c2b8c373b7192cfaf1", "parents": [ "247dc220f410969b35f884f1554fe9b78119dd59", "7fb574a97f7147610c44cef55d0cde2409392a80" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Sun Jul 17 12:47:47 2011 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Sun Jul 17 12:47:47 2011 -0700" }, "message": "Merge branch \u0027release\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/lenb/linux-acpi-2.6\n\n* \u0027release\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/lenb/linux-acpi-2.6:\n ACPI: Fixes device power states array overflow\n ACPI, APEI, HEST, Detect duplicated hardware error source ID\n ACPI: Fix lockdep false positives in acpi_power_off()\n" }, { "commit": "e3c1620434ac77b618ce74c024ace3559602ac99", "tree": "40b976b6914b40b44741a5b63c7a700a7884d592", "parents": [ "5dcd07b9f39ca3e9be5bcc387d193fc0674e1c81" ], "author": { "name": "Alex Deucher", "email": "alexdeucher@gmail.com", "time": "Fri Jul 15 14:39:10 2011 +0000" }, "committer": { "name": "Dave Airlie", "email": "airlied@redhat.com", "time": "Fri Jul 15 16:10:55 2011 +0100" }, "message": "drm/radeon/kms: add new NI pci ids\n\nSigned-off-by: Alex Deucher \u003calexander.deucher@amd.com\u003e\nCc: stable@kernel.org\nSigned-off-by: Dave Airlie \u003cairlied@redhat.com\u003e\n" }, { "commit": "62f2a3a48bdc99822a24356e667e52c30df287c9", "tree": "acad792fc90ac7d55974729f3b591e75b0f591dd", "parents": [ "b73c43f884b1b26ef8e824a33f3924f92e493c11" ], "author": { "name": "Michał Mirosław", "email": "mirq-linux@rere.qmqm.pl", "time": "Wed Jul 13 14:10:29 2011 +0000" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Thu Jul 14 15:18:49 2011 -0700" }, "message": "net: remove NETIF_F_ALL_TX_OFFLOADS\n\nThere is no software fallback implemented for SCTP or FCoE checksumming,\nand so it should not be passed on by software devices like bridge or bonding.\n\nFor VLAN devices, this is different. First, the driver for underlying device\nshould be prepared to get offloaded packets even when the feature is disabled\n(especially if it advertises it in vlan_features). Second, devices under\nVLANs do not get replaced without tearing down the VLAN first.\n\nThis fixes a mess I accidentally introduced while converting bonding to\nndo_fix_features.\n\nNETIF_F_SOFT_FEATURES are removed from BOND_VLAN_FEATURES because they\nare unused as of commit 712ae51afd.\n\nSigned-off-by: Michał Mirosław \u003cmirq-linux@rere.qmqm.pl\u003e\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "7fb574a97f7147610c44cef55d0cde2409392a80", "tree": "5743047d3efb8535167b8c1b177dd8e9518208c8", "parents": [ "b4a03b9aa96cc186bf3cfd7a55cb7d7227f0cf4d", "4d2b2956ef1113f1cc43e98e947c20d9c7d2712c", "07e49a7a31153a95caa270d8ad7350a0bcd4d511" ], "author": { "name": "Len Brown", "email": "len.brown@intel.com", "time": "Thu Jul 14 00:16:38 2011 -0400" }, "committer": { "name": "Len Brown", "email": "len.brown@intel.com", "time": "Thu Jul 14 00:16:38 2011 -0400" }, "message": "Merge branches \u0027d3cold\u0027, \u0027bugzilla-37412\u0027 and \u0027bugzilla-38152\u0027 into release\n" }, { "commit": "b4a03b9aa96cc186bf3cfd7a55cb7d7227f0cf4d", "tree": "3bee07efb713e740f631f00e22989c7be1161c91", "parents": [ "8d86e5f91440aa56a5df516bf58fe3883552ad56" ], "author": { "name": "Lin Ming", "email": "ming.m.lin@intel.com", "time": "Wed Jun 01 23:54:02 2011 +0800" }, "committer": { "name": "Len Brown", "email": "len.brown@intel.com", "time": "Wed Jul 13 23:53:22 2011 -0400" }, "message": "ACPI: Fixes device power states array overflow\n\nCommit 28c2103 added new state ACPI_STATE_D3_COLD, so the device power\nstates array must be expanded by one also.\n\nv2: Use ACPI_D_STATE_COUNT instead of number 5 for the array size.\n\nReported-by: Dan Carpenter \u003cerror27@gmail.com\u003e\nSuggested-by: Oldřich Jedlička \u003coldium.pro@seznam.cz\u003e\nSigned-off-by: Lin Ming \u003cming.m.lin@intel.com\u003e\nSigned-off-by: Len Brown \u003clen.brown@intel.com\u003e\n" }, { "commit": "51414d41084496aaefd06d7f19eb8206e8bfac2d", "tree": "31c7624d28a564e1cc918a30b8570a3c001a9c7c", "parents": [ "201f92e2ca789d529418da8fa027d5457f0df024", "f39b2dd9d065151a04f5996656d1f27a7eb32d45" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Wed Jul 13 16:47:31 2011 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Wed Jul 13 16:47:31 2011 -0700" }, "message": "Merge branch \u0027for-linus\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/cjb/mmc\n\n* \u0027for-linus\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/cjb/mmc:\n mmc: core: Bus width testing needs to handle suspend/resume\n" }, { "commit": "5d7d5d933256fc44f68e061ccd103b027fef0fc9", "tree": "c3effea9a99409d4adec80dcf358e6d99736ed25", "parents": [ "8d86e5f91440aa56a5df516bf58fe3883552ad56", "7686d1cc5ed0932a533a5acbc3888b48de63bef8" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Wed Jul 13 13:51:32 2011 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Wed Jul 13 13:51:32 2011 -0700" }, "message": "Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-2.6\n\n* git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-2.6: (21 commits)\n slip: fix wrong SLIP6 ifdef-endif placing\n natsemi: fix another dma-debug report\n sctp: ABORT if receive, reassmbly, or reodering queue is not empty while closing socket\n net: Fix default in docs for tcp_orphan_retries.\n hso: fix a use after free condition\n net/natsemi: Fix module parameter permissions\n XFRM: Fix memory leak in xfrm_state_update\n sctp: Enforce retransmission limit during shutdown\n mac80211: fix TKIP replay vulnerability\n mac80211: fix ie memory allocation for scheduled scans\n ssb: fix init regression of hostmode PCI core\n rtlwifi: rtl8192cu: Add new USB ID for Netgear WNA1000M\n ath9k: Fix tx throughput drops for AR9003 chips with AES encryption\n carl9170: add NEC WL300NU-AG usbid\n cfg80211: fix deadlock with rfkill/sched_scan by adding new mutex\n ath5k: fix incorrect use of drvdata in PCI suspend/resume code\n ath5k: fix incorrect use of drvdata in sysfs code\n Bluetooth: Fix memory leak under page timeouts\n Bluetooth: Fix regression with incoming L2CAP connections\n Bluetooth: Fix hidp disconnect deadlocks and lost wakeup\n ...\n" }, { "commit": "f39b2dd9d065151a04f5996656d1f27a7eb32d45", "tree": "3801f7d6793529d737fcbfd6af05b6900ef2cd06", "parents": [ "c31b55cd4eaf050bb5a15bd8251da1b3c7edeb1c" ], "author": { "name": "Philip Rakity", "email": "prakity@marvell.com", "time": "Thu Jul 07 09:04:55 2011 -0700" }, "committer": { "name": "Chris Ball", "email": "cjb@laptop.org", "time": "Wed Jul 13 14:54:37 2011 -0400" }, "message": "mmc: core: Bus width testing needs to handle suspend/resume\n\nOn reading the ext_csd for the first time (in 1 bit mode), save the\next_csd information needed for bus width compare.\n\nOn every pass we make re-reading the ext_csd, compare the data\nagainst the saved ext_csd data.\n\nThis fixes a regression introduced in 3.0-rc1 by 08ee80cc397ac1a3\n(\"mmc: core: eMMC bus width may not work on all platforms\"), which\nincorrectly assumed we would be re-reading the ext_csd at resume-\ntime.\n\nSigned-off-by: Philip Rakity \u003cprakity@marvell.com\u003e\nTested-by: Jaehoon Chung \u003cjh80.chung@samsung.com\u003e\nSigned-off-by: Chris Ball \u003ccjb@laptop.org\u003e\n" }, { "commit": "07e49a7a31153a95caa270d8ad7350a0bcd4d511", "tree": "6a3fd7777be85069bcc44177b2348f7f618d4a47", "parents": [ "8d86e5f91440aa56a5df516bf58fe3883552ad56" ], "author": { "name": "Rafael J. Wysocki", "email": "rjw@sisk.pl", "time": "Wed Jul 06 20:44:25 2011 +0200" }, "committer": { "name": "Len Brown", "email": "len.brown@intel.com", "time": "Wed Jul 13 14:49:09 2011 -0400" }, "message": "ACPI: Fix lockdep false positives in acpi_power_off()\n\nAll ACPICA locks are allocated by the same function,\nacpi_os_create_lock(), with the help of a local variable called\n\"lock\". Thus, when lockdep is enabled, it uses \"lock\" as the\nname of all those locks and regards them as instances of the same\nlock, which causes it to report possible locking problems with them\nwhen there aren\u0027t any.\n\nTo work around this problem, define acpi_os_create_lock() as a macro\nand make it pass its argument to spin_lock_init(), so that lockdep\nuses it as the name of the new lock. Define this macron in a\nLinux-specific file, to minimize the resulting modifications of\nthe OS-independent ACPICA parts.\n\nThis change is based on an earlier patch from Andrea Righi and it\naddresses a regression from 2.6.39 tracked as\nhttps://bugzilla.kernel.org/show_bug.cgi?id\u003d38152\n\nSigned-off-by: Rafael J. Wysocki \u003crjw@sisk.pl\u003e\nReported-and-tested-by: Borislav Petkov \u003cbp@alien8.de\u003e\nTested-by: Andrea Righi \u003candrea@betterlinux.com\u003e\nReviewed-by: Florian Mickler \u003cflorian@mickler.org\u003e\nSigned-off-by: Len Brown \u003clen.brown@intel.com\u003e\n" }, { "commit": "8d86e5f91440aa56a5df516bf58fe3883552ad56", "tree": "94c8aea597b9e1ade376743a3f8f830e5195fa57", "parents": [ "d93a881dd7d71ad0e6504af232be2795044ab686", "770e1ac5f29003fca18af4e67eb5a05ddb5b1491" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Tue Jul 12 14:21:19 2011 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Tue Jul 12 14:21:19 2011 -0700" }, "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/mm: Fix memory_block_size_bytes() for non-pseries\n mm: Move definition of MIN_MEMORY_BLOCK_SIZE to a header\n" }, { "commit": "d93a881dd7d71ad0e6504af232be2795044ab686", "tree": "71fc6918e676a0cf53d585f5a253646a49b60c83", "parents": [ "d1ca1a004822983e2fc702d5382b4b9a5527cfbe", "24109afd17426e1a2b72141e4a2b730057e1a0ea" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Tue Jul 12 14:19:51 2011 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Tue Jul 12 14:19:51 2011 -0700" }, "message": "Merge branch \u0027fixes\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/arm/linux-arm-soc\n\n* \u0027fixes\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/arm/linux-arm-soc:\n pcmcia: pxa2xx/vpac270: free gpios on exist rather than requesting\n ARM: pxa/raumfeld: fix device name for codec ak4104\n ARM: pxa/raumfeld: display initialisation fixes\n ARM: pxa/raumfeld: adapt to upcoming hardware change\n ARM: pxa: fix gpio_to_chip() clash with gpiolib namespace\n genirq: replace irq_gc_ack() with {set,clr}_bit variants (fwd)\n arm: mach-vt8500: add forgotten irq_data conversion\n ARM: pxa168: correct nand pmu setting\n ARM: pxa910: correct nand pmu setting\n ARM: pxa: fix PGSR register address calculation\n" }, { "commit": "a63fdc5156f2ef5690b6cf03d72b0c4917efbba7", "tree": "03d9b67a5d07ab9d805ea39db2f331740eba1d4c", "parents": [ "620917de59eeb934b9f8cf35cc2d95c1ac8ed0fc" ], "author": { "name": "Benjamin Herrenschmidt", "email": "benh@kernel.crashing.org", "time": "Tue Jun 14 10:57:50 2011 +1000" }, "committer": { "name": "Benjamin Herrenschmidt", "email": "benh@kernel.crashing.org", "time": "Tue Jul 12 11:08:01 2011 +1000" }, "message": "mm: Move definition of MIN_MEMORY_BLOCK_SIZE to a header\n\nThe macro MIN_MEMORY_BLOCK_SIZE is currently defined twice in two .c\nfiles, and I need it in a third one to fix a powerpc bug, so let\u0027s\nfirst move it into a header\n\nSigned-off-by: Benjamin Herrenschmidt \u003cbenh@kernel.crashing.org\u003e\nAcked-by: Ingo Molnar \u003cmingo@elte.hu\u003e\n" }, { "commit": "c15000b40d46c0affa4c142c4ecb7beee4ce03f3", "tree": "14fe31249f9f8c882fecc63542821d6b431630c6", "parents": [ "9ddf7f5058c4f4badd38dba8d5896a5dbd7e716f", "ddc6ff31cc22720c46c1547a5310ea260a968ae9" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Mon Jul 11 16:43:27 2011 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Mon Jul 11 16:43:27 2011 -0700" }, "message": "Merge branch \u0027v4l_for_linus\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/mchehab/linux-2.6\n\n* \u0027v4l_for_linus\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/mchehab/linux-2.6:\n [media] msp3400: fill in v4l2_tuner based on vt-\u003etype field\n [media] tuner-core.c: don\u0027t change type field in g_tuner or g_frequency\n [media] cx18/ivtv: fix g_tuner support\n [media] tuner-core: power up tuner when called with s_power(1)\n [media] v4l2-ioctl.c: check for valid tuner type in S_HW_FREQ_SEEK\n [media] tuner-core: simplify the standard fixup\n [media] tuner-core/v4l2-subdev: document that the type field has to be filled in\n [media] v4l2-subdev.h: remove unused s_mode tuner op\n [media] feature-removal-schedule: change in how radio device nodes are handled\n [media] bttv: fix s_tuner for radio\n [media] pvrusb2: fix g/s_tuner support\n [media] v4l2-ioctl.c: prefill tuner type for g_frequency and g/s_tuner\n [media] tuner-core: fix tuner_resume: use t-\u003emode instead of t-\u003etype\n [media] tuner-core: fix s_std and s_tuner\n" }, { "commit": "f607e7fc5fb94d92030c4527287e9c149ddf9e65", "tree": "49ac9020b87f028e947580425fef84222332fdf8", "parents": [ "453a9bf347f1e22a5bb3605ced43b2366921221d" ], "author": { "name": "Jean-François Dagenais", "email": "dagenaisj@sonatest.com", "time": "Fri Jul 08 15:39:44 2011 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Fri Jul 08 21:14:44 2011 -0700" }, "message": "w1: ds1wm: add a reset recovery parameter\n\nThis fixes a regression in 3.0 reported by Paul Parsons regarding the\nremoval of the msleep(1) in the ds1wm_reset() function:\n\n: The linux-3.0-rc4 DS1WM 1-wire driver is logging \"bus error, retrying\"\n: error messages on an HP iPAQ hx4700 PDA (XScale-PXA270):\n:\n: \u003csnip\u003e\n: Driver for 1-wire Dallas network protocol.\n: DS1WM w1 busmaster driver - (c) 2004 Szabolcs Gyurko\n: 1-Wire driver for the DS2760 battery monitor chip - (c) 2004-2005, Szabolcs Gyurko\n: ds1wm ds1wm: pass: 1 bus error, retrying\n: ds1wm ds1wm: pass: 2 bus error, retrying\n: ds1wm ds1wm: pass: 3 bus error, retrying\n: ds1wm ds1wm: pass: 4 bus error, retrying\n: ds1wm ds1wm: pass: 5 bus error, retrying\n: ...\n:\n: The visible result is that the battery charging LED is erratic; sometimes\n: it works, mostly it doesn\u0027t.\n:\n: The linux-2.6.39 DS1WM 1-wire driver worked OK. I haven\u0027t tried 3.0-rc1,\n: 3.0-rc2, or 3.0-rc3.\n\nThis sleep should not be required on normal circuitry provided the\npull-ups on the bus are correctly adapted to the slaves. Unfortunately,\nthis is not always the case. The sleep is restored but as a parameter to\nthe probe function in the pdata.\n\n[akpm@linux-foundation.org: coding-style fixes]\nReported-by: Paul Parsons \u003clost.distance@yahoo.com\u003e\nTested-by: Paul Parsons \u003clost.distance@yahoo.com\u003e\nSigned-off-by: Jean-François Dagenais \u003cdagenaisj@sonatest.com\u003e\nCc: Evgeniy Polyakov \u003cjohnpol@2ka.mipt.ru\u003e\nSigned-off-by: Andrew Morton \u003cakpm@linux-foundation.org\u003e\nSigned-off-by: Linus Torvalds \u003ctorvalds@linux-foundation.org\u003e\n" }, { "commit": "cd4fcc704f30f2064ab30b5300d44d431e46db50", "tree": "cc08106433d2353adb5f7b52b7bfe6e4f9ebceb8", "parents": [ "3f97fae9482dac1dbdd870a25c89033d3a0b35dc" ], "author": { "name": "Thomas Graf", "email": "tgraf@infradead.org", "time": "Fri Jul 08 04:37:46 2011 +0000" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Fri Jul 08 09:53:08 2011 -0700" }, "message": "sctp: ABORT if receive, reassmbly, or reodering queue is not empty while closing socket\n\nTrigger user ABORT if application closes a socket which has data\nqueued on the socket receive queue or chunks waiting on the\nreassembly or ordering queue as this would imply data being lost\nwhich defeats the point of a graceful shutdown.\n\nThis behavior is already practiced in TCP.\n\nWe do not check the input queue because that would mean to parse\nall chunks on it to look for unacknowledged data which seems too\nmuch of an effort. Control chunks or duplicated chunks may also\nbe in the input queue and should not be stopping a graceful\nshutdown.\n\nSigned-off-by: Thomas Graf \u003ctgraf@infradead.org\u003e\nAcked-by: Vlad Yasevich \u003cvladislav.yasevich@hp.com\u003e\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "f8d9605243280f1870dd2c6c37a735b925c15f3c", "tree": "2d6a3ce33c503bce8fca71489d4c4dc266579469", "parents": [ "31cb852809c86541c817538c98003678546dfa58" ], "author": { "name": "Thomas Graf", "email": "tgraf@infradead.org", "time": "Thu Jul 07 00:28:35 2011 +0000" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Thu Jul 07 14:08:44 2011 -0700" }, "message": "sctp: Enforce retransmission limit during shutdown\n\nWhen initiating a graceful shutdown while having data chunks\non the retransmission queue with a peer which is in zero\nwindow mode the shutdown is never completed because the\nretransmission error count is reset periodically by the\nfollowing two rules:\n\n - Do not timeout association while doing zero window probe.\n - Reset overall error count when a heartbeat request has\n been acknowledged.\n\nThe graceful shutdown will wait for all outstanding TSN to\nbe acknowledged before sending the SHUTDOWN request. This\nnever happens due to the peer\u0027s zero window not acknowledging\nthe continuously retransmitted data chunks. Although the\nerror counter is incremented for each failed retransmission,\nthe receiving of the SACK announcing the zero window clears\nthe error count again immediately. Also heartbeat requests\ncontinue to be sent periodically. The peer acknowledges these\nrequests causing the error counter to be reset as well.\n\nThis patch changes behaviour to only reset the overall error\ncounter for the above rules while not in shutdown. After\nreaching the maximum number of retransmission attempts, the\nT5 shutdown guard timer is scheduled to give the receiver\nsome additional time to recover. The timer is stopped as soon\nas the receiver acknowledges any data.\n\nThe issue can be easily reproduced by establishing a sctp\nassociation over the loopback device, constantly queueing\ndata at the sender while not reading any at the receiver.\nWait for the window to reach zero, then initiate a shutdown\nby killing both processes simultaneously. The association\nwill never be freed and the chunks on the retransmission\nqueue will be retransmitted indefinitely.\n\nSigned-off-by: Thomas Graf \u003ctgraf@infradead.org\u003e\nAcked-by: Vlad Yasevich \u003cvladislav.yasevich@hp.com\u003e\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "2a9d6df425d7b46b23cbc8673b2dfefa4678abdb", "tree": "a6ec2ee125a3c02342b48a2e4a36598c26ca2b8b", "parents": [ "c902ce1bfb40d8b049bd2319b388b4b68b04bc27", "7b28afe01ab6ffb5f152f47831b44933facd2328" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Thu Jul 07 13:22:26 2011 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Thu Jul 07 13:22:26 2011 -0700" }, "message": "Merge branch \u0027for-linus\u0027 of git://git.kernel.dk/linux-block\n\n* \u0027for-linus\u0027 of git://git.kernel.dk/linux-block:\n drbd: we should write meta data updates with FLUSH FUA\n drbd: fix limit define, we support 1 PiByte now\n drbd: when receive times out on meta socket, also check last receive time on data socket\n drbd: account bitmap IO during resync as resync-(related-)-io\n drbd: don\u0027t cond_resched_lock with IRQs disabled\n drbd: add missing spinlock to bitmap receive\n drbd: Use the correct max_bio_size when creating resync requests\n cfq-iosched: make code consistent\n cfq-iosched: fix a rcu warning\n" }, { "commit": "c902ce1bfb40d8b049bd2319b388b4b68b04bc27", "tree": "7dcb1e8378f8ec8e7ad7684cd26e9d5a1b5b22d1", "parents": [ "075d9db13183c102770dc6cefabfee1b832f9614" ], "author": { "name": "David Howells", "email": "dhowells@redhat.com", "time": "Thu Jul 07 12:19:48 2011 +0100" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Thu Jul 07 13:21:56 2011 -0700" }, "message": "FS-Cache: Add a helper to bulk uncache pages on an inode\n\nAdd an FS-Cache helper to bulk uncache pages on an inode. This will\nonly work for the circumstance where the pages in the cache correspond\n1:1 with the pages attached to an inode\u0027s page cache.\n\nThis is required for CIFS and NFS: When disabling inode cookie, we were\nreturning the cookie and setting cifsi-\u003efscache to NULL but failed to\ninvalidate any previously mapped pages. This resulted in \"Bad page\nstate\" errors and manifested in other kind of errors when running\nfsstress. Fix it by uncaching mapped pages when we disable the inode\ncookie.\n\nThis patch should fix the following oops and \"Bad page state\" errors\nseen during fsstress testing.\n\n ------------[ cut here ]------------\n kernel BUG at fs/cachefiles/namei.c:201!\n invalid opcode: 0000 [#1] SMP\n Pid: 5, comm: kworker/u:0 Not tainted 2.6.38.7-30.fc15.x86_64 #1 Bochs Bochs\n RIP: 0010: cachefiles_walk_to_object+0x436/0x745 [cachefiles]\n RSP: 0018:ffff88002ce6dd00 EFLAGS: 00010282\n RAX: ffff88002ef165f0 RBX: ffff88001811f500 RCX: 0000000000000000\n RDX: 0000000000000000 RSI: 0000000000000100 RDI: 0000000000000282\n RBP: ffff88002ce6dda0 R08: 0000000000000100 R09: ffffffff81b3a300\n R10: 0000ffff00066c0a R11: 0000000000000003 R12: ffff88002ae54840\n R13: ffff88002ae54840 R14: ffff880029c29c00 R15: ffff88001811f4b0\n FS: 00007f394dd32720(0000) GS:ffff88002ef00000(0000) knlGS:0000000000000000\n CS: 0010 DS: 0000 ES: 0000 CR0: 000000008005003b\n CR2: 00007fffcb62ddf8 CR3: 000000001825f000 CR4: 00000000000006e0\n DR0: 0000000000000000 DR1: 0000000000000000 DR2: 0000000000000000\n DR3: 0000000000000000 DR6: 00000000ffff0ff0 DR7: 0000000000000400\n Process kworker/u:0 (pid: 5, threadinfo ffff88002ce6c000, task ffff88002ce55cc0)\n Stack:\n 0000000000000246 ffff88002ce55cc0 ffff88002ce6dd58 ffff88001815dc00\n ffff8800185246c0 ffff88001811f618 ffff880029c29d18 ffff88001811f380\n ffff88002ce6dd50 ffffffff814757e4 ffff88002ce6dda0 ffffffff8106ac56\n Call Trace:\n cachefiles_lookup_object+0x78/0xd4 [cachefiles]\n fscache_lookup_object+0x131/0x16d [fscache]\n fscache_object_work_func+0x1bc/0x669 [fscache]\n process_one_work+0x186/0x298\n worker_thread+0xda/0x15d\n kthread+0x84/0x8c\n kernel_thread_helper+0x4/0x10\n RIP cachefiles_walk_to_object+0x436/0x745 [cachefiles]\n ---[ end trace 1d481c9af1804caa ]---\n\nI tested the uncaching by the following means:\n\n (1) Create a big file on my NFS server (104857600 bytes).\n\n (2) Read the file into the cache with md5sum on the NFS client. Look in\n /proc/fs/fscache/stats:\n\n\tPages : mrk\u003d25601 unc\u003d0\n\n (3) Open the file for read/write (\"bash 5\u003c\u003e/warthog/bigfile\"). Look in proc\n again:\n\n\tPages : mrk\u003d25601 unc\u003d25601\n\nReported-by: Jeff Layton \u003cjlayton@redhat.com\u003e\nSigned-off-by: David Howells \u003cdhowells@redhat.com\u003e\nReviewed-and-Tested-by: Suresh Jayaraman \u003csjayaraman@suse.de\u003e\ncc: stable@kernel.org\nSigned-off-by: Linus Torvalds \u003ctorvalds@linux-foundation.org\u003e\n" }, { "commit": "27a3b735b70651f28db03e5f92775a40661ba7a6", "tree": "9f300b93aa34381aa1d3121e9d53e8c8e1623a24", "parents": [ "85746e429f8e5dc8c5c0beadc0f099cb1feab93e", "161b6ae0e067e421b20bb35caf66bdb405c929ac", "140fe3b1ab9c082182ef13359fab4ddba95c24c3", "e4c2fb0d5776b58049d2556b456144a4db3fe5a9" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Thu Jul 07 13:17:45 2011 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Thu Jul 07 13:17:45 2011 -0700" }, "message": "Merge branches \u0027core-urgent-for-linus\u0027, \u0027perf-urgent-for-linus\u0027 and \u0027sched-urgent-for-linus\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip\n\n* \u0027core-urgent-for-linus\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip:\n debugobjects: Fix boot crash when kmemleak and debugobjects enabled\n\n* \u0027perf-urgent-for-linus\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip:\n jump_label: Fix jump_label update for modules\n oprofile, x86: Fix race in nmi handler while starting counters\n\n* \u0027sched-urgent-for-linus\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip:\n sched: Disable (revert) SCHED_LOAD_SCALE increase\n sched, cgroups: Fix MIN_SHARES on 64-bit boxen\n" }, { "commit": "85746e429f8e5dc8c5c0beadc0f099cb1feab93e", "tree": "65a6852655b441d03899d1cb7d8012ff52a915a1", "parents": [ "4dd1b49c6d215dc41ce50c80b4868388b93f31a3", "949123016a2ef578009b6aa3e98d45d1a154ebfb" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Thu Jul 07 13:16:21 2011 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Thu Jul 07 13:16:21 2011 -0700" }, "message": "Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-2.6\n\n* git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-2.6: (31 commits)\n sctp: fix missing send up SCTP_SENDER_DRY_EVENT when subscribe it\n net: refine {udp|tcp|sctp}_mem limits\n vmxnet3: round down # of queues to power of two\n net: sh_eth: fix the parameter for the ETHER of SH7757\n net: sh_eth: fix cannot work half-duplex mode\n net: vlan: enable soft features regardless of underlying device\n vmxnet3: fix starving rx ring whenoc_skb kb fails\n bridge: Always flood broadcast packets\n greth: greth_set_mac_add would corrupt the MAC address.\n net: bind() fix error return on wrong address family\n natsemi: silence dma-debug warnings\n net: 8139too: Initial necessary vlan_features to support vlan\n Fix call trace when interrupts are disabled while sleeping function kzalloc is called\n qlge:Version change to v1.00.00.29\n qlge: Fix printk priority so chip fatal errors are always reported.\n qlge:Fix crash caused by mailbox execution on wedged chip.\n xfrm4: Don\u0027t call icmp_send on local error\n ipv4: Don\u0027t use ufo handling on later transformed packets\n xfrm: Remove family arg from xfrm_bundle_ok\n ipv6: Don\u0027t put artificial limit on routing table size.\n ...\n" }, { "commit": "338e9e1ad541cbb2a3fa5839376ff6c138d40301", "tree": "0657639257487bc4ac5499e51e8a4083ea4de896", "parents": [ "e206fc5e3de0e38a35b6f92941c913b6d8343fc6" ], "author": { "name": "Hans Verkuil", "email": "hans.verkuil@cisco.com", "time": "Mon Jun 13 09:35:56 2011 -0300" }, "committer": { "name": "Mauro Carvalho Chehab", "email": "mchehab@redhat.com", "time": "Thu Jul 07 15:04:23 2011 -0300" }, "message": "[media] tuner-core/v4l2-subdev: document that the type field has to be filled in\n\nThe tuner ops g_frequency, g_tuner and s_tuner require that the tuner type\nfield is filled in. Document this.\n\nThe tuner-core doc is based on a patch from Mauro Carvalho Chehab \u003cmchehab@redhat.com\u003e.\n\nSigned-off-by: Hans Verkuil \u003chans.verkuil@cisco.com\u003e\nSigned-off-by: Mauro Carvalho Chehab \u003cmchehab@redhat.com\u003e\n" }, { "commit": "e206fc5e3de0e38a35b6f92941c913b6d8343fc6", "tree": "37419272d1da1ccaaa26c0adce7dd7299fc63a21", "parents": [ "6293698277f04eb1623536887651381ed3abc8d0" ], "author": { "name": "Hans Verkuil", "email": "hans.verkuil@cisco.com", "time": "Mon Jun 13 09:34:56 2011 -0300" }, "committer": { "name": "Mauro Carvalho Chehab", "email": "mchehab@redhat.com", "time": "Thu Jul 07 15:03:59 2011 -0300" }, "message": "[media] v4l2-subdev.h: remove unused s_mode tuner op\n\ns_mode is no longer used, so remove it.\n\nSigned-off-by: Hans Verkuil \u003chans.verkuil@cisco.com\u003e\nSigned-off-by: Mauro Carvalho Chehab \u003cmchehab@redhat.com\u003e\n" }, { "commit": "659fb32d1b67476f4ade25e9ea0e2642a5b9c4b5", "tree": "a875904f1c457f321563060491956266a57c6514", "parents": [ "d30e1521b2afb5e6f21ca8bc1a4b6ec2afc93597" ], "author": { "name": "Simon Guinot", "email": "sguinot@lacie.com", "time": "Wed Jul 06 12:41:31 2011 -0400" }, "committer": { "name": "Arnd Bergmann", "email": "arnd@arndb.de", "time": "Thu Jul 07 16:02:26 2011 +0000" }, "message": "genirq: replace irq_gc_ack() with {set,clr}_bit variants (fwd)\n\nThis fixes a regression introduced by e59347a \"arm: orion:\nUse generic irq chip\".\n\nDepending on the device, interrupts acknowledgement is done by setting\nor by clearing a dedicated register. Replace irq_gc_ack() with some\n{set,clr}_bit variants allows to handle both cases.\n\nNote that this patch affects the following SoCs: Davinci, Samsung and\nOrion. Except for this last, the change is minor: irq_gc_ack() is just\nrenamed into irq_gc_ack_set_bit().\n\nFor the Orion SoCs, the edge GPIO interrupts support is currently\nbroken. irq_gc_ack() try to acknowledge a such interrupt by setting\nthe corresponding cause register bit. The Orion GPIO device expect the\nopposite. To fix this issue, the irq_gc_ack_clr_bit() variant is used.\n\nTested on Network Space v2.\n\nReported-by: Joey Oravec \u003cjoravec@drewtech.com\u003e\nSigned-off-by: Simon Guinot \u003csguinot@lacie.com\u003e\nSigned-off-by: Arnd Bergmann \u003carnd@arndb.de\u003e\n" }, { "commit": "de3796e77a587b28f0c9d8e04c02894d3939dc4e", "tree": "f5a414a421e45e7f90c113aaf3ef30e078672f46", "parents": [ "bcb65a797eb7c51e4f227dd19295f14d38738fee", "98c32bcded0e249fd48726930ae9f393e0e318b4" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Wed Jul 06 12:16:49 2011 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Wed Jul 06 12:16:49 2011 -0700" }, "message": "Merge branch \u0027v4l_for_linus\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/mchehab/linux-2.6\n\n* \u0027v4l_for_linus\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/mchehab/linux-2.6: (46 commits)\n [media] rc: call input_sync after scancode reports\n [media] imon: allow either proto on unknown 0xffdc\n [media] imon: auto-config ffdc 7e device\n [media] saa7134: fix raw IR timeout value\n [media] rc: fix ghost keypresses with certain hw\n [media] [staging] lirc_serial: allocate irq at init time\n [media] lirc_zilog: fix spinning rx thread\n [media] keymaps: fix table for pinnacle pctv hd devices\n [media] ite-cir: 8709 needs to use pnp resource 2\n [media] V4L: mx1-camera: fix uninitialized variable\n [media] omap_vout: Added check in reqbuf \u0026 mmap for buf_size allocation\n [media] OMAP_VOUT: Change hardcoded device node number to -1\n [media] OMAP_VOUTLIB: Fix wrong resizer calculation\n [media] uvcvideo: Disable the queue when failing to start\n [media] uvcvideo: Remove buffers from the queues when freeing\n [media] uvcvideo: Ignore entities for terminals with no supported format\n [media] v4l: Don\u0027t access media entity after is has been destroyed\n [media] media: omap3isp: fix a potential NULL deref\n [media] media: vb2: fix allocation failure check\n [media] media: vb2: reset queued_count value during queue reinitialization\n ...\n\nFix up trivial conflict in MAINTAINERS as per Mauro\n" }, { "commit": "e4c2fb0d5776b58049d2556b456144a4db3fe5a9", "tree": "04cebbb24f524408728492cfeb396d66aa6127e4", "parents": [ "cd62287e364c0d15d517c6ced4e4808b54711475" ], "author": { "name": "Peter Zijlstra", "email": "a.p.zijlstra@chello.nl", "time": "Tue Jul 05 10:56:32 2011 +0200" }, "committer": { "name": "Ingo Molnar", "email": "mingo@elte.hu", "time": "Tue Jul 05 11:28:18 2011 +0200" }, "message": "sched: Disable (revert) SCHED_LOAD_SCALE increase\n\nAlex reported that commit c8b281161df (\"sched: Increase\nSCHED_LOAD_SCALE resolution\") caused a power usage regression\nunder light load as it increases the number of load-balance\noperations and keeps idle cpus from staying idle.\n\nTime has run out to find the root cause for this release so\ndisable the feature for v3.0 until we can figure out what\ncauses the problem.\n\nReported-by: \"Alex, Shi\" \u003calex.shi@intel.com\u003e\nSigned-off-by: Peter Zijlstra \u003ca.p.zijlstra@chello.nl\u003e\nCc: Nikhil Rao \u003cncrao@google.com\u003e\nCc: Ming Lei \u003ctom.leiming@gmail.com\u003e\nCc: Mike Galbraith \u003cefault@gmx.de\u003e\nCc: Linus Torvalds \u003ctorvalds@linux-foundation.org\u003e\nCc: Andrew Morton \u003cakpm@linux-foundation.org\u003e\nLink: http://lkml.kernel.org/n/tip-m4onxn0sxnyn5iz9o88eskc3@git.kernel.org\nSigned-off-by: Ingo Molnar \u003cmingo@elte.hu\u003e\n" }, { "commit": "aababb9766f0e874da26a17acbbec867bf9501f0", "tree": "4dea1f04d8c6d66ce00bb0ab49b939c165c3f33b", "parents": [ "b2bc4782191cb574924a1d09f48083ea8b33a93b", "3e86f1d8e397b1ef59a97910089e16a99e8f31f7" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Mon Jul 04 15:53:53 2011 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Mon Jul 04 15:53:53 2011 -0700" }, "message": "Merge branch \u0027fbdev-fixes-for-linus\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/lethal/fbdev-3.x\n\n* \u0027fbdev-fixes-for-linus\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/lethal/fbdev-3.x:\n vesafb: fix memory leak\n fbdev: amba: Link fb device to its parent\n fsl-diu-fb: remove check for pixel clock ranges\n udlfb: Correct sub-optimal resolution selection.\n hecubafb: add module_put on error path in hecubafb_probe()\n sm501fb: fix section mismatch warning\n gx1fb: Fix section mismatch warnings\n fbdev: sh_mobile_meram: Correct pointer check for YCbCr chroma plane\n" }, { "commit": "8aa7ad9018d7fa1e52d2ee350a2f62c5485d3fec", "tree": "67982a268cc4573aba1df10725019418b207d442", "parents": [ "6e139047e2eecd0ccf8bc2f1564e82747cb6e56c", "4f3c7a18d9e8a287d31f828a259d713fe4859471" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Sat Jul 02 09:26:53 2011 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Sat Jul 02 09:26:53 2011 -0700" }, "message": "Merge branch \u0027for-linus\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound-2.6\n\n* \u0027for-linus\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound-2.6:\n ALSA: sb16 - Fix build errors on MIPS and others with 13bit ioctl size\n ALSA: hdspm - Fix compile warnings with PPC\n ALSA: cs5535 - Fix invalid big-endian conversions\n ALSA: HDMI - fix ELD monitor name length\n ALSA: atmel - update author email for ABDAC, AC97C and AT73C213\n ALSA: HDA: Add model\u003dauto quirk for Acer Aspire 3830TG\n ALSA: HDA: Add a new Conexant codec ID (506c)\n" }, { "commit": "957c665f37007de93ccbe45902a23143724170d0", "tree": "d49f13d5b34ed1b1fc34828cbcd60afdbc9c4e5b", "parents": [ "11d53b4990226247a950e2b1ccfa4cf93bfbc822" ], "author": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Fri Jun 24 15:25:00 2011 -0700" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Fri Jul 01 17:30:43 2011 -0700" }, "message": "ipv6: Don\u0027t put artificial limit on routing table size.\n\nIPV6, unlike IPV4, doesn\u0027t have a routing cache.\n\nRouting table entries, as well as clones made in response\nto route lookup requests, all live in the same table. And\nall of these things are together collected in the destination\ncache table for ipv6.\n\nThis means that routing table entries count against the garbage\ncollection limits, even though such entries cannot ever be reclaimed\nand are added explicitly by the administrator (rather than being\ncreated in response to lookups).\n\nTherefore it makes no sense to count ipv6 routing table entries\nagainst the GC limits.\n\nAdd a DST_NOCOUNT destination cache entry flag, and skip the counting\nif it is set. Use this flag bit in ipv6 when adding routing table\nentries.\n\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "60c2ce2b4facf28f569115a55e1f479eb12bd0f1", "tree": "9771312021bbece80efea2fb0823563e4f68b611", "parents": [ "0e90ed0e8b9b1c25040442f1d20c799751b1e727", "690b0cacb6dbbbcb06b76139ab65e1bf3f63e7f1" ], "author": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Fri Jul 01 01:52:02 2011 -0700" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Fri Jul 01 01:52:02 2011 -0700" }, "message": "Merge branch \u0027for-davem\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless-2.6\n" }, { "commit": "690b0cacb6dbbbcb06b76139ab65e1bf3f63e7f1", "tree": "9199b20addcd9167a210957ac477a284c6f9a73d", "parents": [ "16adf5d07987d93675945f3cecf0e33706566005", "a0b8de350be458b33248e48b2174d9af8a4c4798" ], "author": { "name": "John W. Linville", "email": "linville@tuxdriver.com", "time": "Thu Jun 30 11:26:04 2011 -0400" }, "committer": { "name": "John W. Linville", "email": "linville@tuxdriver.com", "time": "Thu Jun 30 11:26:04 2011 -0400" }, "message": "Merge branch \u0027master\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless-2.6 into for-davem\n" }, { "commit": "4f3c7a18d9e8a287d31f828a259d713fe4859471", "tree": "eb587895c24cdf975caa9241443be4f1038d6d8a", "parents": [ "286bed0f0c447b6660e72093d7e778784fdd9ee6" ], "author": { "name": "Takashi Iwai", "email": "tiwai@suse.de", "time": "Thu Jun 30 15:08:04 2011 +0200" }, "committer": { "name": "Takashi Iwai", "email": "tiwai@suse.de", "time": "Thu Jun 30 15:33:57 2011 +0200" }, "message": "ALSA: sb16 - Fix build errors on MIPS and others with 13bit ioctl size\n\nOne of ioctl definition in sound/sb16_csp.h contains the data size\nover 8kB, and this causes build errors on architectures like MIPS,\nwhich define _IOC_SIZEBITS\u003d13.\n\nFor avoiding this build errors but keeping the compatibility, manually\nexpand with _IOC() instead of using _IOW() for the problematic ioctl.\n\nSigned-off-by: Takashi Iwai \u003ctiwai@suse.de\u003e\n" }, { "commit": "7b28afe01ab6ffb5f152f47831b44933facd2328", "tree": "a537d78f49fa1b959c9a453f459c1acd767a939f", "parents": [ "726e99ab88db059fe1422e15376ae404f8c66eb4", "86e1e98e5c6b4edab97e2b058466ef553cfd878e" ], "author": { "name": "Jens Axboe", "email": "jaxboe@fusionio.com", "time": "Thu Jun 30 10:10:50 2011 +0200" }, "committer": { "name": "Jens Axboe", "email": "jaxboe@fusionio.com", "time": "Thu Jun 30 10:10:50 2011 +0200" }, "message": "Merge branch \u0027for-3.0-important\u0027 of git://git.drbd.org/linux-2.6-drbd into for-linus\n" }, { "commit": "15b493d11fcce3c5547e3d7fb6d90e11ffe12777", "tree": "0638c261a1ca0ce54e1cbeb3ddaab10075717b27", "parents": [ "cb6518cbef5e3e36b7ae90fcab610a52ea7e9fc0" ], "author": { "name": "Lars Ellenberg", "email": "lars.ellenberg@linbit.com", "time": "Tue Jun 28 09:48:48 2011 +0200" }, "committer": { "name": "Philipp Reisner", "email": "philipp.reisner@linbit.com", "time": "Thu Jun 30 09:23:45 2011 +0200" }, "message": "drbd: fix limit define, we support 1 PiByte now\n\nSigned-off-by: Philipp Reisner \u003cphilipp.reisner@linbit.com\u003e\nSigned-off-by: Lars Ellenberg \u003clars.ellenberg@linbit.com\u003e\n" }, { "commit": "c89b857ce6d803905b2c9d71bc9effdd286c45ed", "tree": "6cf4a6e23f68f3b65906210dccb272ab2f9c5c74", "parents": [ "2e34b429a404675dc4fc4ad2ee339eea028da3ca", "663dd6dcaf7e95526e469e91f41972a9c0cca30c" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Tue Jun 28 11:15:36 2011 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Tue Jun 28 11:15:36 2011 -0700" }, "message": "Merge branch \u0027driver-core-linus\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/driver-core-2.6\n\n* \u0027driver-core-linus\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/driver-core-2.6:\n Connector: Correctly set the error code in case of success when dispatching receive callbacks\n Connector: Set the CN_NETLINK_USERS correctly\n pti: PTI semantics fix in pti_tty_cleanup.\n pti: ENXIO error case memory leak PTI fix.\n pti: double-free security PTI fix\n drivers:misc: ti-st: fix skipping of change remote baud\n drivers/base/platform.c: don\u0027t mark platform_device_register_resndata() as __init_or_module\n st_kim: Handle case of no device found for ID 0\n firmware: fix GOOGLE_SMI kconfig dependency warning\n" }, { "commit": "04b905942b482092a547798a2477f21e32a8f65d", "tree": "9ad2837587f5ce284f830432fec3569ecf44fbcb", "parents": [ "d90ce8711ceb516de823ae878270e5a21d11dede", "3bc46b312b1486b1fe2db4246a34a30160d26d8d" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Tue Jun 28 11:14:55 2011 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Tue Jun 28 11:14:55 2011 -0700" }, "message": "Merge branch \u0027tty-linus\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/tty-2.6\n\n* \u0027tty-linus\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/tty-2.6:\n serial: bcm63xx_uart: fix irq storm after rx fifo overrun.\n amba pl011: platform data for reg lockup and glitch v2\n amba pl011: workaround for uart registers lockup\n tty: n_gsm: improper skb_pull() use was leaking framed data\n tty: n_gsm: Fixed logic to decode break signal from modem status\n TTY: ntty, add one more sanity check\n TTY: ldisc, do not close until there are readers\n 8250: Fix capabilities when changing the port type\n 8250_pci: Fix missing const from merges\n ARM: SAMSUNG: serial: Fix on handling of one clock source for UART\n serial: ioremap warning fix for jsm driver.\n 8250_pci: add -ENODEV code for Intel EG20T PCH\n" }, { "commit": "08142579b6ca35883c1ed066a2681de6f6917062", "tree": "00735ed37753533f3b645714770b4fb036b5f7e0", "parents": [ "9b679320a5fbf46454011e5c62e0b8991b0956d1" ], "author": { "name": "Jan Kara", "email": "jack@suse.cz", "time": "Mon Jun 27 16:18:10 2011 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Mon Jun 27 18:00:13 2011 -0700" }, "message": "mm: fix assertion mapping-\u003enrpages \u003d\u003d 0 in end_writeback()\n\nUnder heavy memory and filesystem load, users observe the assertion\nmapping-\u003enrpages \u003d\u003d 0 in end_writeback() trigger. This can be caused by\npage reclaim reclaiming the last page from a mapping in the following\nrace:\n\n\tCPU0\t\t\t\tCPU1\n ...\n shrink_page_list()\n __remove_mapping()\n __delete_from_page_cache()\n radix_tree_delete()\n\t\t\t\t\tevict_inode()\n\t\t\t\t\t truncate_inode_pages()\n\t\t\t\t\t truncate_inode_pages_range()\n\t\t\t\t\t pagevec_lookup() - finds nothing\n\t\t\t\t\t end_writeback()\n\t\t\t\t\t mapping-\u003enrpages !\u003d 0 -\u003e BUG\n page-\u003emapping \u003d NULL\n mapping-\u003enrpages--\n\nFix the problem by doing a reliable check of mapping-\u003enrpages under\nmapping-\u003etree_lock in end_writeback().\n\nAnalyzed by Jay \u003cjinshan.xiong@whamcloud.com\u003e, lost in LKML, and dug out\nby Miklos Szeredi \u003cmszeredi@suse.de\u003e.\n\nCc: Jay \u003cjinshan.xiong@whamcloud.com\u003e\nCc: Miklos Szeredi \u003cmszeredi@suse.de\u003e\nSigned-off-by: Jan Kara \u003cjack@suse.cz\u003e\nCc: \u003cstable@kernel.org\u003e\nSigned-off-by: Andrew Morton \u003cakpm@linux-foundation.org\u003e\nSigned-off-by: Linus Torvalds \u003ctorvalds@linux-foundation.org\u003e\n" }, { "commit": "507c5f1224014f9956e604ee8703b3bbea7da4a4", "tree": "8af568077785c6159d5698741215b282788d661c", "parents": [ "2b4b2482e70eba10dd98653a3a5ac68126565e24" ], "author": { "name": "Chris Metcalf", "email": "cmetcalf@tilera.com", "time": "Mon Jun 27 16:18:07 2011 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Mon Jun 27 18:00:13 2011 -0700" }, "message": "include/linux/compat.h: declare compat_sys_sendmmsg()\n\nThis is required for tilegx to be able to use the compat unistd.h header\nwhere compat_sys_sendmmsg() is now mentioned.\n\nSigned-off-by: Chris Metcalf \u003ccmetcalf@tilera.com\u003e\nCc: Arnd Bergmann \u003carnd@arndb.de\u003e\nSigned-off-by: Andrew Morton \u003cakpm@linux-foundation.org\u003e\nSigned-off-by: Linus Torvalds \u003ctorvalds@linux-foundation.org\u003e\n" }, { "commit": "d9d90e5eb70e09903dadff42099b6c948f814050", "tree": "c3ab73df6dee61f9403bfd819a6b0cb9f3ca6085", "parents": [ "94c1e62df4494b79782cb9c7279f827212d1de70" ], "author": { "name": "Hugh Dickins", "email": "hughd@google.com", "time": "Mon Jun 27 16:18:04 2011 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Mon Jun 27 18:00:12 2011 -0700" }, "message": "tmpfs: add shmem_read_mapping_page_gfp\n\nAlthough it is used (by i915) on nothing but tmpfs, read_cache_page_gfp()\nis unsuited to tmpfs, because it inserts a page into pagecache before\ncalling the filesystem\u0027s -\u003ereadpage: tmpfs may have pages in swapcache\nwhich only it knows how to locate and switch to filecache.\n\nAt present tmpfs provides a -\u003ereadpage method, and copes with this by\ncopying pages; but soon we can simplify it by removing its -\u003ereadpage.\nProvide shmem_read_mapping_page_gfp() now, ready for that transition,\n\nExport shmem_read_mapping_page_gfp() and add it to list in shmem_fs.h,\nwith shmem_read_mapping_page() inline for the common mapping_gfp case.\n\n(shmem_read_mapping_page_gfp or shmem_read_cache_page_gfp? Generally the\nread_mapping_page functions use the mapping\u0027s -\u003ereadpage, and the\nread_cache_page functions use the supplied filler, so I think\nread_cache_page_gfp was slightly misnamed.)\n\nSigned-off-by: Hugh Dickins \u003chughd@google.com\u003e\nCc: Christoph Hellwig \u003chch@infradead.org\u003e\nSigned-off-by: Andrew Morton \u003cakpm@linux-foundation.org\u003e\nSigned-off-by: Linus Torvalds \u003ctorvalds@linux-foundation.org\u003e\n" }, { "commit": "94c1e62df4494b79782cb9c7279f827212d1de70", "tree": "43013fb403e592c535e6a7770be105b635ac9b63", "parents": [ "072441e21ddcd1140606b7d4ef6eab579a86b0b3" ], "author": { "name": "Hugh Dickins", "email": "hughd@google.com", "time": "Mon Jun 27 16:18:03 2011 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Mon Jun 27 18:00:12 2011 -0700" }, "message": "tmpfs: take control of its truncate_range\n\n2.6.35\u0027s new truncate convention gave tmpfs the opportunity to control\nits file truncation, no longer enforced from outside by vmtruncate().\nWe shall want to build upon that, to handle pagecache and swap together.\n\nSlightly redefine the -\u003etruncate_range interface: let it now be called\nbetween the unmap_mapping_range()s, with the filesystem responsible for\ndoing the truncate_inode_pages_range() from it - just as the filesystem\nis nowadays responsible for doing that from its -\u003esetattr.\n\nLet\u0027s rename shmem_notify_change() to shmem_setattr(). Instead of\ncalling the generic truncate_setsize(), bring that code in so we can\ncall shmem_truncate_range() - which will later be updated to perform its\nown variant of truncate_inode_pages_range().\n\nRemove the punch_hole unmap_mapping_range() from shmem_truncate_range():\nnow that the COW\u0027s unmap_mapping_range() comes after -\u003etruncate_range,\nthere is no need to call it a third time.\n\nExport shmem_truncate_range() and add it to the list in shmem_fs.h, so\nthat i915_gem_object_truncate() can call it explicitly in future; get\nthis patch in first, then update drm/i915 once this is available (until\nthen, i915 will just be doing the truncate_inode_pages() twice).\n\nThough introduced five years ago, no other filesystem is implementing\n-\u003etruncate_range, and its only other user is madvise(,,MADV_REMOVE): we\nexpect to convert it to fallocate(,FALLOC_FL_PUNCH_HOLE,,) shortly,\nwhereupon -\u003etruncate_range can be removed from inode_operations -\nshmem_truncate_range() will help i915 across that transition too.\n\nSigned-off-by: Hugh Dickins \u003chughd@google.com\u003e\nCc: Christoph Hellwig \u003chch@infradead.org\u003e\nSigned-off-by: Andrew Morton \u003cakpm@linux-foundation.org\u003e\nSigned-off-by: Linus Torvalds \u003ctorvalds@linux-foundation.org\u003e\n" }, { "commit": "072441e21ddcd1140606b7d4ef6eab579a86b0b3", "tree": "6f059ad83c09dfbeb1def29e805839db3e5bf85f", "parents": [ "5b8ba10198a109f8a02380648c5d29000caa9c55" ], "author": { "name": "Hugh Dickins", "email": "hughd@google.com", "time": "Mon Jun 27 16:18:02 2011 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Mon Jun 27 18:00:12 2011 -0700" }, "message": "mm: move shmem prototypes to shmem_fs.h\n\nBefore adding any more global entry points into shmem.c, gather such\nprototypes into shmem_fs.h. Remove mm\u0027s own declarations from swap.h,\nbut for now leave the ones in mm.h: because shmem_file_setup() and\nshmem_zero_setup() are called from various places, and we should not\nforce other subsystems to update immediately.\n\nSigned-off-by: Hugh Dickins \u003chughd@google.com\u003e\nCc: Christoph Hellwig \u003chch@infradead.org\u003e\nSigned-off-by: Andrew Morton \u003cakpm@linux-foundation.org\u003e\nSigned-off-by: Linus Torvalds \u003ctorvalds@linux-foundation.org\u003e\n" }, { "commit": "4d258b25d947521c8b913154db61ec55198243f8", "tree": "4f74f744797e92a0555705dc121ac8aaa041e750", "parents": [ "a64227b0855c42b5c037011afa80580ca3228527" ], "author": { "name": "Vitaliy Ivanov", "email": "vitalivanov@gmail.com", "time": "Mon Jun 27 19:07:08 2011 +0300" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Mon Jun 27 16:06:19 2011 -0700" }, "message": "Fix some kernel-doc warnings\n\nFix \u0027make htmldocs\u0027 warnings:\n\n Warning(/include/linux/hrtimer.h:153): No description found for parameter \u0027clockid\u0027\n Warning(/include/linux/device.h:604): Excess struct/union/enum/typedef member \u0027of_match\u0027 description in \u0027device\u0027\n Warning(/include/net/sock.h:349): Excess struct/union/enum/typedef member \u0027sk_rmem_alloc\u0027 description in \u0027sock\u0027\n\nSigned-off-by: Vitaliy Ivanov \u003cvitalivanov@gmail.com\u003e\nAcked-by: Grant Likely \u003cgrant.likely@secretlab.ca\u003e\nAcked-by: David S. Miller \u003cdavem@davemloft.net\u003e\nSigned-off-by: Linus Torvalds \u003ctorvalds@linux-foundation.org\u003e\n" }, { "commit": "a64227b0855c42b5c037011afa80580ca3228527", "tree": "8633fc0989fd6e53c9f3f0bb5774c1a54bd5f18e", "parents": [ "c6830c22603aaecf65405af23f6da2d55892f9cb", "c31b55cd4eaf050bb5a15bd8251da1b3c7edeb1c" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Mon Jun 27 14:55:43 2011 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Mon Jun 27 14:55:43 2011 -0700" }, "message": "Merge branch \u0027for-linus\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/cjb/mmc\n\n* \u0027for-linus\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/cjb/mmc:\n mmc: queue: bring discard_granularity/alignment into line with SCSI\n mmc: queue: append partition subname to queue thread name\n mmc: core: make erase timeout calculation allow for gated clock\n mmc: block: switch card to User Data Area when removing the block driver\n mmc: sdio: reset card during power_restore\n mmc: cb710: fix #ifdef HAVE_EFFICIENT_UNALIGNED_ACCESS\n mmc: sdhi: DMA slave ID 0 is invalid\n mmc: tmio: fix regression in TMIO_MMC_WRPROTECT_DISABLE handling\n mmc: omap_hsmmc: use original sg_len for dma_unmap_sg\n mmc: omap_hsmmc: fix ocr mask usage\n mmc: sdio: fix runtime PM path during driver removal\n mmc: Add PCI fixup quirks for Ricoh 1180:e823 reader\n mmc: sdhi: fix module unloading\n mmc: of_mmc_spi: add NO_IRQ define to of_mmc_spi.c\n mmc: vub300: fix null dereferences in error handling\n" }, { "commit": "c6830c22603aaecf65405af23f6da2d55892f9cb", "tree": "19458ebc7c32bef8a4ed59630cabb5785b1bdc11", "parents": [ "af4087e0e682df12bdffec5cfafc2fec9208716e" ], "author": { "name": "KAMEZAWA Hiroyuki", "email": "kamezawa.hiroyu@jp.fujitsu.com", "time": "Thu Jun 16 17:28:07 2011 +0900" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Mon Jun 27 14:13:09 2011 -0700" }, "message": "Fix node_start/end_pfn() definition for mm/page_cgroup.c\n\ncommit 21a3c96 uses node_start/end_pfn(nid) for detection start/end\nof nodes. But, it\u0027s not defined in linux/mmzone.h but defined in\n/arch/???/include/mmzone.h which is included only under\nCONFIG_NEED_MULTIPLE_NODES\u003dy.\n\nThen, we see\n mm/page_cgroup.c: In function \u0027page_cgroup_init\u0027:\n mm/page_cgroup.c:308: error: implicit declaration of function \u0027node_start_pfn\u0027\n mm/page_cgroup.c:309: error: implicit declaration of function \u0027node_end_pfn\u0027\n\nSo, fixiing page_cgroup.c is an idea...\n\nBut node_start_pfn()/node_end_pfn() is a very generic macro and\nshould be implemented in the same manner for all archs.\n(m32r has different implementation...)\n\nThis patch removes definitions of node_start/end_pfn() in each archs\nand defines a unified one in linux/mmzone.h. It\u0027s not under\nCONFIG_NEED_MULTIPLE_NODES, now.\n\nA result of macro expansion is here (mm/page_cgroup.c)\n\nfor !NUMA\n start_pfn \u003d ((\u0026contig_page_data)-\u003enode_start_pfn);\n end_pfn \u003d ({ pg_data_t *__pgdat \u003d (\u0026contig_page_data); __pgdat-\u003enode_start_pfn + __pgdat-\u003enode_spanned_pages;});\n\nfor NUMA (x86-64)\n start_pfn \u003d ((node_data[nid])-\u003enode_start_pfn);\n end_pfn \u003d ({ pg_data_t *__pgdat \u003d (node_data[nid]); __pgdat-\u003enode_start_pfn + __pgdat-\u003enode_spanned_pages;});\n\nChangelog:\n - fixed to avoid using \"nid\" twice in node_end_pfn() macro.\n\nReported-and-acked-by: Randy Dunlap \u003crandy.dunlap@oracle.com\u003e\nReported-and-tested-by: Ingo Molnar \u003cmingo@elte.hu\u003e\nAcked-by: Mel Gorman \u003cmgorman@suse.de\u003e\nSigned-off-by: KAMEZAWA Hiroyuki \u003ckamezawa.hiroyu@jp.fujitsu.com\u003e\nSigned-off-by: Linus Torvalds \u003ctorvalds@linux-foundation.org\u003e\n" }, { "commit": "a66b98db570a638afd909459e1e6bfa272344bd3", "tree": "e4e78a0602b46121548fad2e357f03d550d23c94", "parents": [ "8fcbd4dc7a1b338b393dcd6869deb1725cf1a9f3" ], "author": { "name": "Arik Nemtsov", "email": "arik@wizery.com", "time": "Thu Jun 23 00:00:24 2011 +0300" }, "committer": { "name": "John W. Linville", "email": "linville@tuxdriver.com", "time": "Mon Jun 27 14:45:25 2011 -0400" }, "message": "mac80211: fix rx-\u003ekey NULL dereference during mic failure\n\nSometimes when reporting a MIC failure rx-\u003ekey may be unset. This\ncode path is hit when receiving a packet meant for a multicast\naddress, and decryption is performed in HW.\n\nFortunately, the failing key_idx is not used for anything up to\n(and including) usermode, so we allow ourselves to drop it on the\nway up when a key cannot be retrieved.\n\nSigned-off-by: Arik Nemtsov \u003carik@wizery.com\u003e\nCc: stable@kernel.org\nSigned-off-by: John W. Linville \u003clinville@tuxdriver.com\u003e\n" }, { "commit": "4d362ad280fca0f2e098de607534f72f2c243e12", "tree": "25ff37b4c546f8a2cd58e7dc7111f8be53817e07", "parents": [ "536142f950f7ea4f3d146a138ad6938f28a34f33", "e0938118576954ac4deafbdb9950cebd34f726c6" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Sat Jun 25 07:23:27 2011 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Sat Jun 25 07:23:27 2011 -0700" }, "message": "Merge branch \u0027for-linus\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound-2.6\n\n* \u0027for-linus\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound-2.6:\n ALSA: Remove unneeded version.h includes from sound/\n ASoC: pxa-ssp: Correct check for stream presence\n ASoC: imx: add missing module informations\n ASoC: imx: Remove unused Kconfig SND_MXC_SOC_SSI entry\n ALSA: HDA: Pinfix quirk for HP Z200 Workstation\n ALSA: VIA HDA: Create a master amplifier control for VT1718S.\n ALSA: VIA HDA: Mute/unmute mixer conncted to Headphone for VT1718S.\n ALSA: VIA HDA: Modify initial verbs list for VT1718S.\n ALSA: hda - Remove ALC268 model override for CPR2000\n ALSA: HDA: Remove quirk for an HP device\n ASoC: Remove unused and about to be broken SND_SOC_CUSTOM I/O bus\n" }, { "commit": "5220cc9382e11ca955ce946ee6a5bac577bb14ff", "tree": "7949f52a5ca0c7fa74ec8e49ba89a00d0e4114a9", "parents": [ "726ce0656b99ac6436b590d83613fe8447b4769e", "155d109b5f52ffd749219b27702462dcd9cf4f8d" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Fri Jun 24 08:42:35 2011 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Fri Jun 24 08:42:35 2011 -0700" }, "message": "Merge branch \u0027for-linus\u0027 of git://git.kernel.dk/linux-block\n\n* \u0027for-linus\u0027 of git://git.kernel.dk/linux-block:\n block: add REQ_SECURE to REQ_COMMON_MASK\n block: use the passed in @bdev when claiming if partno is zero\n block: Add __attribute__((format(printf...) and fix fallout\n block: make disk_block_events() properly wait for work cancellation\n block: remove non-syncing __disk_block_events() and fold it into disk_block_events()\n block: don\u0027t use non-syncing event blocking in disk_check_events()\n cfq-iosched: fix locking around ioc-\u003eioc_data assignment\n" }, { "commit": "e0938118576954ac4deafbdb9950cebd34f726c6", "tree": "87000bd3ce37651b4b559489e7f1f6dbd4385e0c", "parents": [ "16866741bda5d16f3d30d1656ce941faf5dad34c", "53dea36c70c1857149a8c447224e3936eb8b5339" ], "author": { "name": "Takashi Iwai", "email": "tiwai@suse.de", "time": "Fri Jun 24 12:36:25 2011 +0200" }, "committer": { "name": "Takashi Iwai", "email": "tiwai@suse.de", "time": "Fri Jun 24 12:36:25 2011 +0200" }, "message": "Merge branch \u0027fix/asoc\u0027 into for-linus\n" }, { "commit": "39785eb1d3e6c58cc8bf8f6990956a58037ecc75", "tree": "b896a48b483803124c940ff99e7ffdfd4a4a171c", "parents": [ "9377c51752970c305fae29ac634501fde44378cb" ], "author": { "name": "Timur Tabi", "email": "timur@freescale.com", "time": "Thu Jun 23 20:20:26 2011 +0000" }, "committer": { "name": "Paul Mundt", "email": "lethal@linux-sh.org", "time": "Fri Jun 24 17:08:49 2011 +0900" }, "message": "fsl-diu-fb: remove check for pixel clock ranges\n\nThe Freescale DIU framebuffer driver defines two constants, MIN_PIX_CLK and\nMAX_PIX_CLK, that are supposed to represent the lower and upper limits of\nthe pixel clock. These values, however, are true only for one platform\nclock rate (533MHz) and only for the MPC8610. So the actual range for\nthe pixel clock is chip-specific, which means the current values are almost\nalways wrong. The chance of an out-of-range pixel clock being used are also\nremote.\n\nRather than try to detect an out-of-range clock in the DIU driver, we depend\non the board-specific pixel clock function (e.g. p1022ds_set_pixel_clock)\nto clamp the pixel clock to a supported value.\n\nSigned-off-by: Timur Tabi \u003ctimur@freescale.com\u003e\nSigned-off-by: Paul Mundt \u003clethal@linux-sh.org\u003e\n" }, { "commit": "68d0080f1e222757c85606d3eaf81b5c4aa7719f", "tree": "5f177f7571a56e7dfe3888f67fcc86532be8235c", "parents": [ "f957db4fcdd8f03e186aa8f041f4049e76ab741c", "a5f76d5eba157bf637beb2dd18026db2917c512e" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Wed Jun 22 21:08:52 2011 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Wed Jun 22 21:08:52 2011 -0700" }, "message": "Merge branch \u0027pm-fixes\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/rafael/suspend-2.6\n\n* \u0027pm-fixes\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/rafael/suspend-2.6:\n PCI / PM: Block races between runtime PM and system sleep\n PM / Domains: Update documentation\n PM / Runtime: Handle clocks correctly if CONFIG_PM_RUNTIME is unset\n PM: Fix async resume following suspend failure\n PM: Free memory bitmaps if opening /dev/snapshot fails\n PM: Rename dev_pm_info.in_suspend to is_prepared\n PM: Update documentation regarding sysdevs\n PM / Runtime: Update doc: usage count no longer incremented across system PM\n" }, { "commit": "2992c4bd5742b31a0ee00a76eee9c1c284507418", "tree": "b2af7d776ec6a4ae69b5f245ee0586359a99eabd", "parents": [ "e08f6d4131ab964420f0bcabecc68d75fb49df79", "1650add23578b5ca35c1f1e863987180a8c03779" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Tue Jun 21 18:20:55 2011 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Tue Jun 21 18:20:55 2011 -0700" }, "message": "Merge branch \u0027bugfixes\u0027 of git://git.linux-nfs.org/projects/trondmy/nfs-2.6\n\n* \u0027bugfixes\u0027 of git://git.linux-nfs.org/projects/trondmy/nfs-2.6:\n NFS: Fix decode_secinfo_maxsz\n NFSv4.1: Fix an off-by-one error in pnfs_generic_pg_test\n NFSv4.1: Fix some issues with pnfs_generic_pg_test\n NFSv4.1: file layout must consider pg_bsize for coalescing\n pnfs-obj: No longer needed to take an extra ref at add_device\n SUNRPC: Ensure the RPC client only quits on fatal signals\n NFSv4: Fix a readdir regression\n nfs4.1: mark layout as bad on error path in _pnfs_return_layout\n nfs4.1: prevent race that allowed use of freed layout in _pnfs_return_layout\n NFSv4.1: need to put_layout_hdr on _pnfs_return_layout error path\n NFS: (d)printks should use %zd for ssize_t arguments\n NFSv4.1: fix break condition in pnfs_find_lseg\n nfs4.1: fix several problems with _pnfs_return_layout\n NFSv4.1: allow zero fh array in filelayout decode layout\n NFSv4.1: allow nfs_fhget to succeed with mounted on fileid\n NFSv4.1: Fix a refcounting issue in the pNFS device id cache\n NFSv4.1: deprecate headerpadsz in CREATE_SESSION\n NFS41: do not update isize if inode needs layoutcommit\n NLM: Don\u0027t hang forever on NLM unlock requests\n NFS: fix umount of pnfs filesystems\n" }, { "commit": "6d0e0e84f66d32c33511984dd3badd32364b863c", "tree": "215916af1632fbaff9d46676d14dafd52143d578", "parents": [ "8440f4b19494467883f8541b7aa28c7bbf6ac92b" ], "author": { "name": "Alan Stern", "email": "stern@rowland.harvard.edu", "time": "Sat Jun 18 22:42:09 2011 +0200" }, "committer": { "name": "Rafael J. Wysocki", "email": "rjw@sisk.pl", "time": "Tue Jun 21 23:20:20 2011 +0200" }, "message": "PM: Fix async resume following suspend failure\n\nThe PM core doesn\u0027t handle suspend failures correctly when it comes to\nasynchronously suspended devices. These devices are moved onto the\ndpm_suspended_list as soon as the corresponding async thread is\nstarted up, and they remain on the list even if they fail to suspend\nor the sleep transition is cancelled before they get suspended. As a\nresult, when the PM core unwinds the transition, it tries to resume\nthe devices even though they were never suspended.\n\nThis patch (as1474) fixes the problem by adding a new \"is_suspended\"\nflag to dev_pm_info. Devices are resumed only if the flag is set.\n\n[rjw:\n * Moved the dev-\u003epower.is_suspended check into device_resume(),\n because we need to complete dev-\u003epower.completion and clear\n dev-\u003epower.is_prepared too for devices whose\n dev-\u003epower.is_suspended flags are unset.\n * Fixed __device_suspend() to avoid setting dev-\u003epower.is_suspended\n if async_error is different from zero.]\n\nSigned-off-by: Alan Stern \u003cstern@rowland.harvard.edu\u003e\nSigned-off-by: Rafael J. Wysocki \u003crjw@sisk.pl\u003e\nCc: stable@kernel.org\n" }, { "commit": "f76b168b6f117a49d36307053e1acbe30580ea5b", "tree": "2aa0cc19b27764d8eb55ce85eaf226a60ce27756", "parents": [ "78420884e680da8fbc3240de2d3106437042381e" ], "author": { "name": "Alan Stern", "email": "stern@rowland.harvard.edu", "time": "Sat Jun 18 20:22:23 2011 +0200" }, "committer": { "name": "Rafael J. Wysocki", "email": "rjw@sisk.pl", "time": "Tue Jun 21 23:19:50 2011 +0200" }, "message": "PM: Rename dev_pm_info.in_suspend to is_prepared\n\nThis patch (as1473) renames the \"in_suspend\" field in struct\ndev_pm_info to \"is_prepared\", in preparation for an upcoming change.\nThe new name is more descriptive of what the field really means.\n\nSigned-off-by: Alan Stern \u003cstern@rowland.harvard.edu\u003e\nSigned-off-by: Rafael J. Wysocki \u003crjw@sisk.pl\u003e\nCc: stable@kernel.org\n" }, { "commit": "890879cfa08f5ceaa09810611f46e890f7d57ff6", "tree": "c8898ae7a5bf00f315cfaa13d58a08aafa5002f9", "parents": [ "56299378726d5f2ba8d3c8cbbd13cb280ba45e4f", "de1b794130b130e77ffa975bb58cb843744f9ae5" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Tue Jun 21 10:22:35 2011 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Tue Jun 21 10:22:35 2011 -0700" }, "message": "Merge branch \u0027for_linus\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/tytso/ext4\n\n* \u0027for_linus\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/tytso/ext4:\n jbd2: Fix oops in jbd2_journal_remove_journal_head()\n jbd2: Remove obsolete parameters in the comments for some jbd2 functions\n ext4: fixed tracepoints cleanup\n ext4: use FIEMAP_EXTENT_LAST flag for last extent in fiemap\n ext4: Fix max file size and logical block counting of extent format file\n ext4: correct comments for ext4_free_blocks()\n" }, { "commit": "79568f5be06c91071697c065f01f3ebfbeb25a61", "tree": "81fc2bb54bebffc7ef22390bfc37c7ba818a30df", "parents": [ "f5fc5567dd24c15b1d95aa9ee2aaada04d835a0c" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Mon Jun 20 20:13:49 2011 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Mon Jun 20 20:13:49 2011 -0700" }, "message": "vfs: i_state needs to be \u0027unsigned long\u0027 for now\n\nCommit 13e12d14e2dc (\"vfs: reorganize \u0027struct inode\u0027 layout a bit\")\nmoved things around a bit changed i_state to be unsigned int instead of\nunsigned long. That was to help structure layout for the 64-bit case,\nand shrink \u0027struct inode\u0027 a bit (admittedly that only happened when\nspinlock debugging was on and i_flags didn\u0027t pack with i_lock).\n\nHowever, Meelis Roos reports that this results in unaligned exceptions\non sprc, and it turns out that the bit-locking primitives that we use\nfor the I_NEW bit want to use the bitops. Which want \u0027unsigned long\u0027,\nnot \u0027unsigned int\u0027.\n\nWe really should fix the bit locking code to not have that kind of\nrequirement, but that\u0027s a much bigger change. So for now, revert that\nfield back to \u0027unsigned long\u0027 (but keep the other re-ordering changes\nfrom the commit that caused this).\n\nAndi points out that we have played games with this in \u0027struct page\u0027, so\nit\u0027s solvable with other hacks too, but since right now the struct inode\nsize advantage only happens with some rare config options, it\u0027s not\nworth fighting.\n\nIt _would_ be worth fixing the bitlocking code, though. Especially\nsince there is no type safety in the bitlocking code (this never caused\nany warnings, and worked fine on x86-64, because the bitlocks take a\n\u0027void *\u0027 and x86-64 doesn\u0027t care that deeply about alignment). So it\u0027s\ncurrently a very easy problem to trigger by mistake and never notice.\n\nReported-by: Meelis Roos \u003cmroos@linux.ee\u003e\nCc: Andi Kleen \u003candi@firstfloor.org\u003e\nCc: David Miller \u003cdavem@davemloft.net\u003e\nSigned-off-by: Linus Torvalds \u003ctorvalds@linux-foundation.org\u003e\n" }, { "commit": "eda0841094a3a232357ca10a24b40da461db3fcf", "tree": "08f6ffd17275e6fab7bd8014d849d2fce46632d9", "parents": [ "6e158d21986fa15d21fd32cf241d167d4d741ae3", "105f4622104848ff1ee1f644d661bef9dec3eb27" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Mon Jun 20 20:10:52 2011 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Mon Jun 20 20:10:52 2011 -0700" }, "message": "Merge branch \u0027for-2.6.40\u0027 of git://linux-nfs.org/~bfields/linux\n\n* \u0027for-2.6.40\u0027 of git://linux-nfs.org/~bfields/linux:\n nfsd4: fix break_lease flags on nfsd open\n nfsd: link returns nfserr_delay when breaking lease\n nfsd: v4 support requires CRYPTO\n nfsd: fix dependency of nfsd on auth_rpcgss\n" }, { "commit": "6e158d21986fa15d21fd32cf241d167d4d741ae3", "tree": "b2377e488386e613028e1d02ac7f788d5ecf165b", "parents": [ "36698206504fca9198b8563f1fc2c9e38e063e11", "384420409d9b5d4443940abace49363d26135412" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Mon Jun 20 20:10:18 2011 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Mon Jun 20 20:10:18 2011 -0700" }, "message": "Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-2.6\n\n* git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-2.6: (40 commits)\n pxa168_eth: fix race in transmit path.\n ipv4, ping: Remove duplicate icmp.h include\n netxen: fix race in skb-\u003elen access\n sgi-xp: fix a use after free\n hp100: fix an skb-\u003elen race\n netpoll: copy dev name of slaves to struct netpoll\n ipv4: fix multicast losses\n r8169: fix static initializers.\n inet_diag: fix inet_diag_bc_audit()\n gigaset: call module_put before restart of if_open()\n farsync: add module_put to error path in fst_open()\n net: rfs: enable RFS before first data packet is received\n fs_enet: fix freescale FCC ethernet dp buffer alignment\n netdev: bfin_mac: fix memory leak when freeing dma descriptors\n vlan: don\u0027t call ndo_vlan_rx_register on hardware that doesn\u0027t have vlan support\n caif: Bugfix - XOFF removed channel from caif-mux\n tun: teach the tun/tap driver to support netpoll\n dp83640: drop PHY status frames in the driver.\n dp83640: fix phy status frame event parsing\n phylib: Allow BCM63XX PHY to be selected only on BCM63XX.\n ...\n" }, { "commit": "36698206504fca9198b8563f1fc2c9e38e063e11", "tree": "f02b63c9b35a7962786b5dcdb1af15a63f5de1cf", "parents": [ "ef46222e7b56e728e423527d430cb2013c595491", "482e0cd3dbaa70f2a2bead4b5f2c0d203ef654ba" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Mon Jun 20 20:09:15 2011 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Mon Jun 20 20:09:15 2011 -0700" }, "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 devcgroup_inode_permission: take \"is it a device node\" checks to inlined wrapper\n fix comment in generic_permission()\n kill obsolete comment for follow_down()\n proc_sys_permission() is OK in RCU mode\n reiserfs_permission() doesn\u0027t need to bail out in RCU mode\n proc_fd_permission() is doesn\u0027t need to bail out in RCU mode\n nilfs2_permission() doesn\u0027t need to bail out in RCU mode\n logfs doesn\u0027t need -\u003epermission() at all\n coda_ioctl_permission() is safe in RCU mode\n cifs_permission() doesn\u0027t need to bail out in RCU mode\n bad_inode_permission() is safe from RCU mode\n ubifs: dereferencing an ERR_PTR in ubifs_mount()\n" } ], "next": "19345cb299e8234006c5125151ab723e851a1d24" }