)]}' { "log": [ { "commit": "a8d99da4ad3ef494568803f12f3c90092997843e", "tree": "ef1b9f31f56d2f6e7fa59f2d4b3d185e27c55563", "parents": [ "e708bea09791e8b8d1eb1624de8ddb6608a739a0" ], "author": { "name": "Liam Girdwood", "email": "lrg@ti.com", "time": "Thu Feb 03 15:28:19 2011 +0000" }, "committer": { "name": "Sebastien Guiriec", "email": "s-guiriec@ti.com", "time": "Sun Jul 24 21:32:02 2011 +0200" }, "message": "ASoC: OMAP4 ABE DSP - Add support for the OMAP4 ABE DSP\n\nThis patch adds the OMAP4 ABE platform driver. This driver defines and\nexports control for the DSP Frontend and Backend routing.\n\nTODO: cleanup\n\nSigned-off-by: Liam Girdwood \u003clrg@ti.com\u003e\n" }, { "commit": "59c96f127c352a648bfd185b2c8069bcbc842eff", "tree": "3b2f1d211f1d2b0cb5fb707b0fd45c709a66ff6a", "parents": [ "f320fddc262430b65a9cdd2decc3d1a24ce1797e" ], "author": { "name": "Liam Girdwood", "email": "lrg@ti.com", "time": "Tue Mar 08 15:11:02 2011 +0000" }, "committer": { "name": "Sebastien Guiriec", "email": "s-guiriec@ti.com", "time": "Sun Jul 24 21:32:01 2011 +0200" }, "message": "ASoC: dsp - add core support for bespoke trigger()\n\nThis allows the DSP core to call a beskope trigger() call\non DAIs and platforms that require it.\n\nTODO: move into DSP patch series.\n\nSigned-off-by: Liam Girdwood \u003clrg@ti.com\u003e\n" }, { "commit": "f320fddc262430b65a9cdd2decc3d1a24ce1797e", "tree": "06d2fbfd3b03074d0aacc9fee471c1b5b27adfbd", "parents": [ "8ccfb4a31fbc16e01e93d7989019e04c69a6284d" ], "author": { "name": "Liam Girdwood", "email": "lrg@ti.com", "time": "Tue Feb 01 21:31:50 2011 +0000" }, "committer": { "name": "Sebastien Guiriec", "email": "s-guiriec@ti.com", "time": "Sun Jul 24 21:32:01 2011 +0200" }, "message": "ASoC: core - add hostless DAI support\n\nAllow DAI\u0027s to be hostless so that no PCM data is sent between DAI\nand CPU. This allows for power savings as there is no DMA or CPU\ninteraction required.\n\nTODO: we shouldn\u0027t need to allocate a PAGE for a dummy DMA buffer.\n\nSigned-off-by: Liam Girdwood \u003clrg@ti.com\u003e\n" }, { "commit": "ad2581ef84f04f5502f948ded8af14e640a24a5a", "tree": "70b5a12229fa138ab1973d5f3f402ae13b83a810", "parents": [ "a8f13d8879f3a989d21cd3e0afc56c5de47cf1d7" ], "author": { "name": "Liam Girdwood", "email": "lrg@ti.com", "time": "Tue Feb 01 21:31:31 2011 +0000" }, "committer": { "name": "Sebastien Guiriec", "email": "s-guiriec@ti.com", "time": "Sun Jul 24 21:32:01 2011 +0200" }, "message": "ALSA: pcm - add support for hostless audio\n\nAllow some PCM devices to be hostless, i.e. there is no PCM data transferred\nto or from the host CPU. This can be used to minimise power on systems since\nthe CPU can idle/sleep during the PCM device operation (e.g. a phone call\nwhere the DAI is between a MODEM and DSP)\n\nTODO: cleanup, look at adding a read/write blocker.\n\nSinged-off-by: Liam Girdwood \u003clrg@slimlogic.co.uk\u003e\n" }, { "commit": "a8f13d8879f3a989d21cd3e0afc56c5de47cf1d7", "tree": "d7b4e5dcc79e94e0769983e5699f8cc8119f00d4", "parents": [ "e58384e5bdaf8378b9061a96d4e85d2b9585baac" ], "author": { "name": "Liam Girdwood", "email": "lrg@ti.com", "time": "Wed May 18 18:39:21 2011 +0100" }, "committer": { "name": "Sebastien Guiriec", "email": "s-guiriec@ti.com", "time": "Sun Jul 24 21:32:00 2011 +0200" }, "message": "ASoC: core - add dynamic kcontrols\n\nTODO: First phase of dynamic kcontrols. More todo.\n\nSigned-off-by: Liam Girdwood \u003clrg@ti.com\u003e\n" }, { "commit": "bfe7dc4032fd7d82641025dcb52a3ef919540a3a", "tree": "d05709a5c64791f6119cde7ab5c85667ea3fafa4", "parents": [ "a00663bf80d18583e161fcdb7250db49197b8b43" ], "author": { "name": "Liam Girdwood", "email": "lrg@ti.com", "time": "Mon Jan 31 21:26:35 2011 +0000" }, "committer": { "name": "Sebastien Guiriec", "email": "s-guiriec@ti.com", "time": "Sun Jul 24 21:32:00 2011 +0200" }, "message": "ASoC: dsp - Add DSP support to core ASoC API/structures\n\nExport inline DAI PCM operations to allow DSP core to individually call BE PCM\noperations and ....\n\nAllow machine drivers to specifify DSP FE and BE DAI links.\nAdd FE and BE state information to PCM rtd.\n\nTODO: split out this into smaller patches.\n\nSigned-off-by: Liam Girdwood \u003clrg@ti.com\u003e\n" }, { "commit": "a00663bf80d18583e161fcdb7250db49197b8b43", "tree": "bb0c0ed1f9caf24d3ba3cd2c8cc8f2f8f824685a", "parents": [ "e002c98e5cc01d60ce912f7259622a1fdf47d408" ], "author": { "name": "Liam Girdwood", "email": "lrg@ti.com", "time": "Mon Jan 31 21:23:17 2011 +0000" }, "committer": { "name": "Sebastien Guiriec", "email": "s-guiriec@ti.com", "time": "Sun Jul 24 21:32:00 2011 +0200" }, "message": "ASoC: dsp - Add ASoC DSP core\n\nThis adds ASoC core support for internal and external DSPs and represents them\nto the audio user as a CODEC like device with mixers, muxes and runtime audio\nroute changing.\n\nThe DSP core allows DSP DAIs to be dynamically re-routed at runtime between the\nPCM device end (or Frontend - FE) and the physical DAI (Backend - BE) using\nregular kcontrols (just like a hardware CODEC).\n\nThe DSP core also deal with DSP FE+BE suspend and resume PM ops.\n\nSigned-off-by: Liam Girdwood \u003clrg@ti.com\u003e\n" }, { "commit": "e002c98e5cc01d60ce912f7259622a1fdf47d408", "tree": "b87053ea3c3c6f09ff3fbfe97f430e1c7785a9ed", "parents": [ "ecc1a0d5f5389bb23f68b9af83328e7679609bc1" ], "author": { "name": "Liam Girdwood", "email": "lrg@ti.com", "time": "Tue Feb 08 11:45:20 2011 +0000" }, "committer": { "name": "Sebastien Guiriec", "email": "s-guiriec@ti.com", "time": "Sun Jul 24 21:31:59 2011 +0200" }, "message": "ASoC: dapm - allow custom widgets to update power events.\n\nIn preparation for ASoC DSP support.\n\nAllow for the operation of custom mixer and mux DAPM widgets that can call\nsnd_soc_dapm_mixer_update_power() and snd_soc_dapm_mux_update_power() directly\nafter updating their status.\n\nThis adds two previously static calls to the public DAPM API.\n\nSigned-off-by: Liam Girdwood \u003clrg@ti.com\u003e\n" }, { "commit": "ecc1a0d5f5389bb23f68b9af83328e7679609bc1", "tree": "f281a29994c6146cdb87ce87a324980189bd4bc5", "parents": [ "ab1058a9b9a0096f1eea3cd22799e45679f3dbe7" ], "author": { "name": "Liam Girdwood", "email": "lrg@ti.com", "time": "Wed Feb 16 16:24:17 2011 +0000" }, "committer": { "name": "Sebastien Guiriec", "email": "s-guiriec@ti.com", "time": "Sun Jul 24 21:31:59 2011 +0200" }, "message": "ASoC: dapm - FIXME -add locking to the DAPM power_widgets()\n\nTODO: look into why _w is required.\nFIXME: did oops in the past.\n\nSigned-off-by: Liam Girdwood \u003clrg@ti.com\u003e\n" }, { "commit": "ab1058a9b9a0096f1eea3cd22799e45679f3dbe7", "tree": "95b7013e4b8474c79d098c1159d995ee9bce7393", "parents": [ "7987a11891fb3c740bef6c5a3d0b388397601c8e" ], "author": { "name": "Liam Girdwood", "email": "lrg@ti.com", "time": "Mon Jan 31 20:33:07 2011 +0000" }, "committer": { "name": "Sebastien Guiriec", "email": "s-guiriec@ti.com", "time": "Sun Jul 24 21:31:59 2011 +0200" }, "message": "ASoC: dapm - Add API call to query valid DAPM paths.\n\nIn preparation for ASoC DSP support.\n\nAdd a DAPM API call to determine whether a DAPM audio path is valid between\nsource and sink widgets. This also takes into account all kcontrol mux and mixer\nsettings in between the source and sink widgets to validate the audio path.\n\nThis will be used by the DSP core to determine the runtime DAI mappings\nbetween FE and BE DAIs in order to run PCM operations.\n\nSigned-off-by: Liam Girdwood \u003clrg@ti.com\u003e\n" }, { "commit": "7987a11891fb3c740bef6c5a3d0b388397601c8e", "tree": "484ea7d4b22bf937d5071e357af2cb183249b0cf", "parents": [ "35ca660cc07c04c0933395edb9a4739d849d9017" ], "author": { "name": "Liam Girdwood", "email": "lrg@ti.com", "time": "Mon Jan 31 19:52:42 2011 +0000" }, "committer": { "name": "Sebastien Guiriec", "email": "s-guiriec@ti.com", "time": "Sun Jul 24 21:31:59 2011 +0200" }, "message": "ASoC: core - Add Platform driver DAPM widgets/kcontrols.\n\nIn preparation for ASoC DSP support.\n\nAllow platform drivers to export widgets and kcontrols.\n\nThis is required to support DSP dynamic DAI routing and power management where\nplatform DSP drivers have kcontrols, DAPM widgets etc.\n\nSigned-off-by: Liam Girdwood \u003clrg@ti.com\u003e\n" }, { "commit": "0f8bae9b9cbccb46f53a4c4e90cf8275a1e249e2", "tree": "df09da033cda7682150908f0811e69afc062adc1", "parents": [ "670ff44b4a223f9dc2bf8cdd3c745ef5a92db2a6" ], "author": { "name": "Liam Girdwood", "email": "lrg@ti.com", "time": "Thu Jan 27 19:35:01 2011 +0000" }, "committer": { "name": "Sebastien Guiriec", "email": "s-guiriec@ti.com", "time": "Sun Jul 24 21:31:59 2011 +0200" }, "message": "ASoC: core - pcm mutex per rtd\n\nIn preparation for ASoC DSP support.\n\nThe new DSP core allows DSP DAIs to be dynamically re-routed at runtime\nbetween the PCM device end (or Frontend - FE) and the physical DAI\n(Backend - BE) using regular kcontrols (just like a hardware CODEC).\nThe DSP core therefore must be able to call PCM operations for both the\nFrontend and Backend(s) DAIs at the same time.\n\nCurrently we have a global pcm_mutex that is used to serialise\nthe ASoC PCM operations. This patch removes the global mutex\nand adds a mutex per RTD allowing the PCM operations to be reentrant and\nallow control of more than one DAI at at time. e.g. a frontend DSP hw_params()\ncould configure multiple backend hw_params() with similar or different\nhw parameters at the same time.\n\nAlso fix the naming of soc_pcm_close.\n\nSigned-off-by: Liam Girdwood \u003clrg@ti.com\u003e\n" }, { "commit": "670ff44b4a223f9dc2bf8cdd3c745ef5a92db2a6", "tree": "f62f57766e1524facd3bd4b108669d9c8cf975db", "parents": [ "c6ac984059f9c7ccf613fbed812fb0dd3c9565a9" ], "author": { "name": "Liam Girdwood", "email": "lrg@ti.com", "time": "Wed Mar 30 23:27:27 2011 +0100" }, "committer": { "name": "Sebastien Guiriec", "email": "s-guiriec@ti.com", "time": "Sun Jul 24 21:31:58 2011 +0200" }, "message": "ASoC: dapm - Add DAPM stream completion event.\n\nIn preparation for ASoC DSP support.\n\nThis adds a callback function to be called at the completion of a DAPM stream\nevent.\n\nThis can be used by DSP components to perform calculations based on DAPM graphs.\n\nSigned-off-by: Liam Girdwood \u003clrg@ti.com\u003e\n" }, { "commit": "c6ac984059f9c7ccf613fbed812fb0dd3c9565a9", "tree": "e4008e319c6380dc30f29ea37ba7fd8b2aae897f", "parents": [ "02184085926c7ea54a499347fb3c9c72089aa2d5" ], "author": { "name": "Liam Girdwood", "email": "lrg@ti.com", "time": "Fri Feb 04 22:12:30 2011 +0000" }, "committer": { "name": "Sebastien Guiriec", "email": "s-guiriec@ti.com", "time": "Sun Jul 24 21:31:58 2011 +0200" }, "message": "ASoC: core - refactor pcm_new() to pass only rtd\n\nIn preparation for ASoC DSP support.\n\nCurrently pcm_new() passes in card, pcm and DAI. Refactor this to only pass\nin rtd since rtd contains card, pcm and DAI. Struct rtd also contain other\nmembers too that are useful to DSPs.\n\nSigned-off-by: Liam Girdwood \u003clrg@ti.com\u003e\n" }, { "commit": "02184085926c7ea54a499347fb3c9c72089aa2d5", "tree": "909d417dc1f89e55c208a72e0da6be037b348997", "parents": [ "aff46a0cfb51b2a3d02c7dbce85d26fdcf585170" ], "author": { "name": "Liam Girdwood", "email": "lrg@ti.com", "time": "Wed Mar 30 23:26:53 2011 +0100" }, "committer": { "name": "Sebastien Guiriec", "email": "s-guiriec@ti.com", "time": "Sun Jul 24 21:31:58 2011 +0200" }, "message": "ASoC: core - Allow some components to probe/remove later or earlier.\n\nSome ASoC components depend on other ASoC components to provide clocks and\npower resources in order to probe().\n\nProvide a method to allow some components to be probed() later and be also\nremoved() earlier.\n\nSigned-off-by: Liam Girdwood \u003clrg@ti.com\u003e\n" }, { "commit": "7038dfd975cff9fb64f8456f78d399e7fdba944f", "tree": "02c6976c5b1064ece3a510fc10b8fb81ad7de9e6", "parents": [ "4d74b36431f9b453bbe9d2af7c37875fc5cc442e" ], "author": { "name": "Liam Girdwood", "email": "lrg@ti.com", "time": "Tue Feb 01 20:58:15 2011 +0000" }, "committer": { "name": "Sebastien Guiriec", "email": "s-guiriec@ti.com", "time": "Sun Jul 24 21:31:58 2011 +0200" }, "message": "ASoC: dapm - add method to get AIF widget from stream\n\nIn preparation for ASoC DSP support.\n\nProvide a method to get the AIF widget name from the stream name.\n\nSigned-off-by: Liam Girdwood \u003clrg@ti.com\u003e\n" }, { "commit": "a956f9e3987c7f4ebe47049fcf713e5a7f8a5a0d", "tree": "44521c69833b0085a12005f62e0ce423f1097965", "parents": [ "87ce3c5305eac29aee5090a3b57bbe1649fae180" ], "author": { "name": "Axel Castaneda Gonzalez", "email": "x0055901@ti.com", "time": "Wed Feb 23 20:08:28 2011 -0600" }, "committer": { "name": "Sebastien Guiriec", "email": "s-guiriec@ti.com", "time": "Sun Jul 24 21:31:55 2011 +0200" }, "message": "ASoC: twl6040: Configure ramp step based on platform\n\nEnable ramp down/up step to be configured based on\nplatform.\n\nSigned-off-by: Axel Castaneda Gonzalez \u003cx0055901@ti.com\u003e\nSigned-off-by: Misael Lopez Cruz \u003cmisael.lopez@ti.com\u003e\nSigned-off-by: Peter Ujfalusi \u003cpeter.ujfalusi@ti.com\u003e\nAcked-by: Mark Brown \u003cbroonie@opensource.wolfsonmicro.com\u003e\n" }, { "commit": "95ed04e15e254297044cf92ae495e8f95e3d0d7b", "tree": "de1733d6892b3575a801768841978770ee0df3cb", "parents": [ "b62eea9d69b7bd35d83dc81f6c7da00136010ae9" ], "author": { "name": "Misael Lopez Cruz", "email": "misael.lopez@ti.com", "time": "Sun May 01 03:51:24 2011 -0500" }, "committer": { "name": "Sebastien Guiriec", "email": "s-guiriec@ti.com", "time": "Sun Jul 24 21:31:54 2011 +0200" }, "message": "input: Add initial support for TWL6040 vibrator\n\nAdd twl6040_vibra as a child of MFD device twl6040_codec. This\nimplementation covers the PCM-to-PWM mode of TWL6040 vibrator\nmodule.\n\nSigned-off-by: Misael Lopez Cruz \u003cmisael.lopez@ti.com\u003e\nSigned-off-by: Peter Ujfalusi \u003cpeter.ujfalusi@ti.com\u003e\nCC: Tejun Heo \u003ctj@kernel.org\u003e\n" }, { "commit": "3c9d7a18427b28721741df2f84e9f4f167e5a523", "tree": "fc839c8bd61372827ee9afa61ae1a65d6ac0e2e2", "parents": [ "be206b3963a5904fc362827bf96b98db6fac31ac" ], "author": { "name": "Misael Lopez Cruz", "email": "misael.lopez@ti.com", "time": "Wed Apr 27 02:14:07 2011 -0500" }, "committer": { "name": "Sebastien Guiriec", "email": "s-guiriec@ti.com", "time": "Sun Jul 24 21:31:53 2011 +0200" }, "message": "mfd: twl6040: Add initial support\n\nTWL6040 IC provides analog high-end audio codec functions for\nhandset applications. It contains several audio analog inputs\nand outputs as well as vibrator support. It\u0027s connected to the\nhost processor via PDM interface for audio data communication.\nThe audio modules are controlled by internal registers that\ncan be accessed by I2C and PDM interface.\n\nTWL6040 MFD will be registered as a child of TWL-CORE, and will\nhave two children of its own: twl6040-codec and twl6040-vibra.\n\nThis driver is based on TWL4030 and WM8350 MFD drivers.\n\nSigned-off-by: Misael Lopez Cruz \u003cmisael.lopez@ti.com\u003e\nSigned-off-by: Peter Ujfalusi \u003cpeter.ujfalusi@ti.com\u003e\n" }, { "commit": "be206b3963a5904fc362827bf96b98db6fac31ac", "tree": "9c9e1bcde76e1dab1b66c38f2f165f1a304a2f93", "parents": [ "d189dd57aa925949a458313e8be10420caa4823a" ], "author": { "name": "Peter Ujfalusi", "email": "peter.ujfalusi@ti.com", "time": "Tue May 31 15:21:13 2011 +0300" }, "committer": { "name": "Sebastien Guiriec", "email": "s-guiriec@ti.com", "time": "Sun Jul 24 21:31:53 2011 +0200" }, "message": "MFD: twl4030-audio: Rename platform data\n\nAllign the platform data names for twl4030 audio submodule:\ntwl4030_audio_data: for the core MFD driver\ntwl4030_codec_data: for ASoC codec driver\ntwl4030_vibra_data: for the input/ForceFeedback driver\n\nTo avoid breakage, change all depending drivers, files\nto use the new types.\n\nSigned-off-by: Peter Ujfalusi \u003cpeter.ujfalusi@ti.com\u003e\n" }, { "commit": "d189dd57aa925949a458313e8be10420caa4823a", "tree": "4b7d61057d209e67a8e5c8caa214ff8dd051d5f2", "parents": [ "918360729203d9c148adbfbe2cfbd186b80e096f" ], "author": { "name": "Peter Ujfalusi", "email": "peter.ujfalusi@ti.com", "time": "Tue May 31 12:02:49 2011 +0300" }, "committer": { "name": "Sebastien Guiriec", "email": "s-guiriec@ti.com", "time": "Sun Jul 24 21:31:53 2011 +0200" }, "message": "MFD: twl4030-codec -\u003e twl4030-audio: Rename the driver\n\nRename the driver, and header file from twl4030-codec to\ntwl4030-audio.\nTo avoid breakage change depending drivers at the same time.\n\nSigned-off-by: Peter Ujfalusi \u003cpeter.ujfalusi@ti.com\u003e\nCC: Misael Lopez Cruz \u003cmisael.lopez@ti.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" }, { "commit": "19345cb299e8234006c5125151ab723e851a1d24", "tree": "43bde1db751eb50afbdabfbd26814431c8be573c", "parents": [ "df18d127f4fed7a0284bcfa8d2843800cdb63b72" ], "author": { "name": "Benny Halevy", "email": "benny@tonian.com", "time": "Sun Jun 19 18:33:46 2011 -0400" }, "committer": { "name": "Trond Myklebust", "email": "Trond.Myklebust@netapp.com", "time": "Mon Jun 20 16:12:26 2011 -0400" }, "message": "NFSv4.1: file layout must consider pg_bsize for coalescing\n\nOtherwise we end up overflowing the rpc buffer size on the receive end.\n\nSigned-off-by: Benny Halevy \u003cbenny@tonian.com\u003e\nSigned-off-by: Trond Myklebust \u003cTrond.Myklebust@netapp.com\u003e\n" }, { "commit": "c01ad4081939f91ebd7277e8e731fd90ceb3e632", "tree": "8eb0eccce6e0681400ddb5e33a9f13bfeb8a1fde", "parents": [ "90a800de0a29426ea900ecd53f2929d5f4bc4578", "cca23d0b5350c9ca0473625c3f5879422ba534a6" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Mon Jun 20 08:59:46 2011 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Mon Jun 20 08:59:46 2011 -0700" }, "message": "Merge branch \u0027for-linus\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/dtor/input\n\n* \u0027for-linus\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/dtor/input:\n Input: sh_keysc - 8x8 MODE_6 fix\n Input: omap-keypad - add missing input_sync()\n Input: evdev - try to wake up readers only if we have full packet\n Input: properly assign return value of clamp() macro.\n" }, { "commit": "482e0cd3dbaa70f2a2bead4b5f2c0d203ef654ba", "tree": "68d885682da34a08c29908d012a356344882a487", "parents": [ "8e833fd2e1f0107ee7a4b6bc4de3c9f0e9b0ed41" ], "author": { "name": "Al Viro", "email": "viro@zeniv.linux.org.uk", "time": "Sun Jun 19 13:01:04 2011 -0400" }, "committer": { "name": "Al Viro", "email": "viro@zeniv.linux.org.uk", "time": "Mon Jun 20 10:46:04 2011 -0400" }, "message": "devcgroup_inode_permission: take \"is it a device node\" checks to inlined wrapper\n\ninode_permission() calls devcgroup_inode_permission() and almost all such\ncalls are _not_ for device nodes; let\u0027s at least keep the common path\nstraight...\n\nSigned-off-by: Al Viro \u003cviro@zeniv.linux.org.uk\u003e\n" }, { "commit": "155d109b5f52ffd749219b27702462dcd9cf4f8d", "tree": "980be2955bbf656963ad3edc9ff311d4528b70f1", "parents": [ "d4c208b86b8be4254eba0e74071496e599f94639" ], "author": { "name": "Namhyung Kim", "email": "namhyung@gmail.com", "time": "Mon Jun 20 13:23:14 2011 +0200" }, "committer": { "name": "Jens Axboe", "email": "jaxboe@fusionio.com", "time": "Mon Jun 20 13:23:14 2011 +0200" }, "message": "block: add REQ_SECURE to REQ_COMMON_MASK\n\nAdd REQ_SECURE flag to REQ_COMMON_MASK so that\ninit_request_from_bio() can pass it to @req-\u003ecmd_flags.\n\nSigned-off-by: Namhyung Kim \u003cnamhyung@gmail.com\u003e\nAcked-by: Adrian Hunter \u003cadrian.hunter@intel.com\u003e\nCc: stable@kernel.org # 2.6.36 and newer\nSigned-off-by: Jens Axboe \u003cjaxboe@fusionio.com\u003e\n" }, { "commit": "8816ead9d8e7c2745788e0684797e1912b504f33", "tree": "2a619a821024d31be2ce6ff422f287792379fe5b", "parents": [ "357ed6b1a110048ff8106f99092d6c4a7aadb45a", "203db2952bc87f5d610c9ad53a7d02b85897721f", "d8ad7d1123a960cc9f276bd499f9325c6f5e1bd1", "b5199515c25cca622495eb9c6a8a1d275e775088", "c1f5c54b57341e872a9d375dccef7257f86033ef" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Sun Jun 19 09:00:18 2011 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Sun Jun 19 09:00:18 2011 -0700" }, "message": "Merge branches \u0027perf-urgent-for-linus\u0027, \u0027sched-urgent-for-linus\u0027, \u0027timers-urgent-for-linus\u0027 and \u0027x86-urgent-for-linus\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip\n\n* \u0027perf-urgent-for-linus\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip:\n tools/perf: Fix static build of perf tool\n tracing: Fix regression in printk_formats file\n\n* \u0027sched-urgent-for-linus\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip:\n generic-ipi: Fix kexec boot crash by initializing call_single_queue before enabling interrupts\n\n* \u0027timers-urgent-for-linus\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip:\n clocksource: Make watchdog robust vs. interruption\n timerfd: Fix wakeup of processes when timer is cancelled on clock change\n\n* \u0027x86-urgent-for-linus\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip:\n x86, MAINTAINERS: Add x86 MCE people\n x86, efi: Do not reserve boot services regions within reserved areas\n" }, { "commit": "357ed6b1a110048ff8106f99092d6c4a7aadb45a", "tree": "ff4eb7e809e547bc3c0680dfd51793a8f57b2063", "parents": [ "de505e709ffb09a7382ca8e0d8c7dbb171ba5830", "f8b7fc6b514f34a51875dd48dff70d4d17a54f38" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Sun Jun 19 08:56:56 2011 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Sun Jun 19 08:56:56 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 rcu: Move RCU_BOOST #ifdefs to header file\n rcu: use softirq instead of kthreads except when RCU_BOOST\u003dy\n rcu: Use softirq to address performance regression\n rcu: Simplify curing of load woes\n" }, { "commit": "be98ca652faa6468916a9b7608befff215a8ca70", "tree": "13ed7ba7e41eb98acf9c9d5230e683d8b7f96e9e", "parents": [ "742a0c7cae9bd0f913c71722289b8ec862d70a2b" ], "author": { "name": "Manoj Iyer", "email": "manoj.iyer@canonical.com", "time": "Thu May 26 11:19:05 2011 -0500" }, "committer": { "name": "Chris Ball", "email": "cjb@laptop.org", "time": "Sat Jun 18 22:18:18 2011 -0400" }, "message": "mmc: Add PCI fixup quirks for Ricoh 1180:e823 reader\n\nSigned-off-by: Manoj Iyer \u003cmanoj.iyer@canonical.com\u003e\nCc: \u003cstable@kernel.org\u003e\nSigned-off-by: Chris Ball \u003ccjb@laptop.org\u003e\n" }, { "commit": "cca23d0b5350c9ca0473625c3f5879422ba534a6", "tree": "160e5a664d02bedb597d5e4e9bd9fd75c3427a23", "parents": [ "b27af563befa95686c8d1abc491408aa6b9a31dc" ], "author": { "name": "Magnus Damm", "email": "damm@opensource.se", "time": "Sat Jun 18 02:51:52 2011 -0700" }, "committer": { "name": "Dmitry Torokhov", "email": "dmitry.torokhov@gmail.com", "time": "Sat Jun 18 02:55:01 2011 -0700" }, "message": "Input: sh_keysc - 8x8 MODE_6 fix\n\nAccording to the data sheet for G4, AP4 and AG5 KEYSC MODE_6 is 8x8 keys.\nBump up MAXKEYS to 64 too.\n\nSigned-off-by: Magnus Damm \u003cdamm@opensource.se\u003e\nReviewed-by: Simon Horman \u003chorms@verge.net.au\u003e\nSigned-off-by: Dmitry Torokhov \u003cdtor@mail.ru\u003e\n" }, { "commit": "0835619348b097404f4f85bc5195c6e23a2f8de4", "tree": "a81ae35390d440ad1fc655ae2e8715f6fae0b652", "parents": [ "add794467a20463d7ea50dc9f158a6371d396175", "c001fb72a7b705f902bdfdd05b5d2408efe6f848", "e479c60456ef22b0869432887216186aabaed086" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Fri Jun 17 10:36:32 2011 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Fri Jun 17 10:36:32 2011 -0700" }, "message": "Merge branches \u0027gpio/merge\u0027 and \u0027spi/merge\u0027 of git://git.secretlab.ca/git/linux-2.6\n\n* \u0027gpio/merge\u0027 of git://git.secretlab.ca/git/linux-2.6:\n gpio: add GPIOF_ values regardless on kconfig settings\n gpio: include linux/gpio.h where needed\n gpio/omap4: Fix missing interrupts during device wakeup due to IOPAD.\n\n* \u0027spi/merge\u0027 of git://git.secretlab.ca/git/linux-2.6:\n spi/bfin_spi: fix handling of default bits per word setting\n" }, { "commit": "879669961b11e7f40b518784863a259f735a72bf", "tree": "9bff5392e365caf656c9dd9be38f7471c182278c", "parents": [ "eb96c925152fc289311e5d7e956b919e9b60ab53" ], "author": { "name": "David Howells", "email": "dhowells@redhat.com", "time": "Fri Jun 17 11:25:59 2011 +0100" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Fri Jun 17 09:40:48 2011 -0700" }, "message": "KEYS/DNS: Fix ____call_usermodehelper() to not lose the session keyring\n\n____call_usermodehelper() now erases any credentials set by the\nsubprocess_inf::init() function. The problem is that commit\n17f60a7da150 (\"capabilites: allow the application of capability limits\nto usermode helpers\") creates and commits new credentials with\nprepare_kernel_cred() after the call to the init() function. This wipes\nall keyrings after umh_keys_init() is called.\n\nThe best way to deal with this is to put the init() call just prior to\nthe commit_creds() call, and pass the cred pointer to init(). That\nmeans that umh_keys_init() and suchlike can modify the credentials\n_before_ they are published and potentially in use by the rest of the\nsystem.\n\nThis prevents request_key() from working as it is prevented from passing\nthe session keyring it set up with the authorisation token to\n/sbin/request-key, and so the latter can\u0027t assume the authority to\ninstantiate the key. This causes the in-kernel DNS resolver to fail\nwith ENOKEY unconditionally.\n\nSigned-off-by: David Howells \u003cdhowells@redhat.com\u003e\nAcked-by: Eric Paris \u003ceparis@redhat.com\u003e\nTested-by: Jeff Layton \u003cjlayton@redhat.com\u003e\nSigned-off-by: Linus Torvalds \u003ctorvalds@linux-foundation.org\u003e\n" }, { "commit": "d8ad7d1123a960cc9f276bd499f9325c6f5e1bd1", "tree": "0260df1b5b5b1601f56229c7dde54594d2dfebcb", "parents": [ "eb96c925152fc289311e5d7e956b919e9b60ab53" ], "author": { "name": "Takao Indoh", "email": "indou.takao@jp.fujitsu.com", "time": "Tue Mar 29 12:35:04 2011 -0400" }, "committer": { "name": "Ingo Molnar", "email": "mingo@elte.hu", "time": "Fri Jun 17 10:17:12 2011 +0200" }, "message": "generic-ipi: Fix kexec boot crash by initializing call_single_queue before enabling interrupts\n\nThere is a problem that kdump(2nd kernel) sometimes hangs up due\nto a pending IPI from 1st kernel. Kernel panic occurs because IPI\ncomes before call_single_queue is initialized.\n\nTo fix the crash, rename init_call_single_data() to call_function_init()\nand call it in start_kernel() so that call_single_queue can be\ninitialized before enabling interrupts.\n\nThe details of the crash are:\n\n (1) 2nd kernel boots up\n\n (2) A pending IPI from 1st kernel comes when irqs are first enabled\n in start_kernel().\n\n (3) Kernel tries to handle the interrupt, but call_single_queue\n is not initialized yet at this point. As a result, in the\n generic_smp_call_function_single_interrupt(), NULL pointer\n dereference occurs when list_replace_init() tries to access\n \u0026q-\u003elist.next.\n\nTherefore this patch changes the name of init_call_single_data()\nto call_function_init() and calls it before local_irq_enable()\nin start_kernel().\n\nSigned-off-by: Takao Indoh \u003cindou.takao@jp.fujitsu.com\u003e\nReviewed-by: WANG Cong \u003cxiyou.wangcong@gmail.com\u003e\nAcked-by: Neil Horman \u003cnhorman@tuxdriver.com\u003e\nAcked-by: Vivek Goyal \u003cvgoyal@redhat.com\u003e\nAcked-by: Peter Zijlstra \u003ca.p.zijlstra@chello.nl\u003e\nCc: Milton Miller \u003cmiltonm@bga.com\u003e\nCc: Jens Axboe \u003caxboe@kernel.dk\u003e\nCc: Paul E. McKenney \u003cpaulmck@linux.vnet.ibm.com\u003e\nCc: kexec@lists.infradead.org\nLink: http://lkml.kernel.org/r/D6CBEE2F420741indou.takao@jp.fujitsu.com\nSigned-off-by: Ingo Molnar \u003cmingo@elte.hu\u003e\n" }, { "commit": "3009adf5acb2245216651318c2226812fd1b01a6", "tree": "3fa6a085be2eab409aec447ab8bd7c4737321688", "parents": [ "9281b2a2e2e02ad4bcc2fdd11797709b815d5f8e", "42c1edd345c8412d96e7a362ee06feb7be73bb6c" ], "author": { "name": "David S. Miller", "email": "davem@conan.davemloft.net", "time": "Thu Jun 16 21:38:01 2011 -0400" }, "committer": { "name": "David S. Miller", "email": "davem@conan.davemloft.net", "time": "Thu Jun 16 21:38:01 2011 -0400" }, "message": "Merge branch \u0027master\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/kaber/nf-2.6\n" }, { "commit": "eb96c925152fc289311e5d7e956b919e9b60ab53", "tree": "93d106629c5dd09d8eeac3331109319b1bb078f8", "parents": [ "8b97b21e0f4f59801d05a5c536417f04ecfb5603", "b81157d016a48b8025ccfcb286827679b35f16aa" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Thu Jun 16 17:54:41 2011 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Thu Jun 16 17:54:41 2011 -0700" }, "message": "Merge branch \u0027drm-fixes\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/airlied/drm-2.6\n\n* \u0027drm-fixes\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/airlied/drm-2.6:\n drm/radeon/kms: use helper functions for fence read/write\n drm/radeon/kms: set DP link config properly for DP bridges\n drm/radeon/kms/atom: AdjustPixelClock fixes for DP bridges\n drm/radeon/kms: fix handling of DP to LVDS bridges\n drm/radeon/kms: issue blank/unblank commands for ext encoders\n drm/radeon/kms: fix support for DDC on dp bridges\n drm/radeon/kms: add support for load detection on dp bridges\n drm/radeon/kms: add missing external encoder action\n drm/radeon/kms: rework atombios_get_encoder_mode()\n drm/radeon/kms: fix num crtcs for Cedar and Caicos\n Revert \"drm/i915: Enable GMBUS for post-gen2 chipsets\"\n drivers/gpu/drm: use printk_ratelimited instead of printk_ratelimit\n drm/radeon: workaround a hw bug on some radeon chipsets with all-0 EDIDs.\n drm: make debug levels match in edid failure code.\n drm/radeon/kms: clear wb memory by default\n drm/radeon/kms: be more pedantic about the g5 quirk (v2)\n drm/radeon/kms: signed fix for evergreen thermal\n drm: populate irq_by_busid-member for pci\n" }, { "commit": "c16d51a32bbb61ac8fd96f78b5ce2fccfe0fb4c3", "tree": "3899f24f4b1cc06e24055952f1d9114dc493caf0", "parents": [ "57f2104f39995bac332ddc492fbf60aa28e0c35e" ], "author": { "name": "Shreshtha Kumar Sahu", "email": "shreshthakumar.sahu@stericsson.com", "time": "Mon Jun 13 10:11:33 2011 +0200" }, "committer": { "name": "Greg Kroah-Hartman", "email": "gregkh@suse.de", "time": "Thu Jun 16 12:01:57 2011 -0700" }, "message": "amba pl011: workaround for uart registers lockup\n\nThis workaround aims to break the deadlock situation\nwhich raises during continuous transfer of data for long\nduration over uart with hardware flow control. It is\nobserved that CTS interrupt cannot be cleared in uart\ninterrupt register (ICR). Hence further transfer over\nuart gets blocked.\n\nIt is seen that during such deadlock condition ICR\ndon\u0027t get cleared even on multiple write. This leads\npass_counter to decrease and finally reach zero. This\ncan be taken as trigger point to run this UART_BT_WA.\n\nWorkaround backups the register configuration, does soft\nreset of UART using BIT-0 of PRCC_K_SOFTRST_SET/CLEAR\nregisters and restores the registers.\n\nThis patch also provides support for uart init and exit\nfunction calls if present.\n\nSigned-off-by: Shreshtha Kumar Sahu \u003cshreshthakumar.sahu@stericsson.com\u003e\nSigned-off-by: Linus Walleij \u003clinus.walleij@linaro.org\u003e\nSigned-off-by: Greg Kroah-Hartman \u003cgregkh@suse.de\u003e\n" }, { "commit": "b5199515c25cca622495eb9c6a8a1d275e775088", "tree": "250fc4f3d02c58eddf770e9d040edeafd0012e76", "parents": [ "1123d93963cbd2546449d4d9f0c568e323cb0ac6" ], "author": { "name": "Thomas Gleixner", "email": "tglx@linutronix.de", "time": "Thu Jun 16 16:22:08 2011 +0200" }, "committer": { "name": "Thomas Gleixner", "email": "tglx@linutronix.de", "time": "Thu Jun 16 19:30:53 2011 +0200" }, "message": "clocksource: Make watchdog robust vs. interruption\n\nThe clocksource watchdog code is interruptible and it has been\nobserved that this can trigger false positives which disable the TSC.\n\nThe reason is that an interrupt storm or a long running interrupt\nhandler between the read of the watchdog source and the read of the\nTSC brings the two far enough apart that the delta is larger than the\nunstable treshold. Move both reads into a short interrupt disabled\nregion to avoid that.\n\nReported-and-tested-by: Vernon Mauery \u003cvernux@us.ibm.com\u003e\nSigned-off-by: Thomas Gleixner \u003ctglx@linutronix.de\u003e\nCc: stable@kernel.org\n" } ], "next": "8dac6bee32425dd5145b40fa2307648cb7fb4d4a" }