)]}' { "log": [ { "commit": "a76e99abc558aed633ba28ff61c5328116292bf3", "tree": "60f7677f0baafa00825accc1214839246b3e78dd", "parents": [ "a54734678ff9cb97938b9f7648547174f3b118e4", "1d05f993784973189395051cc711fdd6dd5eb389" ], "author": { "name": "Rohit Vaswani", "email": "rvaswani@codeaurora.org", "time": "Fri Mar 30 00:09:34 2012 -0700" }, "committer": { "name": "Rohit Vaswani", "email": "rvaswani@codeaurora.org", "time": "Fri Mar 30 00:09:34 2012 -0700" }, "message": "Merge branch \u0027Linux 3.0.21\u0027 into msm-3.0\n\nMerge Upstream\u0027s stable 3.0.21 branch into msm-3.0\nThis consists 814 commits and some merge conflicts.\n\nThe merge conflicts are because of some local changes to\nmsm-3.0 as well as some conflicts between google\u0027s tree and\nthe upstream tree.\n\nConflicts:\n\tarch/arm/kernel/head.S\n\tdrivers/bluetooth/ath3k.c\n\tdrivers/bluetooth/btusb.c\n\tdrivers/mmc/core/core.c\n\tdrivers/tty/serial/serial_core.c\n\tdrivers/usb/host/ehci-hub.c\n\tdrivers/usb/serial/qcserial.c\n\tfs/namespace.c\n\tfs/proc/base.c\n\nChange-Id: I62e2edbe213f84915e27f8cd6e4f6ce23db22a21\nSigned-off-by: Rohit Vaswani \u003crvaswani@codeaurora.org\u003e\n" }, { "commit": "97d68a8b69e87480c436dd8365b438c3d18fed47", "tree": "2d587d3aa46d50758d29697d937f6a7cb038306f", "parents": [ "8405e3e79e0144b735dd988fad37ace208846992" ], "author": { "name": "Amar Singhal", "email": "asinghal@codeaurora.org", "time": "Tue Mar 20 19:03:04 2012 -0700" }, "committer": { "name": "Amar Singhal", "email": "asinghal@codeaurora.org", "time": "Wed Mar 21 14:01:08 2012 -0700" }, "message": "kernel/main: fix calling sysfs_notify from atomic context\n\nSysfs_notify takes a mutex and therefore cannot be called from atomic\ncontext like interrupt handler in this case. Use a workqueue to schedule\nthe work instead.\n\nChange-Id: I0a5230fe379aa51f1065df4af9b27f471aa22440\nSigned-off-by: Amar Singhal \u003casinghal@codeaurora.org\u003e\n" }, { "commit": "6cad96a03eaefe1350375b64d0dddfc379f71999", "tree": "a7707c7badea11a86dcda1a60fae9b4f5ee5e5c0", "parents": [ "990f7c8de76211f534139ea2bcfa2664a1b2d9d2", "ac2a6d6453c50db7ba7c0b3aa328a3ba48a84abf" ], "author": { "name": "Linux Build Service Account", "email": "lnxbuild@localhost", "time": "Fri Mar 09 00:03:11 2012 -0800" }, "committer": { "name": "QuIC Gerrit Code Review", "email": "code-review@localhost", "time": "Fri Mar 09 00:03:12 2012 -0800" }, "message": "Merge \"kernel/power: add pollable sysfs entries for touch events\" into msm-3.0" }, { "commit": "2fb0354486e2d7b8d73622cbdbb941748a921240", "tree": "ba440eea2f97a79117eb2ebb0d5635ceb0586763", "parents": [ "704a644e6526a3ca0ca91839b35c3466167a6bd0" ], "author": { "name": "Amar Singhal", "email": "asinghal@codeaurora.org", "time": "Thu Feb 23 14:43:58 2012 -0800" }, "committer": { "name": "Amar Singhal", "email": "asinghal@codeaurora.org", "time": "Tue Mar 06 15:44:10 2012 -0800" }, "message": "framebuffer: add a pollable sysfs entry for display status\n\nWakeup the userspace poll on change of display status. The\nuserspace then may take action to change the\npower/performance characteristics of the device.\n\nChange-Id: I9bd11f3d895d3d83230104f5d8dcd1deeaa754cd\nSigned-off-by: Amar Singhal \u003casinghal@codeaurora.org\u003e\n" }, { "commit": "ac2a6d6453c50db7ba7c0b3aa328a3ba48a84abf", "tree": "171ec9b17755fde7d3a5d56caeed9b5ede3a8ee7", "parents": [ "704a644e6526a3ca0ca91839b35c3466167a6bd0" ], "author": { "name": "Amar Singhal", "email": "asinghal@codeaurora.org", "time": "Mon Feb 27 17:40:31 2012 -0800" }, "committer": { "name": "Amar Singhal", "email": "asinghal@codeaurora.org", "time": "Tue Mar 06 15:27:33 2012 -0800" }, "message": "kernel/power: add pollable sysfs entries for touch events\n\nProvide userspace with a pollable sysfs entry that it can poll\non waiting for touch event notifiction. Once it\nis woken up, the userspace can take action to change the\npower/performance characteristics of the device for the duration\nof the event.\n\nChange-Id: Iab84f729f2ea3a5352c4e5173f78544023a276c1\nSigned-off-by: Amar Singhal \u003casinghal@codeaurora.org\u003e\n" }, { "commit": "219a067fc90ff329bed117238e4f79b70f9b8719", "tree": "7f348ceae68395bf30a08b1beb43b7a8c5d70ab0", "parents": [ "3d576c041485ad582b1027f9a3cbcfa86f4c762a", "b599ff7fcb262317403bb1be613ab52b9e2a07fc" ], "author": { "name": "Linux Build Service Account", "email": "lnxbuild@localhost", "time": "Fri Dec 02 21:29:05 2011 -0800" }, "committer": { "name": "QuIC Gerrit Code Review", "email": "code-review@localhost", "time": "Fri Dec 02 21:29:05 2011 -0800" }, "message": "Merge \"Revert \"power: wakelock: don\u0027t set check_done flag if aborting\"\" into msm-3.0" }, { "commit": "06e857251e781e36453009b3efb338dc8fff6528", "tree": "cb35d6df7ec8779991c2438c3060c71586624e83", "parents": [ "133ddac5a8ef75139bb2f8275e4d45f348c15105" ], "author": { "name": "Colin Cross", "email": "ccross@android.com", "time": "Wed Nov 09 16:39:19 2011 -0500" }, "committer": { "name": "Ashwin Chaugule", "email": "ashwinc@codeaurora.org", "time": "Tue Nov 29 16:42:33 2011 -0500" }, "message": "ARM: cpu_pm: Add cpu power management notifiers\n\nDuring some CPU power modes entered during idle, hotplug and\nsuspend, peripherals located in the CPU power domain, such as\nthe GIC, localtimers, and VFP, may be powered down. Add a\nnotifier chain that allows drivers for those peripherals to\nbe notified before and after they may be reset.\n\nSigned-off-by: Colin Cross \u003cccross \u003cat\u003e android.com\u003e\n[santosh.shilimkar \u003cat\u003e ti.com: Rebased against 3.1-rc3]\nSigned-off-by: Santosh Shilimkar \u003csantosh.shilimkar \u003cat\u003e ti.com\u003e\nTested-by: Kevin Hilman \u003ckhilman \u003cat\u003e ti.com\u003e\nChange-Id: I6e076344b268869d12033f57321f3e7cf23b05e8\nSigned-off-by: Ashwin Chaugule \u003cashwinc@codeaurora.org\u003e\n" }, { "commit": "b599ff7fcb262317403bb1be613ab52b9e2a07fc", "tree": "f3b6bfa8496a13d7402051a891d3991f17fc676e", "parents": [ "4b0f0d9b57b19ecd3a7d03460cb9682b0dc3544e" ], "author": { "name": "Patrick Cain", "email": "pcain@codeaurora.org", "time": "Mon Nov 28 14:41:25 2011 -0800" }, "committer": { "name": "Patrick Cain", "email": "pcain@codeaurora.org", "time": "Mon Nov 28 14:41:25 2011 -0800" }, "message": "Revert \"power: wakelock: don\u0027t set check_done flag if aborting\"\n\nThis reverts commit 7ef4dbaa2adcadb39b5b60051d637e0203c7b6ba.\n\nRevert \"power: wakelock: BUG if wakelock is taken very late\"\n\nThis reverts commit 57b34bbdca587ed67ed3d6fc9a83cf3564ac770d.\n\nChange-Id: Ie1288b5e6c899ac4419c55b91cb024b8093b5ffe\nSigned-off-by: Patrick Cain \u003cpcain@codeaurora.org\u003e\n" }, { "commit": "d074fa2796bdbc42c4f918c78d6711bafc80b1c8", "tree": "033929706a0aae95f65c134a8fc09cec3fb3e75d", "parents": [ "53ae1740b250e4d02dd7a6ca82075355ad99dc23", "9ab6a29787b1221a697f85835645549668258bdc" ], "author": { "name": "Bryan Huntsman", "email": "bryanh@codeaurora.org", "time": "Wed Nov 16 13:52:50 2011 -0800" }, "committer": { "name": "Bryan Huntsman", "email": "bryanh@codeaurora.org", "time": "Wed Nov 16 13:52:50 2011 -0800" }, "message": "Merge remote-tracking branch \u0027common/android-3.0\u0027 into msm-3.0\n\n* common/android-3.0: (570 commits)\n misc: remove kernel debugger core\n ARM: common: fiq_debugger: dump sysrq directly to console if enabled\n ARM: common: fiq_debugger: add irq context debug functions\n net: wireless: bcmdhd: Call init_ioctl() only if was started properly for WEXT\n net: wireless: bcmdhd: Call init_ioctl() only if was started properly\n net: wireless: bcmdhd: Fix possible memory leak in escan/iscan\n cpufreq: interactive governor: default 20ms timer\n cpufreq: interactive governor: go to intermediate hi speed before max\n cpufreq: interactive governor: scale to max only if at min speed\n cpufreq: interactive governor: apply intermediate load on current speed\n ARM: idle: update idle ticks before call idle end notifier\n input: gpio_input: don\u0027t print debounce message unless flag is set\n net: wireless: bcm4329: Skip dhd_bus_stop() if bus is already down\n net: wireless: bcmdhd: Skip dhd_bus_stop() if bus is already down\n net: wireless: bcmdhd: Improve suspend/resume processing\n net: wireless: bcmdhd: Check if FW is Ok for internal FW call\n tcp: Don\u0027t nuke connections for the wrong protocol\n ARM: common: fiq_debugger: make uart irq be no_suspend\n net: wireless: Skip connect warning for CONFIG_CFG80211_ALLOW_RECONNECT\n mm: avoid livelock on !__GFP_FS allocations\n ...\n\nConflicts:\n\tarch/arm/mm/cache-l2x0.c\n\tarch/arm/vfp/vfpmodule.c\n\tdrivers/mmc/core/host.c\n\tkernel/power/wakelock.c\n\tnet/bluetooth/hci_event.c\n\nSigned-off-by: Bryan Huntsman \u003cbryanh@codeaurora.org\u003e\n" }, { "commit": "f450df800450e9c7ec8c53bdb72d6c4ef5f17d4e", "tree": "9b9300377184b368b48f031e9ff6afad454c379a", "parents": [ "3fa57c1bf5fb311544199b7837a08b9f5bf5e6e4" ], "author": { "name": "Dan Carpenter", "email": "dan.carpenter@oracle.com", "time": "Wed Sep 21 20:55:04 2011 +0200" }, "committer": { "name": "Greg Kroah-Hartman", "email": "gregkh@suse.de", "time": "Fri Nov 11 09:37:17 2011 -0800" }, "message": "PM / Suspend: Off by one in pm_suspend()\n\ncommit 528f7ce6e439edeac38f6b3f8561f1be129b5e91 upstream.\n\nIn enter_state() we use \"state\" as an offset for the pm_states[]\narray. The pm_states[] array only has PM_SUSPEND_MAX elements so\nthis test is off by one.\n\nSigned-off-by: Dan Carpenter \u003cdan.carpenter@oracle.com\u003e\nSigned-off-by: Rafael J. Wysocki \u003crjw@sisk.pl\u003e\nSigned-off-by: Greg Kroah-Hartman \u003cgregkh@suse.de\u003e\n\n\n" }, { "commit": "afcffe54c379314f8e97610673d7ea783f559d58", "tree": "d4ca259e42a8f20a40bf4a7e97bca51b989f6102", "parents": [ "b811aa7237b013a03c62266ae10ed79e27a4fe38" ], "author": { "name": "Patrick Cain", "email": "pcain@codeaurora.org", "time": "Fri Nov 04 14:25:55 2011 -0700" }, "committer": { "name": "Abhijeet Dharmapurikar", "email": "adharmap@codeaurora.org", "time": "Tue Nov 08 23:21:57 2011 -0800" }, "message": "Revert \"power: wakelock: don\u0027t set check_done flag if aborting\"\n\nThis reverts commit 7ef4dbaa2adcadb39b5b60051d637e0203c7b6ba.\n\nRevert \"power: wakelock: BUG if wakelock is taken very late\"\n\nThis reverts commit 57b34bbdca587ed67ed3d6fc9a83cf3564ac770d.\n\nChange-Id: Id4e05b191cf7781b8e0d0bed42f1c136b1ac428e\nSigned-off-by: Abhijeet Dharmapurikar \u003cadharmap@codeaurora.org\u003e\n" }, { "commit": "b811aa7237b013a03c62266ae10ed79e27a4fe38", "tree": "a35f2ecf2e46792fc3663c2223b73268217f67be", "parents": [ "6f6fdc65bfe8c38b6d905903de911eaed2a74e18" ], "author": { "name": "Patrick Cain", "email": "pcain@codeaurora.org", "time": "Fri Nov 04 14:25:36 2011 -0700" }, "committer": { "name": "Patrick Cain", "email": "pcain@codeaurora.org", "time": "Fri Nov 04 14:25:36 2011 -0700" }, "message": "Revert \"power: wakelock: reset wakelock checked early\"\n\nThis reverts commit fa3a6d5572e22676c8c93775662b0d755a8dca85.\n\nSigned-off-by: Patrick Cain \u003cpcain@codeaurora.org\u003e\n" }, { "commit": "fa3a6d5572e22676c8c93775662b0d755a8dca85", "tree": "e57f4c557fa8f09ebb1fd6726af15b68bd053efe", "parents": [ "54932793d51fde72af2942ee120126412489b134" ], "author": { "name": "Abhijeet Dharmapurikar", "email": "adharmap@codeaurora.org", "time": "Tue Oct 25 20:14:44 2011 -0700" }, "committer": { "name": "Abhijeet Dharmapurikar", "email": "adharmap@codeaurora.org", "time": "Tue Oct 25 20:14:44 2011 -0700" }, "message": "power: wakelock: reset wakelock checked early\n\nCurrently we reset msm_suspend_check_done in resume_noirq and set it\nin the suspend_noirq stage right after the wakelock checks are done.\n\nAn issue is discovered recently that a wakelock can be held much earlier\nin the resume sequence - a tasklet was scheduled right in the arch specifc\nresume path, and this tasklet was run as soon as local interrupt was\nenabled (the I bit in the CPSR for arm processors). The tasklet endedup\ngrabbing a wakelock thus causing a BUG.\n\nTo avoid this situation reset msm_suspend_check_done before enabling local\ninterrupts using the syscore ops.\n\nChange-Id: I12766cb759134185e9727829f71893934492cc5f\nSigned-off-by: Abhijeet Dharmapurikar \u003cadharmap@codeaurora.org\u003e\n" }, { "commit": "7ef4dbaa2adcadb39b5b60051d637e0203c7b6ba", "tree": "41d1b4c6b6f40c448fe4f97878e2cf9ed11ed7ba", "parents": [ "e60096da0f2e37010af610472b9df688a08f9c55" ], "author": { "name": "Abhijeet Dharmapurikar", "email": "adharmap@codeaurora.org", "time": "Thu Oct 06 14:22:20 2011 -0700" }, "committer": { "name": "Abhijeet Dharmapurikar", "email": "adharmap@codeaurora.org", "time": "Fri Oct 14 09:22:49 2011 -0700" }, "message": "power: wakelock: don\u0027t set check_done flag if aborting\n\nIf there is a wakelock held the wakelock driver rejects the suspend\nby returning EAGAIN(-11). In this case since the suspend is rejected\nin suspend_noirq callback, the resume_noirq callback is not called on\nthe wakelock driver, leading to the check_done flag not being cleared\nand causing a BUG for the next wakelock request.\n\nDon\u0027t set the check_done flag if suspend_noirq aborts suspend.\n\nChange-Id: Iddd12cefd9a30020784416b4e5bec7fe3f7fc0e6\nSigned-off-by: Abhijeet Dharmapurikar \u003cadharmap@codeaurora.org\u003e\n" }, { "commit": "57b34bbdca587ed67ed3d6fc9a83cf3564ac770d", "tree": "99e71a3eb67d616be9d51b588cf3d077f17744a1", "parents": [ "fdd3892444be6412bbeead90c13b5099a417e6bb" ], "author": { "name": "Abhijeet Dharmapurikar", "email": "adharmap@codeaurora.org", "time": "Mon Sep 26 17:10:02 2011 -0700" }, "committer": { "name": "Bryan Huntsman", "email": "bryanh@codeaurora.org", "time": "Tue Oct 04 17:14:23 2011 -0700" }, "message": "power: wakelock: BUG if wakelock is taken very late\n\nThere has been handful of corner cases where a driver would call\nwake_lock very late in the suspend sequence but the suspend proceeds\nanyways and causes issues.\n\nAdd code to BUG if a driver grabs a wakelock after suspend_noirq callbacks\nare called, this will aid in correct wakelock usage for new drivers and\ngive us callstacks for misbehaving drivers.\n\nSigned-off-by: Abhijeet Dharmapurikar \u003cadharmap@codeaurora.org\u003e\n" }, { "commit": "529461b70c7dc20b0371e54a63844edae905d7a2", "tree": "da4b84ce6d266268b19d444af479876e98792223", "parents": [ "4e8aada5f34f1a5b92418c0db623785b8a54abfe" ], "author": { "name": "Pratik Patel", "email": "pratikp@codeaurora.org", "time": "Thu Jul 21 19:13:34 2011 -0700" }, "committer": { "name": "Bryan Huntsman", "email": "bryanh@codeaurora.org", "time": "Mon Oct 03 10:26:58 2011 -0700" }, "message": "power: fix suspend_sys_sync_wait()\n\nSince the workqueue code deletes the work before executing it,\nchecking for no work item being currently queued to the workqueue\nis not sufficient to guarantee that all the works have finished\nexecution.\n\nUse a counter to guarantee that all the pending suspend_sys_sync()\nworks have finished execution before returning from\nsuspend_sys_sync_wait().\n\nCRs-Fixed: 293595\nSigned-off-by: Pratik Patel \u003cpratikp@codeaurora.org\u003e\n\nConflicts:\n\n\tkernel/power/wakelock.c\n" }, { "commit": "3f2bc4d6eb5a4fada842462ba22bb6bbb41d00c7", "tree": "088e0646c8abcbde263d13ee865ba69032ac86dd", "parents": [ "f06154cc47399dfdb3950d3e6b71d67ee186f69d" ], "author": { "name": "Bryan Huntsman", "email": "bryanh@codeaurora.org", "time": "Tue Aug 16 17:27:22 2011 -0700" }, "committer": { "name": "Bryan Huntsman", "email": "bryanh@codeaurora.org", "time": "Mon Oct 03 09:57:10 2011 -0700" }, "message": "Initial Contribution\n\nmsm-2.6.38: tag AU_LINUX_ANDROID_GINGERBREAD.02.03.04.00.142\n\nSigned-off-by: Bryan Huntsman \u003cbryanh@codeaurora.org\u003e\n" }, { "commit": "7013f4976374ea75cb35446393be7bdc37bf607f", "tree": "2009f96a5f6589628c444c87ea90fdb02857d02e", "parents": [ "64753a4df63a211c52a40e4cdf6632e73f2a235d" ], "author": { "name": "Todd Poynor", "email": "toddpoynor@google.com", "time": "Thu Aug 25 19:29:45 2011 -0700" }, "committer": { "name": "Todd Poynor", "email": "toddpoynor@google.com", "time": "Tue Sep 06 13:49:57 2011 -0700" }, "message": "PM: Backoff suspend if repeated attempts fail\n\nChange-Id: I32289676d95a307ea3aa5e78f6c126ca979c0fec\nSigned-off-by: Todd Poynor \u003ctoddpoynor@google.com\u003e\n" }, { "commit": "ca64b0cd3a12d7704f4e98f4f5d51f41eb5047a2", "tree": "62f9b1336ec14d087f19a4cb770b4edf92bcaead", "parents": [ "e65d9fe5564afaca75ae657179446578be73e9ba" ], "author": { "name": "Todd Poynor", "email": "toddpoynor@google.com", "time": "Mon Aug 08 16:06:54 2011 -0700" }, "committer": { "name": "Todd Poynor", "email": "toddpoynor@google.com", "time": "Wed Aug 10 16:14:56 2011 -0700" }, "message": "PM: wakelocks: Display wakelocks preventing suspend by default\n\nUse DEBUG_WAKEUP flag to show wakelocks that abort suspend, in\naddition to showing wakelocks held during system resume.\nDEBUG_WAKEUP is enabled by default.\n\nChange-Id: If6fa68e8afbc482a5300ffab2964694b02b34f41\nSigned-off-by: Todd Poynor \u003ctoddpoynor@google.com\u003e\n" }, { "commit": "ed27e538aa97278e26a6c00f14f6e2e076a1a2ae", "tree": "e093cde0093c10dd6b2f070fc6aa1a3f4967e436", "parents": [ "b7a82d40f1d9dc7a69281fc3b2a42a489f2a1619" ], "author": { "name": "Todd Poynor", "email": "toddpoynor@google.com", "time": "Mon Aug 08 17:26:49 2011 -0700" }, "committer": { "name": "Todd Poynor", "email": "toddpoynor@google.com", "time": "Mon Aug 08 19:03:09 2011 -0700" }, "message": "PM: wakelocks: Don\u0027t report wake up wakelock if suspend aborted\n\nIf the wakelock driver aborts suspend due to an already-held\nwakelock, don\u0027t report the next wakelock held as the \"wake up\nwakelock\".\n\nChange-Id: I582ffbb87a3c361739a77d839a0c62921cff11a6\nSigned-off-by: Todd Poynor \u003ctoddpoynor@google.com\u003e\n" }, { "commit": "fec502d9a18bbe8045c67bd4f9d3a1ade4e78555", "tree": "281dcb3e41e55462634ca107329bb3415d989a8f", "parents": [ "d74348cebf7b883a872c5f0cfdf815855e08db5a" ], "author": { "name": "Erik Gilling", "email": "konkers@android.com", "time": "Thu Jul 21 14:07:45 2011 -0700" }, "committer": { "name": "Erik Gilling", "email": "konkers@android.com", "time": "Thu Jul 21 14:09:16 2011 -0700" }, "message": "earlysuspend: add verbose debug flag\n\nwhen enabled, prints out the function of each handler as they are called\n\nChange-Id: I5ed251867e0e3aa3cd05f030ff3579808cedd0c2\nSigned-off-by: Erik Gilling \u003ckonkers@android.com\u003e\n" }, { "commit": "07b02fbd98dcc988eb3379b916832473bd8bdfc1", "tree": "6bcc897fba2b8cde9b22e863108f34fdc6dade13", "parents": [ "9549cff379d6ca4640dd71c3e8637d4f0248d8eb" ], "author": { "name": "Colin Cross", "email": "ccross@android.com", "time": "Tue Jul 19 12:33:45 2011 -0700" }, "committer": { "name": "Todd Poynor", "email": "toddpoynor@google.com", "time": "Wed Jul 20 15:40:48 2011 -0700" }, "message": "power: Add option to log time spent in suspend\n\nPrints the time spent in suspend in the kernel log, and\nkeeps statistics on the time spent in suspend in\n/sys/kernel/debug/suspend_time\n\nChange-Id: Ia6b9ebe4baa0f7f5cd211c6a4f7e813aefd3fa1d\nSigned-off-by: Colin Cross \u003cccross@android.com\u003e\nSigned-off-by: Todd Poynor \u003ctoddpoynor@google.com\u003e\n" }, { "commit": "75c56a81116e51c5cf15c0641906d0745188cd16", "tree": "c1d8e7def5bbb099a39d5e9ccfb13508ea5ca46a", "parents": [ "b4294d618e8a19bb47826e51ae52b9fb2fe05f80", "620917de59eeb934b9f8cf35cc2d95c1ac8ed0fc" ], "author": { "name": "Colin Cross", "email": "ccross@android.com", "time": "Tue Jul 12 20:10:37 2011 -0700" }, "committer": { "name": "Colin Cross", "email": "ccross@android.com", "time": "Tue Jul 12 20:10:37 2011 -0700" }, "message": "Merge commit \u0027v3.0-rc7\u0027 into android-3.0\n" }, { "commit": "4d4cf23cdde2f8f9324f5684a7f349e182039529", "tree": "f84a26d15f1112cc7c452d1fdac3bd70857774e0", "parents": [ "a2fa83faf47b514ab947cea916d3691b66525073" ], "author": { "name": "Rafael J. Wysocki", "email": "rjw@sisk.pl", "time": "Wed Jul 06 20:15:23 2011 +0200" }, "committer": { "name": "Rafael J. Wysocki", "email": "rjw@sisk.pl", "time": "Wed Jul 06 20:15:23 2011 +0200" }, "message": "PM / Hibernate: Fix free_unnecessary_pages()\n\nThere is a bug in free_unnecessary_pages() that causes it to\nattempt to free too many pages in some cases, which triggers the\nBUG_ON() in memory_bm_clear_bit() for copy_bm. Namely, if\ncount_data_pages() is initially greater than alloc_normal, we get\nto_free_normal equal to 0 and \"save\" greater from 0. In that case,\nif the sum of \"save\" and count_highmem_pages() is greater than\nalloc_highmem, we subtract a positive number from to_free_normal.\nHence, since to_free_normal was 0 before the subtraction and is\nan unsigned int, the result is converted to a huge positive number\nthat is used as the number of pages to free.\n\nFix this bug by checking if to_free_normal is actually greater\nthan or equal to the number we\u0027re going to subtract from it.\n\nSigned-off-by: Rafael J. Wysocki \u003crjw@sisk.pl\u003e\nReported-and-tested-by: Matthew Garrett \u003cmjg@redhat.com\u003e\nCc: stable@kernel.org\n" }, { "commit": "e55d4fa96762fd767a3b6d842c904e994db6bb2e", "tree": "c74157e01cb128cb97f106a50cfadc4c8b872c41", "parents": [ "e32c14667e4fe9f16ac9b918d15d29abd2315a55", "b0af8dfdd67699e25083478c63eedef2e72ebd85" ], "author": { "name": "Colin Cross", "email": "ccross@android.com", "time": "Wed Jun 29 13:54:42 2011 -0700" }, "committer": { "name": "Colin Cross", "email": "ccross@android.com", "time": "Wed Jun 29 13:54:42 2011 -0700" }, "message": "Merge commit \u0027v3.0-rc5\u0027 into android-3.0\n" }, { "commit": "8440f4b19494467883f8541b7aa28c7bbf6ac92b", "tree": "3682e034553d8b9ac676e17b144fe5b15cbb0174", "parents": [ "f76b168b6f117a49d36307053e1acbe30580ea5b" ], "author": { "name": "Michal Kubecek", "email": "mkubecek@suse.cz", "time": "Sat Jun 18 20:34:01 2011 +0200" }, "committer": { "name": "Rafael J. Wysocki", "email": "rjw@sisk.pl", "time": "Tue Jun 21 23:20:06 2011 +0200" }, "message": "PM: Free memory bitmaps if opening /dev/snapshot fails\n\nWhen opening /dev/snapshot device, snapshot_open() creates memory\nbitmaps which are freed in snapshot_release(). But if any of the\ncallbacks called by pm_notifier_call_chain() returns NOTIFY_BAD, open()\nfails, snapshot_release() is never called and bitmaps are not freed.\nNext attempt to open /dev/snapshot then triggers BUG_ON() check in\ncreate_basic_memory_bitmaps(). This happens e.g. when vmwatchdog module\nis active on s390x.\n\nSigned-off-by: Michal Kubecek \u003cmkubecek@suse.cz\u003e\nSigned-off-by: Rafael J. Wysocki \u003crjw@sisk.pl\u003e\nCc: stable@kernel.org\n" }, { "commit": "28e23cf73c26d2bb13451804e328797a55f471e4", "tree": "06b4e77dabde6ac914133a48303ddcfaf47fcdb6", "parents": [ "e67dd1611d5330ba9d41ba9ccdc78d6ff2963398" ], "author": { "name": "Colin Cross", "email": "ccross@android.com", "time": "Wed Mar 30 12:37:49 2011 -0700" }, "committer": { "name": "Colin Cross", "email": "ccross@android.com", "time": "Tue Jun 14 09:09:53 2011 -0700" }, "message": "power: wakelock: use get_xtime_and_monotonic_and_sleep_offset in get_expired_time\n\nChange-Id: I6ebe6b954b2ff328d46898d683650dafb9c4fe74\nSigned-off-by: Erik Gilling \u003ckonkers@android.com\u003e\n" }, { "commit": "435aacd2a0cf0fc6402719fb69a3fac614686347", "tree": "93d26b8397539b0351f0e6c02529d8bda78ef079", "parents": [ "7ef37e015313dc58064d39bcdd5e25adb36518f5" ], "author": { "name": "Erik Gilling", "email": "konkers@android.com", "time": "Mon Aug 30 18:22:20 2010 -0700" }, "committer": { "name": "Colin Cross", "email": "ccross@android.com", "time": "Tue Jun 14 09:09:35 2011 -0700" }, "message": "power: wakelock: call __get_wall_to_monotonic() instead of using wall_to_monotonic\n\nChange-Id: I9e9c3b923bf9a22ffd48f80a72050289496e57d8\n" }, { "commit": "0c7841ce3e0a90bab630f671992348dafb022558", "tree": "a1e95e7106d661813176d7aeb64873bdce265d26", "parents": [ "5eb6fdc0c710873d2be76db4965f247f484f531a" ], "author": { "name": "Colin Cross", "email": "ccross@google.com", "time": "Sat Aug 21 17:27:02 2010 -0700" }, "committer": { "name": "Colin Cross", "email": "ccross@android.com", "time": "Tue Jun 14 09:09:34 2011 -0700" }, "message": "wakelock: Fix operator precedence bug\n\nChange-Id: I21366ace371d1b8f4684ddbe4ea8d555a926ac21\nSigned-off-by: Colin Cross \u003cccross@google.com\u003e\n" }, { "commit": "af62b25adba1fe01c91aa88c95d1584371ab2bf9", "tree": "b03c0757132204a2e7a423f17f6319ca32e30624", "parents": [ "617a3dcb3fc460098b5347b9c49ff59ce6f4b05d" ], "author": { "name": "Mike Chan", "email": "mike@android.com", "time": "Tue Feb 16 14:18:55 2010 -0800" }, "committer": { "name": "Colin Cross", "email": "ccross@android.com", "time": "Tue Jun 14 09:09:27 2011 -0700" }, "message": "power: wakelock: Print active wakelocks when has_wake_lock() is called\n\nWhen DEBUG_SUSPEND is enabled print active wakelocks when we check\nif there are any active wakelocks.\n\nIn print_active_locks(), print expired wakelocks if DEBUG_EXPIRE is enabled\n\nChange-Id: Ib1cb795555e71ff23143a2bac7c8a58cbce16547\nSigned-off-by: Mike Chan \u003cmike@android.com\u003e\n" }, { "commit": "4b0ea27fc8202b21ce338c82b55eee9c281bd7da", "tree": "a4527ae113321bc7a55d316183435ad38ccfabc6", "parents": [ "b28a6a111c2c4779f92f310cfefe10606df4999f" ], "author": { "name": "Rebecca Schultz", "email": "rschultz@google.com", "time": "Thu Jul 17 18:14:55 2008 -0700" }, "committer": { "name": "Colin Cross", "email": "ccross@android.com", "time": "Tue Jun 14 09:08:43 2011 -0700" }, "message": "PM: earlysuspend: Removing dependence on console.\n\nRather than signaling a full update of the display from userspace via a\nconsole switch, this patch introduces 2 files int /sys/power,\nwait_for_fb_sleep and wait_for_fb_wake. Reading these files will block\nuntil the requested state has been entered. When a read from\nwait_for_fb_sleep returns userspace should stop drawing. When\nwait_for_fb_wake returns, it should do a full update. If either are called\nwhen the fb driver is already in the requested state, they will return\nimmediately.\n\nSigned-off-by: Rebecca Schultz \u003crschultz@google.com\u003e\nSigned-off-by: Arve Hjønnevåg \u003carve@android.com\u003e\n" }, { "commit": "b28a6a111c2c4779f92f310cfefe10606df4999f", "tree": "86d2995f2c24e7adb96e557eeac2dadb2f709237", "parents": [ "c8bb31538d668c9d451e029d45edcd7c35892624" ], "author": { "name": "Arve Hjønnevåg", "email": "arve@android.com", "time": "Mon Dec 14 22:14:52 2009 -0800" }, "committer": { "name": "Colin Cross", "email": "ccross@android.com", "time": "Tue Jun 14 09:08:43 2011 -0700" }, "message": "consoleearlysuspend: Fix for 2.6.32\n\nvt_waitactive now needs a 1 based console number\n\nChange-Id: I07ab9a3773c93d67c09d928c8d5494ce823ffa2e\n" }, { "commit": "c8bb31538d668c9d451e029d45edcd7c35892624", "tree": "ec9dcfe5f157d7ef78fc89747fc11410339e3d3c", "parents": [ "01e13543e486f1007ba5656e30c5f0932f4187b0" ], "author": { "name": "Arve Hjønnevåg", "email": "arve@android.com", "time": "Wed Oct 15 17:52:20 2008 -0700" }, "committer": { "name": "Colin Cross", "email": "ccross@android.com", "time": "Tue Jun 14 09:08:43 2011 -0700" }, "message": "PM: earlysuspend: Add console switch when user requested sleep state changes.\n\nSigned-off-by: Arve Hjønnevåg \u003carve@android.com\u003e\n" }, { "commit": "01e13543e486f1007ba5656e30c5f0932f4187b0", "tree": "e7a5c2fd6659e006bbd833573d998b8ed48d1080", "parents": [ "677f10402f85bfab6b540f6e3f64cca7f7cb79a4" ], "author": { "name": "Arve Hjønnevåg", "email": "arve@android.com", "time": "Tue Dec 01 20:54:37 2009 -0800" }, "committer": { "name": "Colin Cross", "email": "ccross@android.com", "time": "Tue Jun 14 09:08:43 2011 -0700" }, "message": "PM: wakelock: Don\u0027t dump unfrozen task list when aborting try_to_freeze_tasks after less than one second\n\nChange-Id: Ib2976e5b97a5ee4ec9abd4d4443584d9257d0941\nSigned-off-by: Arve Hjønnevåg \u003carve@android.com\u003e\n" }, { "commit": "677f10402f85bfab6b540f6e3f64cca7f7cb79a4", "tree": "6037d617a2fcfbe372125a0632ce71700c5136fa", "parents": [ "47dfb46bf609015a383206417c8e596df1d84017" ], "author": { "name": "Arve Hjønnevåg", "email": "arve@android.com", "time": "Tue Oct 14 16:02:39 2008 -0700" }, "committer": { "name": "Colin Cross", "email": "ccross@android.com", "time": "Tue Jun 14 09:08:43 2011 -0700" }, "message": "PM: wakelock: Abort task freezing if a wake lock is held.\n\nAvoids a problem where the device sometimes hangs for 20 seconds\nbefore the screen is turned on.\n" }, { "commit": "47dfb46bf609015a383206417c8e596df1d84017", "tree": "19a77e0c978ccff1b9af287d86d8feb6539f2fe7", "parents": [ "b0dc34309fc9f98de480aa383c7f6f035ce3b54a" ], "author": { "name": "Arve Hjønnevåg", "email": "arve@android.com", "time": "Thu Oct 09 21:01:46 2008 -0700" }, "committer": { "name": "Colin Cross", "email": "ccross@android.com", "time": "Tue Jun 14 09:08:42 2011 -0700" }, "message": "PM: Add user-space wake lock api.\n\nThis adds /sys/power/wake_lock and /sys/power/wake_unlock.\nWriting a string to wake_lock creates a wake lock the\nfirst time is sees a string and locks it. Optionally, the\nstring can be followed by a timeout.\nTo unlock the wake lock, write the same string to wake_unlock.\n\nChange-Id: I66c6e3fe6487d17f9c2fafde1174042e57d15cd7\n" }, { "commit": "b0dc34309fc9f98de480aa383c7f6f035ce3b54a", "tree": "6b8633a1b37edc00b10a8c05a27eb35795a3776f", "parents": [ "c1783f55b10d7dfb4ada9a7149821b644255d8df" ], "author": { "name": "Arve Hjønnevåg", "email": "arve@android.com", "time": "Thu Oct 09 19:17:11 2008 -0700" }, "committer": { "name": "Colin Cross", "email": "ccross@android.com", "time": "Tue Jun 14 09:08:42 2011 -0700" }, "message": "PM: Enable early suspend through /sys/power/state\n\nIf EARLYSUSPEND is enabled then writes to /sys/power/state no longer\nblocks, and the kernel will try to enter the requested state every\ntime no wakelocks are held. Write \"on\" to resume normal operation.\n" }, { "commit": "c1783f55b10d7dfb4ada9a7149821b644255d8df", "tree": "b57f37018d30e734588c761366168c9255c95d2b", "parents": [ "1b0749512f76005ce41607472e6f36411fa96649" ], "author": { "name": "Arve Hjønnevåg", "email": "arve@android.com", "time": "Tue Oct 07 20:48:01 2008 -0700" }, "committer": { "name": "Colin Cross", "email": "ccross@android.com", "time": "Tue Jun 14 09:08:42 2011 -0700" }, "message": "PM: Implement early suspend api\n" }, { "commit": "1b0749512f76005ce41607472e6f36411fa96649", "tree": "f3bde94119c39656e1df9f1647c1426f9ca6d213", "parents": [ "10f0138c56a31a39c2a123af5af95cf8fd5de1ac" ], "author": { "name": "Arve Hjønnevåg", "email": "arve@android.com", "time": "Wed Dec 02 18:22:00 2009 -0800" }, "committer": { "name": "Colin Cross", "email": "ccross@android.com", "time": "Tue Jun 14 09:08:42 2011 -0700" }, "message": "PM: wakelocks: Use seq_file for /proc/wakelocks so we can get more than 3K of stats.\n\nChange-Id: I42ed8bea639684f7a8a95b2057516764075c6b01\nSigned-off-by: Arve Hjønnevåg \u003carve@android.com\u003e\n" }, { "commit": "10f0138c56a31a39c2a123af5af95cf8fd5de1ac", "tree": "d0ceb6e9c5ed17f2a6408754c371854b81fd6690", "parents": [ "97a0a74383d19a1a43ffca81271894ba3edc07b6" ], "author": { "name": "Erik Gilling", "email": "konkers@android.com", "time": "Tue Aug 25 20:09:12 2009 -0700" }, "committer": { "name": "Colin Cross", "email": "ccross@android.com", "time": "Tue Jun 14 09:08:42 2011 -0700" }, "message": "power: wakelocks: fix buffer overflow in print_wake_locks\n\nChange-Id: Ic944e3b3d3bc53eddc6fd0963565fd072cac373c\nSigned-off-by: Erik Gilling \u003ckonkers@android.com\u003e\n" }, { "commit": "97a0a74383d19a1a43ffca81271894ba3edc07b6", "tree": "02cfdfeaa54aab75b96492bfc14fc4f0ec8e9e65", "parents": [ "fe6cd633efb6d6070507deee0116be43cf4bc76b" ], "author": { "name": "Mike Chan", "email": "mike@android.com", "time": "Tue Aug 25 18:10:32 2009 -0700" }, "committer": { "name": "Colin Cross", "email": "ccross@android.com", "time": "Tue Jun 14 09:08:42 2011 -0700" }, "message": "power: Prevent spinlock recursion when wake_unlock() is called\n\nSigned-off-by: Mike Chan \u003cmike@android.com\u003e\n" }, { "commit": "fe6cd633efb6d6070507deee0116be43cf4bc76b", "tree": "15672fada835124d320b33407aa5f0ee2a8694f5", "parents": [ "9e3725811792edff4c3ec0baa71df22ebb1a7d23" ], "author": { "name": "Arve Hjønnevåg", "email": "arve@android.com", "time": "Tue Sep 09 22:14:34 2008 -0700" }, "committer": { "name": "Colin Cross", "email": "ccross@android.com", "time": "Tue Jun 14 09:08:41 2011 -0700" }, "message": "PM: Implement wakelock api.\n\nPM: wakelock: Replace expire work with a timer\n\nThe expire work function did not work in the normal case.\n\nSigned-off-by: Arve Hjønnevåg \u003carve@android.com\u003e\n" }, { "commit": "f42a9813fbf930fea3bdd0524dcb43c7feb0c977", "tree": "9396a7cf0b18ff2ce04cbe4698466ad6196afc75", "parents": [ "354258011e8e86961f7a72ad154ca8caf0c4c6f7" ], "author": { "name": "Rafael J. Wysocki", "email": "rjw@sisk.pl", "time": "Tue May 24 23:36:06 2011 +0200" }, "committer": { "name": "Rafael J. Wysocki", "email": "rjw@sisk.pl", "time": "Tue May 24 23:36:06 2011 +0200" }, "message": "PM / Hibernate: Update kerneldoc comments in hibernate.c\n\nSome of the kerneldoc comments in kernel/power/hibernate.c are\noutdated and some of them don\u0027t adhere to the kernel\u0027s standards.\nUpdate them and make them look in a consistent way.\n\nSigned-off-by: Rafael J. Wysocki \u003crjw@sisk.pl\u003e\nAcked-by: Randy Dunlap \u003crandy.dunlap@oracle.com\u003e\n" }, { "commit": "354258011e8e86961f7a72ad154ca8caf0c4c6f7", "tree": "e1c680e692a9cdddaabece1fe73dd85928bd1b23", "parents": [ "4e2d9491a78929badcf774869b458486acb96365" ], "author": { "name": "Rafael J. Wysocki", "email": "rjw@sisk.pl", "time": "Tue May 24 23:35:55 2011 +0200" }, "committer": { "name": "Rafael J. Wysocki", "email": "rjw@sisk.pl", "time": "Tue May 24 23:35:55 2011 +0200" }, "message": "PM / Hibernate: Remove arch_prepare_suspend()\n\nAll architectures supporting hibernation define\narch_prepare_suspend() as an empty function, so remove it.\n\nSigned-off-by: Rafael J. Wysocki \u003crjw@sisk.pl\u003e\n" }, { "commit": "4e2d9491a78929badcf774869b458486acb96365", "tree": "772bf28990cec5c78747cbc3c99ba836d6c1737b", "parents": [ "257313b2a87795e07a0bdf58d0fffbdba8b31051" ], "author": { "name": "Rafael J. Wysocki", "email": "rjw@sisk.pl", "time": "Tue May 24 00:21:26 2011 +0200" }, "committer": { "name": "Rafael J. Wysocki", "email": "rjw@sisk.pl", "time": "Tue May 24 00:21:26 2011 +0200" }, "message": "PM / Hibernate: Update some comments in core hibernate code\n\nSome comments in the core hibernate code are outdated, some aren\u0027t\nnecessary any more and at least one of them is plain wrong. Remove\nthose comments or update them.\n\nSigned-off-by: Rafael J. Wysocki \u003crjw@sisk.pl\u003e\n" }, { "commit": "91e7c75ba93c48a82670d630b9daac92ff70095d", "tree": "b44ac3dca1d03cce99cccc3f4ce55d4b5475d373", "parents": [ "c650da23d59d2c82307380414606774c6d49b8bd" ], "author": { "name": "Rafael J. Wysocki", "email": "rjw@sisk.pl", "time": "Tue May 17 23:26:00 2011 +0200" }, "committer": { "name": "Rafael J. Wysocki", "email": "rjw@sisk.pl", "time": "Tue May 17 23:26:00 2011 +0200" }, "message": "PM: Allow drivers to allocate memory from .prepare() callbacks safely\n\nIf device drivers allocate substantial amounts of memory (above 1 MB)\nin their hibernate .freeze() callbacks (or in their legacy suspend\ncallbcks during hibernation), the subsequent creation of hibernate\nimage may fail due to the lack of memory. This is the case, because\nthe drivers\u0027 .freeze() callbacks are executed after the hibernate\nmemory preallocation has been carried out and the preallocated amount\nof memory may be too small to cover the new driver allocations.\nUnfortunately, the drivers\u0027 .prepare() callbacks also are executed\nafter the hibernate memory preallocation has completed, so they are\nnot suitable for allocating additional memory either. Thus the only\nway a driver can safely allocate memory during hibernation is to use\na hibernate/suspend notifier. However, the notifiers are called\nbefore the freezing of user space and the drivers wanting to use them\nfor allocating additional memory may not know how much memory needs\nto be allocated at that point.\n\nTo let device drivers overcome this difficulty rework the hibernation\nsequence so that the memory preallocation is carried out after the\ndrivers\u0027 .prepare() callbacks have been executed, so that the\n.prepare() callbacks can be used for allocating additional memory\nto be used by the drivers\u0027 .freeze() callbacks. Update documentation\nto match the new behavior of the code.\n\nSigned-off-by: Rafael J. Wysocki \u003crjw@sisk.pl\u003e\n" }, { "commit": "c650da23d59d2c82307380414606774c6d49b8bd", "tree": "b511dc2cda05ff910c745d49a309dc33445dc592", "parents": [ "290c748725c170ed9a02522959ae67f528eefe98" ], "author": { "name": "Rafael J. Wysocki", "email": "rjw@sisk.pl", "time": "Tue May 17 23:25:10 2011 +0200" }, "committer": { "name": "Rafael J. Wysocki", "email": "rjw@sisk.pl", "time": "Tue May 17 23:25:10 2011 +0200" }, "message": "PM: Remove CONFIG_PM_VERBOSE\n\nNow that we have CONFIG_DYNAMIC_DEBUG there is no need for yet\nanother flag causing dev_dbg() and pr_debug() statements in the\ncore PM code to produce output. Moreover, CONFIG_PM_VERBOSE\ncauses so much output to be generated that it\u0027s not really useful\nand almost no one sets it.\n\nReferences: https://bugzilla.kernel.org/show_bug.cgi?id\u003d23182\nSigned-off-by: Rafael J. Wysocki \u003crjw@sisk.pl\u003e\n" }, { "commit": "290c748725c170ed9a02522959ae67f528eefe98", "tree": "a920190b75c7e054af24d850e79cc54f5cf53263", "parents": [ "2d2a9163bd4f3ba301f8138c32e4790edc30156c", "72874daa5e9064c4e8d689e6a04b1e96f687f872" ], "author": { "name": "Rafael J. Wysocki", "email": "rjw@sisk.pl", "time": "Tue May 17 23:23:46 2011 +0200" }, "committer": { "name": "Rafael J. Wysocki", "email": "rjw@sisk.pl", "time": "Tue May 17 23:23:46 2011 +0200" }, "message": "Merge branch \u0027power-domains\u0027 into for-linus\n\n* power-domains:\n PM: Fix build issue in clock_ops.c for CONFIG_PM_RUNTIME unset\n PM: Revert \"driver core: platform_bus: allow runtime override of dev_pm_ops\"\n OMAP1 / PM: Use generic clock manipulation routines for runtime PM\n PM / Runtime: Generic clock manipulation rountines for runtime PM (v6)\n PM / Runtime: Add subsystem data field to struct dev_pm_info\n OMAP2+ / PM: move runtime PM implementation to use device power domains\n PM / Platform: Use generic runtime PM callbacks directly\n shmobile: Use power domains for platform runtime PM\n PM: Export platform bus type\u0027s default PM callbacks\n PM: Make power domain callbacks take precedence over subsystem ones\n" }, { "commit": "2d2a9163bd4f3ba301f8138c32e4790edc30156c", "tree": "ac7d43e6c4f6a2f357454c42d762595cc358104d", "parents": [ "1c1be3a949a61427a962771c85a347c822aeb991", "2e711c04dbbf7a7732a3f7073b1fc285d12b369d" ], "author": { "name": "Rafael J. Wysocki", "email": "rjw@sisk.pl", "time": "Tue May 17 23:23:40 2011 +0200" }, "committer": { "name": "Rafael J. Wysocki", "email": "rjw@sisk.pl", "time": "Tue May 17 23:23:40 2011 +0200" }, "message": "Merge branch \u0027syscore\u0027 into for-linus\n\n* syscore:\n PM: Remove sysdev suspend, resume and shutdown operations\n PM / PowerPC: Use struct syscore_ops instead of sysdevs for PM\n PM / UNICORE32: Use struct syscore_ops instead of sysdevs for PM\n PM / AVR32: Use struct syscore_ops instead of sysdevs for PM\n PM / Blackfin: Use struct syscore_ops instead of sysdevs for PM\n ARM / Samsung: Use struct syscore_ops for \"core\" power management\n ARM / PXA: Use struct syscore_ops for \"core\" power management\n ARM / SA1100: Use struct syscore_ops for \"core\" power management\n ARM / Integrator: Use struct syscore_ops for core PM\n ARM / OMAP: Use struct syscore_ops for \"core\" power management\n ARM: Use struct syscore_ops instead of sysdevs for PM in common code\n" }, { "commit": "1c1be3a949a61427a962771c85a347c822aeb991", "tree": "f87ed0b7a008cfe5fb4bcb338352cc3febed18d5", "parents": [ "ddeb648708108091a641adad0a438ec4fd8bf190" ], "author": { "name": "Rafael J. Wysocki", "email": "rjw@sisk.pl", "time": "Sun May 15 11:39:48 2011 +0200" }, "committer": { "name": "Rafael J. Wysocki", "email": "rjw@sisk.pl", "time": "Tue May 17 23:19:19 2011 +0200" }, "message": "Revert \"PM / Hibernate: Reduce autotuned default image size\"\n\nThis reverts commit bea3864fb627d110933cfb8babe048b63c4fc76e\n(PM / Hibernate: Reduce autotuned default image size), because users\nare now able to resolve the issue this commit was supposed to address\nin a different way (i.e. by using the new /sys/power/reserved_size\ninterface).\n\nSigned-off-by: Rafael J. Wysocki \u003crjw@sisk.pl\u003e\n" }, { "commit": "ddeb648708108091a641adad0a438ec4fd8bf190", "tree": "722367ce903d362af29898db7c2bc2c1058d80c5", "parents": [ "13e381365614855bf14c8ad68f9b65e3afd3dd2c" ], "author": { "name": "Rafael J. Wysocki", "email": "rjw@sisk.pl", "time": "Sun May 15 11:38:48 2011 +0200" }, "committer": { "name": "Rafael J. Wysocki", "email": "rjw@sisk.pl", "time": "Tue May 17 23:19:19 2011 +0200" }, "message": "PM / Hibernate: Add sysfs knob to control size of memory for drivers\n\nMartin reports that on his system hibernation occasionally fails due\nto the lack of memory, because the radeon driver apparently allocates\ntoo much of it during the device freeze stage. It turns out that the\namount of memory allocated by radeon during hibernation (and\npresumably during system suspend too) depends on the utilization of\nthe GPU (e.g. hibernating while there are two KDE 4 sessions with\ncompositing enabled causes radeon to allocate more memory than for\none KDE 4 session).\n\nIn principle it should be possible to use image_size to make the\nmemory preallocation mechanism free enough memory for the radeon\ndriver, but in practice it is not easy to guess the right value\nbecause of the way the preallocation code uses image_size. For this\nreason, it seems reasonable to allow users to control the amount of\nmemory reserved for driver allocations made after the hibernate\npreallocation, which currently is constant and amounts to 1 MB.\n\nIntroduce a new sysfs file, /sys/power/reserved_size, whose value\nwill be used as the amount of memory to reserve for the\npost-preallocation reservations made by device drivers, in bytes.\nFor backwards compatibility, set its default (and initial) value to\nthe currently used number (1 MB).\n\nReferences: https://bugzilla.kernel.org/show_bug.cgi?id\u003d34102\nReported-and-tested-by: Martin Steigerwald \u003cMartin@Lichtvoll.de\u003e\nSigned-off-by: Rafael J. Wysocki \u003crjw@sisk.pl\u003e\n" }, { "commit": "3c431936087e93d2219a184a8e19eaa68077e379", "tree": "65b9bd696100c808ae02d6c235990a2c4fbb7104", "parents": [ "c1d10d18c542278b7fbc413c289d3cb6219da6b3" ], "author": { "name": "MyungJoo Ham", "email": "myungjoo.ham@samsung.com", "time": "Fri Apr 22 22:00:54 2011 +0200" }, "committer": { "name": "Rafael J. Wysocki", "email": "rjw@sisk.pl", "time": "Tue May 17 23:19:16 2011 +0200" }, "message": "PM / Suspend: Do not ignore error codes returned by suspend_enter()\n\nThe current implementation of suspend-to-RAM returns 0 if there is an\nerror from suspend_enter(), because suspend_devices_and_enter() ignores\nthe return value from suspend_enter(). This patch addresses this issue\nand properly keep the error return from suspend_enter() and let\nsuspend_devices_and_enter relay the error return.\n\nSigned-off-by: MyungJoo Ham \u003cmyungjoo.ham@samsung.com\u003e\nSigned-off-by: Kyungmin Park \u003ckyungmin.park@samsung.com\u003e\nSigned-off-by: Rafael J. Wysocki \u003crjw@sisk.pl\u003e\n" }, { "commit": "2e711c04dbbf7a7732a3f7073b1fc285d12b369d", "tree": "dbc06a3fff744144d7937a205a91fd8ce71585d4", "parents": [ "f5a592f7d74e38c5007876c731e6bf5580072e63" ], "author": { "name": "Rafael J. Wysocki", "email": "rjw@sisk.pl", "time": "Tue Apr 26 19:15:07 2011 +0200" }, "committer": { "name": "Rafael J. Wysocki", "email": "rjw@sisk.pl", "time": "Wed May 11 21:37:15 2011 +0200" }, "message": "PM: Remove sysdev suspend, resume and shutdown operations\n\nSince suspend, resume and shutdown operations in struct sysdev_class\nand struct sysdev_driver are not used any more, remove them. Also\ndrop sysdev_suspend(), sysdev_resume() and sysdev_shutdown() used\nfor executing those operations and modify all of their users\naccordingly. This reduces kernel code size quite a bit and reduces\nits complexity.\n\nSigned-off-by: Rafael J. Wysocki \u003crjw@sisk.pl\u003e\nAcked-by: Greg Kroah-Hartman \u003cgregkh@suse.de\u003e\n" }, { "commit": "36cb7035ea0c11ef2c7fa2bbe0cd181b23569b29", "tree": "d7d62149629bda6a916693232885b96ca34f30f3", "parents": [ "9744997a8a2280e67984d4bffd87221d24f3b6b1" ], "author": { "name": "Rafael J. Wysocki", "email": "rjw@sisk.pl", "time": "Tue May 10 21:10:13 2011 +0200" }, "committer": { "name": "Rafael J. Wysocki", "email": "rjw@sisk.pl", "time": "Wed May 11 21:10:58 2011 +0200" }, "message": "PM / Hibernate: Fix ioctl SNAPSHOT_S2RAM\n\nThe SNAPSHOT_S2RAM ioctl used for implementing the feature allowing\none to suspend to RAM after creating a hibernation image is currently\nbroken, because it doesn\u0027t clear the \"ready\" flag in the struct\nsnapshot_data object handled by it. As a result, the\nSNAPSHOT_UNFREEZE doesn\u0027t work correctly after SNAPSHOT_S2RAM has\nreturned and the user space hibernate task cannot thaw the other\nprocesses as appropriate. Make SNAPSHOT_S2RAM clear data-\u003eready\nto fix this problem.\n\nTested-by: Alexandre Felipe Muller de Souza \u003calexandrefm@mandriva.com.br\u003e\nSigned-off-by: Rafael J. Wysocki \u003crjw@sisk.pl\u003e\nCc: stable@kernel.org\n" }, { "commit": "9744997a8a2280e67984d4bffd87221d24f3b6b1", "tree": "fde6744d42fcd742fb1cd1532609a1f13a1cc42d", "parents": [ "87186475a402391a1ca7d42a675c9b35a18dc348" ], "author": { "name": "Rafael J. Wysocki", "email": "rjw@sisk.pl", "time": "Tue May 10 21:10:01 2011 +0200" }, "committer": { "name": "Rafael J. Wysocki", "email": "rjw@sisk.pl", "time": "Wed May 11 21:10:43 2011 +0200" }, "message": "PM / Hibernate: Make snapshot_release() restore GFP mask\n\nIf the process using the hibernate user space interface closes\n/dev/snapshot after creating a hibernation image without thawing\ntasks, snapshot_release() should call pm_restore_gfp_mask() to\nrestore the GFP mask used before the creation of the image. Make\nthat happen.\n\nTested-by: Alexandre Felipe Muller de Souza \u003calexandrefm@mandriva.com.br\u003e\nSigned-off-by: Rafael J. Wysocki \u003crjw@sisk.pl\u003e\nCc: stable@kernel.org\n" }, { "commit": "87186475a402391a1ca7d42a675c9b35a18dc348", "tree": "01b52ab26eb3b4fed09ca7fb11da4fcc1dddb32a", "parents": [ "54b333529df25b21da462c7dcc16c7dc779d9f26" ], "author": { "name": "Rafael J. Wysocki", "email": "rjw@sisk.pl", "time": "Tue May 10 21:09:53 2011 +0200" }, "committer": { "name": "Rafael J. Wysocki", "email": "rjw@sisk.pl", "time": "Wed May 11 21:10:14 2011 +0200" }, "message": "PM: Fix warning in pm_restrict_gfp_mask() during SNAPSHOT_S2RAM ioctl\n\nA warning is printed by pm_restrict_gfp_mask() while the\nSNAPSHOT_S2RAM ioctl is being executed after creating a hibernation\nimage, because pm_restrict_gfp_mask() has been called once already\nbefore the image creation and suspend_devices_and_enter() calls it\nonce again. This happens after commit 452aa6999e6703ffbddd7f6ea124d3\n(mm/pm: force GFP_NOIO during suspend/hibernation and resume).\n\nTo avoid this issue, move pm_restrict_gfp_mask() and\npm_restore_gfp_mask() from suspend_devices_and_enter() to its caller\nin kernel/power/suspend.c.\n\nReported-by: Alexandre Felipe Muller de Souza \u003calexandrefm@mandriva.com.br\u003e\nSigned-off-by: Rafael J. Wysocki \u003crjw@sisk.pl\u003e\nCc: stable@kernel.org\n" }, { "commit": "85eb8c8d0b0900c073b0e6f89979ac9c439ade1a", "tree": "ff3486424b60bb8de28ef76655d65cd0c1180449", "parents": [ "1d2b71f61b6a10216274e27b717becf9ae101fc7" ], "author": { "name": "Rafael J. Wysocki", "email": "rjw@sisk.pl", "time": "Sat Apr 30 00:25:44 2011 +0200" }, "committer": { "name": "Rafael J. Wysocki", "email": "rjw@sisk.pl", "time": "Sat Apr 30 00:25:44 2011 +0200" }, "message": "PM / Runtime: Generic clock manipulation rountines for runtime PM (v6)\n\nMany different platforms and subsystems may want to disable device\nclocks during suspend and enable them during resume which is going to\nbe done in a very similar way in all those cases. For this reason,\nprovide generic routines for the manipulation of device clocks during\nsuspend and resume.\n\nConvert the ARM shmobile platform to using the new routines.\n\nSigned-off-by: Rafael J. Wysocki \u003crjw@sisk.pl\u003e\n" }, { "commit": "2ca6f62f595c01f689b269db6736de5544da7667", "tree": "bfc4b2225ea1df64542c92dd8336420515072faa", "parents": [ "a1b49cb7e2a7961ec3aa8b64860bf480d4ec9077" ], "author": { "name": "Rafael J. Wysocki", "email": "rjw@sisk.pl", "time": "Mon Apr 18 23:58:59 2011 +0200" }, "committer": { "name": "Rafael J. Wysocki", "email": "rjw@sisk.pl", "time": "Mon Apr 18 23:58:59 2011 +0200" }, "message": "PM: Fix error code paths executed after failing syscore_suspend()\n\nIf syscore_suspend() fails in suspend_enter(), create_image() or\nresume_target_kernel(), it is necessary to call sysdev_resume(),\nbecause sysdev_suspend() has been called already and succeeded\nand we are going to abort the transition.\n\nSigned-off-by: Rafael J. Wysocki \u003crjw@sisk.pl\u003e\nAcked-by: Greg Kroah-Hartman \u003cgregkh@suse.de\u003e\n" }, { "commit": "d419e4c0f7584ffc5c72d9aeeaac485cc756ebcf", "tree": "6ba462ef5bf4ecc3abed7f1459199259e00c6ab4", "parents": [ "1f112cee07b314e244ee9e71d9c1e6950dc13327" ], "author": { "name": "Shriram Rajagopalan", "email": "rshriram@cs.ubc.ca", "time": "Mon Apr 11 22:54:48 2011 +0200" }, "committer": { "name": "Rafael J. Wysocki", "email": "rjw@sisk.pl", "time": "Mon Apr 11 22:54:48 2011 +0200" }, "message": "fix XEN_SAVE_RESTORE Kconfig dependencies\n\nMake XEN_SAVE_RESTORE select HIBERNATE_CALLBACKS.\nRemove XEN_SAVE_RESTORE dependency from PM_SLEEP.\n\nSigned-off-by: Shriram Rajagopalan \u003crshriram@cs.ubc.ca\u003e\nAcked-by: Ian Campbell \u003cian.campbell@citrix.com\u003e\nSigned-off-by: Rafael J. Wysocki \u003crjw@sisk.pl\u003e\n" }, { "commit": "1f112cee07b314e244ee9e71d9c1e6950dc13327", "tree": "e089e646c78701e37b4ebe00db36082e47cab2d5", "parents": [ "b42282e5a05018ecdc0d63a4ad530b0999785912" ], "author": { "name": "Rafael J. Wysocki", "email": "rjw@sisk.pl", "time": "Mon Apr 11 22:54:42 2011 +0200" }, "committer": { "name": "Rafael J. Wysocki", "email": "rjw@sisk.pl", "time": "Mon Apr 11 22:54:42 2011 +0200" }, "message": "PM / Hibernate: Introduce CONFIG_HIBERNATE_CALLBACKS\n\nXen save/restore is going to use hibernate device callbacks for\nquiescing devices and putting them back to normal operations and it\nwould need to select CONFIG_HIBERNATION for this purpose. However,\nthat also would cause the hibernate interfaces for user space to be\nenabled, which might confuse user space, because the Xen kernels\ndon\u0027t support hibernation. Moreover, it would be wasteful, as it\nwould make the Xen kernels include a substantial amount of code that\nthey would never use.\n\nTo address this issue introduce new power management Kconfig option\nCONFIG_HIBERNATE_CALLBACKS, such that it will only select the code\nthat is necessary for the hibernate device callbacks to work and make\nCONFIG_HIBERNATION select it. Then, Xen save/restore will be able to\nselect CONFIG_HIBERNATE_CALLBACKS without dragging the entire\nhibernate code along with it.\n\nSigned-off-by: Rafael J. Wysocki \u003crjw@sisk.pl\u003e\nTested-by: Shriram Rajagopalan \u003crshriram@cs.ubc.ca\u003e\n" }, { "commit": "25985edcedea6396277003854657b5f3cb31a628", "tree": "f026e810210a2ee7290caeb737c23cb6472b7c38", "parents": [ "6aba74f2791287ec407e0f92487a725a25908067" ], "author": { "name": "Lucas De Marchi", "email": "lucas.demarchi@profusion.mobi", "time": "Wed Mar 30 22:57:33 2011 -0300" }, "committer": { "name": "Lucas De Marchi", "email": "lucas.demarchi@profusion.mobi", "time": "Thu Mar 31 11:26:23 2011 -0300" }, "message": "Fix common misspellings\n\nFixes generated by \u0027codespell\u0027 and manually reviewed.\n\nSigned-off-by: Lucas De Marchi \u003clucas.demarchi@profusion.mobi\u003e\n" }, { "commit": "6c5103890057b1bb781b26b7aae38d33e4c517d8", "tree": "e6e57961dcddcb5841acb34956e70b9dc696a880", "parents": [ "3dab04e6978e358ad2307bca563fabd6c5d2c58b", "9d2e157d970a73b3f270b631828e03eb452d525e" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Thu Mar 24 10:16:26 2011 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Thu Mar 24 10:16:26 2011 -0700" }, "message": "Merge branch \u0027for-2.6.39/core\u0027 of git://git.kernel.dk/linux-2.6-block\n\n* \u0027for-2.6.39/core\u0027 of git://git.kernel.dk/linux-2.6-block: (65 commits)\n Documentation/iostats.txt: bit-size reference etc.\n cfq-iosched: removing unnecessary think time checking\n cfq-iosched: Don\u0027t clear queue stats when preempt.\n blk-throttle: Reset group slice when limits are changed\n blk-cgroup: Only give unaccounted_time under debug\n cfq-iosched: Don\u0027t set active queue in preempt\n block: fix non-atomic access to genhd inflight structures\n block: attempt to merge with existing requests on plug flush\n block: NULL dereference on error path in __blkdev_get()\n cfq-iosched: Don\u0027t update group weights when on service tree\n fs: assign sb-\u003es_bdi to default_backing_dev_info if the bdi is going away\n block: Require subsystems to explicitly allocate bio_set integrity mempool\n jbd2: finish conversion from WRITE_SYNC_PLUG to WRITE_SYNC and explicit plugging\n jbd: finish conversion from WRITE_SYNC_PLUG to WRITE_SYNC and explicit plugging\n fs: make fsync_buffers_list() plug\n mm: make generic_writepages() use plugging\n blk-cgroup: Add unaccounted time to timeslice_used.\n block: fixup plugging stubs for !CONFIG_BLOCK\n block: remove obsolete comments for blkdev_issue_zeroout.\n blktrace: Use rq-\u003ecmd_flags directly in blk_add_trace_rq.\n ...\n\nFix up conflicts in fs/{aio.c,super.c}\n" }, { "commit": "a44f99c7efdb88fa41128065c9a9445c19894e34", "tree": "9d9dc6026b2c0409eca05e360c98b8a688ccdb1e", "parents": [ "b87a2d3e3147bd140da2eae584772c353d11421b", "22942c00a6ad6e9e93b53811a6de72c821c15d22" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Sun Mar 20 18:14:55 2011 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Sun Mar 20 18:14:55 2011 -0700" }, "message": "Merge branch \u0027trivial\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/mmarek/kbuild-2.6\n\n* \u0027trivial\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/mmarek/kbuild-2.6: (25 commits)\n video: change to new flag variable\n scsi: change to new flag variable\n rtc: change to new flag variable\n rapidio: change to new flag variable\n pps: change to new flag variable\n net: change to new flag variable\n misc: change to new flag variable\n message: change to new flag variable\n memstick: change to new flag variable\n isdn: change to new flag variable\n ieee802154: change to new flag variable\n ide: change to new flag variable\n hwmon: change to new flag variable\n dma: change to new flag variable\n char: change to new flag variable\n fs: change to new flag variable\n xtensa: change to new flag variable\n um: change to new flag variables\n s390: change to new flag variable\n mips: change to new flag variable\n ...\n\nFix up trivial conflict in drivers/hwmon/Makefile\n" }, { "commit": "ed3cd4a86562eee79de25b567a00e648cc3dc2bf", "tree": "5450aa802661d5b6c000f071b6e42c0e5fd09aaa", "parents": [ "521cb40b0c44418a4fd36dc633f575813d59a43d" ], "author": { "name": "matt mooney", "email": "mfm@muteddisk.com", "time": "Fri Jan 14 06:12:24 2011 -0800" }, "committer": { "name": "Michal Marek", "email": "mmarek@suse.cz", "time": "Thu Mar 17 14:02:54 2011 +0100" }, "message": "kernel: change to new flag variable\n\nReplace EXTRA_CFLAGS with ccflags-y.\n\nSigned-off-by: matt mooney \u003cmfm@muteddisk.com\u003e\nAcked-by: WANG Cong \u003cxiyou.wangcong@gmail.com\u003e\nSigned-off-by: Michal Marek \u003cmmarek@suse.cz\u003e\n" }, { "commit": "bea3864fb627d110933cfb8babe048b63c4fc76e", "tree": "00cbe0edef293227d1cc441eab75ad1ded992df8", "parents": [ "40dc166cb5dddbd36aa4ad11c03915ea538f5a61" ], "author": { "name": "Rafael J. Wysocki", "email": "rjw@sisk.pl", "time": "Tue Mar 15 00:45:46 2011 +0100" }, "committer": { "name": "Rafael J. Wysocki", "email": "rjw@sisk.pl", "time": "Tue Mar 15 00:45:46 2011 +0100" }, "message": "PM / Hibernate: Reduce autotuned default image size\n\nThe hibernate image size autotuning mechanism sets the default\nimage size to 5/2 of the total system RAM, but it is reported\nthat on some systems device drivers allocate substantial\namounts of memory during suspend and the creation of the image\nfails as a result (too little memory is preallocated).\n\nModify the autotuning mechanism to use 1/3 instead of 2/5 of RAM\nas the default image size, which is reported to be sufficient for\nthe affected systems.\n\nReferences: https://bugzilla.kernel.org/show_bug.cgi?id\u003d30482\nReported-and-tested-by: Martin Steigerwald \u003cMartin@Lichtvoll.de\u003e\nSigned-off-by: Rafael J. Wysocki \u003crjw@sisk.pl\u003e\n" }, { "commit": "40dc166cb5dddbd36aa4ad11c03915ea538f5a61", "tree": "0a778159cf89ddee9e7d3134ae40569bdccd2a24", "parents": [ "f9b9e806ae0ede772cbb9916d9ac7354a123d044" ], "author": { "name": "Rafael J. Wysocki", "email": "rjw@sisk.pl", "time": "Tue Mar 15 00:43:46 2011 +0100" }, "committer": { "name": "Rafael J. Wysocki", "email": "rjw@sisk.pl", "time": "Tue Mar 15 00:43:46 2011 +0100" }, "message": "PM / Core: Introduce struct syscore_ops for core subsystems PM\n\nSome subsystems need to carry out suspend/resume and shutdown\noperations with one CPU on-line and interrupts disabled. The only\nway to register such operations is to define a sysdev class and\na sysdev specifically for this purpose which is cumbersome and\ninefficient. Moreover, the arguments taken by sysdev suspend,\nresume and shutdown callbacks are practically never necessary.\n\nFor this reason, introduce a simpler interface allowing subsystems\nto register operations to be executed very late during system suspend\nand shutdown and very early during resume in the form of\nstrcut syscore_ops objects.\n\nSigned-off-by: Rafael J. Wysocki \u003crjw@sisk.pl\u003e\nAcked-by: Greg Kroah-Hartman \u003cgregkh@suse.de\u003e\n" }, { "commit": "cf4fb80ca3d591cae366ae8364e3c3f7a68bd249", "tree": "d92ab61f074c896f733872c18c487bd6e1f820f0", "parents": [ "7538e3db6e015e890825fbd9f8659952896ddd5b" ], "author": { "name": "Jan Beulich", "email": "JBeulich@novell.com", "time": "Fri Feb 18 01:05:36 2011 +0100" }, "committer": { "name": "Rafael J. Wysocki", "email": "rjw@sisk.pl", "time": "Tue Mar 15 00:43:17 2011 +0100" }, "message": "PM: Simplify kernel/power/Kconfig\n\n\u0027n\u0027 defaults are pretty pointless and actually bogus when used with\nprompt-less config options.\n\nThe \"bool\"/\"default y\" pair with no prompt can be expressed more\ncompactly using def_bool.\n\n[rjw: Rebased on top of earlier patches modifying this file.]\n\nSigned-off-by: Jan Beulich \u003cjbeulich@novell.com\u003e\nSigned-off-by: Rafael J. Wysocki \u003crjw@sisk.pl\u003e\n" }, { "commit": "6831c6edc7b272a08dd2a6c71bb183a48fe98ae6", "tree": "fc3ef253f12bd9f2d211271c09a5475ed19b18b0", "parents": [ "e8665002477f0278f84f898145b1f141ba26ee26" ], "author": { "name": "Rafael J. Wysocki", "email": "rjw@sisk.pl", "time": "Tue Feb 15 21:22:24 2011 +0100" }, "committer": { "name": "Rafael J. Wysocki", "email": "rjw@sisk.pl", "time": "Tue Mar 15 00:43:16 2011 +0100" }, "message": "PM: Drop pm_flags that is not necessary\n\nThe variable pm_flags is used to prevent APM from being enabled\nalong with ACPI, which would lead to problems. However, acpi_init()\nis always called before apm_init() and after acpi_init() has\nreturned, it is known whether or not ACPI will be used. Namely, if\nacpi_disabled is not set after acpi_init() has returned, this means\nthat ACPI is enabled. Thus, it is sufficient to check acpi_disabled\nin apm_init() to prevent APM from being enabled in parallel with\nACPI.\n\nSigned-off-by: Rafael J. Wysocki \u003crjw@sisk.pl\u003e\nAcked-by: Len Brown \u003clen.brown@intel.com\u003e\n" }, { "commit": "88a6f33e4d7143f94f8e787fa4065ac873507984", "tree": "56b29073b70e9448bb5e89ae63214fbad7a752c4", "parents": [ "aa33860158114d0df3c7997bc1dd41c0168e1c2a" ], "author": { "name": "Rafael J. Wysocki", "email": "rjw@sisk.pl", "time": "Fri Feb 11 20:31:11 2011 +0100" }, "committer": { "name": "Rafael J. Wysocki", "email": "rjw@sisk.pl", "time": "Tue Mar 15 00:43:15 2011 +0100" }, "message": "PM: Clean up PM_TRACE dependencies and drop unnecessary Kconfig option\n\nCONFIG_PM_SLEEP_ADVANCED_DEBUG is not used any more, so drop it\nand CONFIG_CAN_PM_TRACE need not depend on EXPERIMENTAL, so remove\nthat dependency.\n\nSigned-off-by: Rafael J. Wysocki \u003crjw@sisk.pl\u003e\n" }, { "commit": "aa33860158114d0df3c7997bc1dd41c0168e1c2a", "tree": "a1ae98c42232835780618b0a5dea78c5478ed58c", "parents": [ "196ec243224bb38fc5c41d9fa4050f70708b7fb4" ], "author": { "name": "Rafael J. Wysocki", "email": "rjw@sisk.pl", "time": "Fri Feb 11 00:06:54 2011 +0100" }, "committer": { "name": "Rafael J. Wysocki", "email": "rjw@sisk.pl", "time": "Tue Mar 15 00:43:15 2011 +0100" }, "message": "PM: Remove CONFIG_PM_OPS\n\nAfter redefining CONFIG_PM to depend on (CONFIG_PM_SLEEP ||\nCONFIG_PM_RUNTIME) the CONFIG_PM_OPS option is redundant and can be\nreplaced with CONFIG_PM.\n\nSigned-off-by: Rafael J. Wysocki \u003crjw@sisk.pl\u003e\n" }, { "commit": "196ec243224bb38fc5c41d9fa4050f70708b7fb4", "tree": "691695deb4098c2bc2aedee45f8fb0d38e14555c", "parents": [ "1eb208aea3179dd2fc0cdeea45ef869d75b4fe70" ], "author": { "name": "Rafael J. Wysocki", "email": "rjw@sisk.pl", "time": "Fri Feb 11 00:06:42 2011 +0100" }, "committer": { "name": "Rafael J. Wysocki", "email": "rjw@sisk.pl", "time": "Tue Mar 15 00:43:15 2011 +0100" }, "message": "PM: Reorder power management Kconfig options\n\nReorder configuration options in kernel/power/Kconfig so that\nthe options depended on are at the top of the list.\n\nThis patch doesn\u0027t introduce any functional changes.\n\nSigned-off-by: Rafael J. Wysocki \u003crjw@sisk.pl\u003e\n" }, { "commit": "1eb208aea3179dd2fc0cdeea45ef869d75b4fe70", "tree": "aa90c2ef7ca7e425b98123e6f9a9a821c6b0201f", "parents": [ "cd51e61cf4e8b220da37dc35e9c2dc2dc258b4de" ], "author": { "name": "Rafael J. Wysocki", "email": "rjw@sisk.pl", "time": "Fri Feb 11 00:06:30 2011 +0100" }, "committer": { "name": "Rafael J. Wysocki", "email": "rjw@sisk.pl", "time": "Tue Mar 15 00:43:15 2011 +0100" }, "message": "PM: Make CONFIG_PM depend on (CONFIG_PM_SLEEP || CONFIG_PM_RUNTIME)\n\nFrom the users\u0027 point of view CONFIG_PM is really only used for\nmaking it possible to set CONFIG_SUSPEND, CONFIG_HIBERNATION,\nCONFIG_PM_RUNTIME and (surprisingly enough) CONFIG_XEN_SAVE_RESTORE\n(CONFIG_PM_OPP also depends on CONFIG_PM, but quite artificially).\nHowever, both CONFIG_SUSPEND and CONFIG_HIBERNATION require platform\nsupport (independent of CONFIG_PM) and it is not quite obvious that\nCONFIG_PM has to be set for CONFIG_XEN_SAVE_RESTORE to be available.\nThus, from the users\u0027 point of view, it would be more logical to\nautomatically select CONFIG_PM if any of the above options depending\non it are set.\n\nMake CONFIG_PM depend on (CONFIG_PM_SLEEP || CONFIG_PM_RUNTIME),\nwhich will cause it to be selected when any of CONFIG_SUSPEND,\nCONFIG_HIBERNATION, CONFIG_PM_RUNTIME, CONFIG_XEN_SAVE_RESTORE is\nset and will clarify its meaning.\n\nSigned-off-by: Rafael J. Wysocki \u003crjw@sisk.pl\u003e\n" }, { "commit": "cd51e61cf4e8b220da37dc35e9c2dc2dc258b4de", "tree": "f2cb7a54e59b0bc238ac14f226214e0fc0817891", "parents": [ "cb8f51bdadb7969139c2e39c2defd4cde98c1ea8" ], "author": { "name": "Rafael J. Wysocki", "email": "rjw@sisk.pl", "time": "Fri Feb 11 00:04:52 2011 +0100" }, "committer": { "name": "Rafael J. Wysocki", "email": "rjw@sisk.pl", "time": "Tue Mar 15 00:43:15 2011 +0100" }, "message": "PM / ACPI: Remove references to pm_flags from bus.c\n\nIf direct references to pm_flags are removed from drivers/acpi/bus.c,\nCONFIG_ACPI will not need to depend on CONFIG_PM any more. Make that\nhappen.\n\nSigned-off-by: Rafael J. Wysocki \u003crjw@sisk.pl\u003e\nAcked-by: Len Brown \u003clen.brown@intel.com\u003e\n" }, { "commit": "721a9602e6607417c6bc15b18e97a2f35266c690", "tree": "4987991e43f35b8b3b685fea0040c5265b578996", "parents": [ "cf15900e1209d5b46ec2d24643adbf561830935f" ], "author": { "name": "Jens Axboe", "email": "jaxboe@fusionio.com", "time": "Wed Mar 09 11:56:30 2011 +0100" }, "committer": { "name": "Jens Axboe", "email": "jaxboe@fusionio.com", "time": "Thu Mar 10 08:52:27 2011 +0100" }, "message": "block: kill off REQ_UNPLUG\n\nWith the plugging now being explicitly controlled by the\nsubmitter, callers need not pass down unplugging hints\nto the block layer. If they want to unplug, it\u0027s because they\nmanually plugged on their own - in which case, they should just\nunplug at will.\n\nSigned-off-by: Jens Axboe \u003cjaxboe@fusionio.com\u003e\n" }, { "commit": "bc3adfc6703edfd2484902b5391092c717076f87", "tree": "9df3b216990f6b321095bcc6c35444f5e0d8165c", "parents": [ "3c18d4de86e4a7f93815c081e50e0543fa27200f", "3233cdbd9fa347a6d6897a94cc6ed0302ae83c4f" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Fri Feb 18 12:36:06 2011 -0800" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Fri Feb 18 12:36:06 2011 -0800" }, "message": "Merge branch \u0027fixes-2.6.38\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/tj/wq\n\n* \u0027fixes-2.6.38\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/tj/wq:\n workqueue: make sure MAYDAY_INITIAL_TIMEOUT is at least 2 jiffies long\n workqueue, freezer: unify spelling of \u0027freeze\u0027 + \u0027able\u0027 to \u0027freezable\u0027\n workqueue: wake up a worker when a rescuer is leaving a gcwq\n" }, { "commit": "2e725a065b0153f0c449318da1923a120477633d", "tree": "df20fb290a597d076db86b78cc1931838aba3d0b", "parents": [ "a2640111d5edb3f4e6dd6089c0dbddc7590110b4" ], "author": { "name": "Stanislaw Gruszka", "email": "stf_xl@pop3.wp.pl", "time": "Sat Feb 12 21:06:51 2011 +0100" }, "committer": { "name": "Rafael J. Wysocki", "email": "rjw@sisk.pl", "time": "Wed Feb 16 21:53:52 2011 +0100" }, "message": "PM / Hibernate: Return error code when alloc_image_page() fails\n\nCurrently we return 0 in swsusp_alloc() when alloc_image_page() fails.\nFix that. Also remove unneeded \"error\" variable since the only\nuseful value of error is -ENOMEM.\n\n[rjw: Fixed up the changelog and changed subject.]\n\nSigned-off-by: Stanislaw Gruszka \u003cstf_xl@wp.pl\u003e\nCc: stable@kernel.org\nSigned-off-by: Rafael J. Wysocki \u003crjw@sisk.pl\u003e\n" }, { "commit": "58a69cb47ec6991bf006a3e5d202e8571b0327a4", "tree": "56abdf817649c352f70bff3263f9351ed6c42062", "parents": [ "7576958a9d5a4a677ad7dd40901cdbb6c1110c98" ], "author": { "name": "Tejun Heo", "email": "tj@kernel.org", "time": "Wed Feb 16 09:25:31 2011 +0100" }, "committer": { "name": "Tejun Heo", "email": "tj@kernel.org", "time": "Wed Feb 16 17:48:59 2011 +0100" }, "message": "workqueue, freezer: unify spelling of \u0027freeze\u0027 + \u0027able\u0027 to \u0027freezable\u0027\n\nThere are two spellings in use for \u0027freeze\u0027 + \u0027able\u0027 - \u0027freezable\u0027 and\n\u0027freezeable\u0027. The former is the more prominent one. The latter is\nmostly used by workqueue and in a few other odd places. Unify the\nspelling to \u0027freezable\u0027.\n\nSigned-off-by: Tejun Heo \u003ctj@kernel.org\u003e\nReported-by: Alan Stern \u003cstern@rowland.harvard.edu\u003e\nAcked-by: \"Rafael J. Wysocki\" \u003crjw@sisk.pl\u003e\nAcked-by: Greg Kroah-Hartman \u003cgregkh@suse.de\u003e\nAcked-by: Dmitry Torokhov \u003cdtor@mail.ru\u003e\nCc: David Woodhouse \u003cdwmw2@infradead.org\u003e\nCc: Alex Dubov \u003coakad@yahoo.com\u003e\nCc: \"David S. Miller\" \u003cdavem@davemloft.net\u003e\nCc: Steven Whitehouse \u003cswhiteho@redhat.com\u003e\n" }, { "commit": "52cfd503ad7176d23a5dd7af3981744feb60622f", "tree": "0a8aeaaf4acbc86ac682f18632b8070c1c6b7ba1", "parents": [ "dc8e7e3ec60bd5ef7868aa88755e9d4c948dc5cc", "4263d9a3ae4d15785897d0543bb59316c84ee605" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Thu Jan 13 20:15:35 2011 -0800" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Thu Jan 13 20:15:35 2011 -0800" }, "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: (59 commits)\n ACPI / PM: Fix build problems for !CONFIG_ACPI related to NVS rework\n ACPI: fix resource check message\n ACPI / Battery: Update information on info notification and resume\n ACPI: Drop device flag wake_capable\n ACPI: Always check if _PRW is present before trying to evaluate it\n ACPI / PM: Check status of power resources under mutexes\n ACPI / PM: Rename acpi_power_off_device()\n ACPI / PM: Drop acpi_power_nocheck\n ACPI / PM: Drop acpi_bus_get_power()\n Platform / x86: Make fujitsu_laptop use acpi_bus_update_power()\n ACPI / Fan: Rework the handling of power resources\n ACPI / PM: Register power resource devices as soon as they are needed\n ACPI / PM: Register acpi_power_driver early\n ACPI / PM: Add function for updating device power state consistently\n ACPI / PM: Add function for device power state initialization\n ACPI / PM: Introduce __acpi_bus_get_power()\n ACPI / PM: Introduce function for refcounting device power resources\n ACPI / PM: Add functions for manipulating lists of power resources\n ACPI / PM: Prevent acpi_power_get_inferred_state() from making changes\n ACPICA: Update version to 20101209\n ...\n" }, { "commit": "275220f0fcff1adf28a717076e00f575edf05fda", "tree": "d249bccc80c64443dab211639050c4fb14332648", "parents": [ "fe3c560b8a22cb28e54fe8950abef38e88d75831", "81c5e2ae33c4b19e53966b427e33646bf6811830" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Thu Jan 13 10:45:01 2011 -0800" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Thu Jan 13 10:45:01 2011 -0800" }, "message": "Merge branch \u0027for-2.6.38/core\u0027 of git://git.kernel.dk/linux-2.6-block\n\n* \u0027for-2.6.38/core\u0027 of git://git.kernel.dk/linux-2.6-block: (43 commits)\n block: ensure that completion error gets properly traced\n blktrace: add missing probe argument to block_bio_complete\n block cfq: don\u0027t use atomic_t for cfq_group\n block cfq: don\u0027t use atomic_t for cfq_queue\n block: trace event block fix unassigned field\n block: add internal hd part table references\n block: fix accounting bug on cross partition merges\n kref: add kref_test_and_get\n bio-integrity: mark kintegrityd_wq highpri and CPU intensive\n block: make kblockd_workqueue smarter\n Revert \"sd: implement sd_check_events()\"\n block: Clean up exit_io_context() source code.\n Fix compile warnings due to missing removal of a \u0027ret\u0027 variable\n fs/block: type signature of major_to_index(int) to major_to_index(unsigned)\n block: convert !IS_ERR(p) \u0026\u0026 p to !IS_ERR_NOR_NULL(p)\n cfq-iosched: don\u0027t check cfqg in choose_service_tree()\n fs/splice: Pull buf-\u003eops-\u003econfirm() from splice_from_pipe actors\n cdrom: export cdrom_check_events()\n sd: implement sd_check_events()\n sr: implement sr_check_events()\n ...\n" }, { "commit": "008d23e4852d78bb2618f2035f8b2110b6a6b968", "tree": "81c88f744f6f3fc84132527c1ddc0b4da410c5e2", "parents": [ "8f685fbda43deccd130d192c9fcef1444649eaca", "bfc672dcf323877228682aff79dff8ecd9f30ff8" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Thu Jan 13 10:05:56 2011 -0800" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Thu Jan 13 10:05:56 2011 -0800" }, "message": "Merge branch \u0027for-next\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/trivial\n\n* \u0027for-next\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/trivial: (43 commits)\n Documentation/trace/events.txt: Remove obsolete sched_signal_send.\n writeback: fix global_dirty_limits comment runtime -\u003e real-time\n ppc: fix comment typo singal -\u003e signal\n drivers: fix comment typo diable -\u003e disable.\n m68k: fix comment typo diable -\u003e disable.\n wireless: comment typo fix diable -\u003e disable.\n media: comment typo fix diable -\u003e disable.\n remove doc for obsolete dynamic-printk kernel-parameter\n remove extraneous \u0027is\u0027 from Documentation/iostats.txt\n Fix spelling milisec -\u003e ms in snd_ps3 module parameter description\n Fix spelling mistakes in comments\n Revert conflicting V4L changes\n i7core_edac: fix typos in comments\n mm/rmap.c: fix comment\n sound, ca0106: Fix assignment to \u0027channel\u0027.\n hrtimer: fix a typo in comment\n init/Kconfig: fix typo\n anon_inodes: fix wrong function name in comment\n fix comment typos concerning \"consistent\"\n poll: fix a typo in comment\n ...\n\nFix up trivial conflicts in:\n - drivers/net/wireless/iwlwifi/iwl-core.c (moved to iwl-legacy.c)\n - fs/ext4/ext4.h\n\nAlso fix missed \u0027diabled\u0027 typo in drivers/net/bnx2x/bnx2x.h while at it.\n" }, { "commit": "c8940eca75e6d1ea57f6c491a30bd1023c64c9ad", "tree": "d68944ab9fa8ba3c77b18edc2bd836c7e355b23e", "parents": [ "78c92a9fd4b6abbbc1fe1ec335c697cb4e63f252", "3ae22e8c8ac39daf88ae32f047fb23825be7c646" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Mon Jan 10 08:14:53 2011 -0800" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Mon Jan 10 08:14:53 2011 -0800" }, "message": "Merge branch \u0027for-linus\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/rafael/suspend-2.6\n\n* \u0027for-linus\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/rafael/suspend-2.6:\n spi / PM: Support dev_pm_ops\n PM: Prototype the pm_generic_ operations\n PM / Runtime: Generic resume shouldn\u0027t set RPM_ACTIVE unconditionally\n PM: Use dev_name() in core device suspend and resume routines\n PM: Permit registration of parentless devices during system suspend\n PM: Replace the device power.status field with a bit field\n PM: Remove redundant checks from core device resume routines\n PM: Use a different list of devices for each stage of device suspend\n PM: Avoid compiler warning in pm_noirq_op()\n PM: Use pm_wakeup_pending() in __device_suspend()\n PM / Wakeup: Replace pm_check_wakeup_events() with pm_wakeup_pending()\n PM: Prevent dpm_prepare() from returning errors unnecessarily\n PM: Fix references to basic-pm-debugging.txt in drivers-testing.txt\n PM / Runtime: Add synchronous runtime interface for interrupt handlers (v3)\n PM / Hibernate: When failed, in_suspend should be reset\n PM / Hibernate: hibernation_ops-\u003eleave should be checked too\n Freezer: Fix a race during freezing of TASK_STOPPED tasks\n PM: Use proper ccflag flag in kernel/power/Makefile\n PM / Runtime: Fix comments to match runtime callback code\n" }, { "commit": "976513dbfc1547c7b1822566923058655f0c32fd", "tree": "561e658e65a0136691cc9faebbe1ddf17a3429d3", "parents": [ "26fcaf60fe3861409eb4c455c5c0d0f00f599b08" ], "author": { "name": "Rafael J. Wysocki", "email": "rjw@sisk.pl", "time": "Fri Jan 07 01:43:44 2011 +0100" }, "committer": { "name": "Len Brown", "email": "len.brown@intel.com", "time": "Fri Jan 07 00:36:55 2011 -0500" }, "message": "PM / ACPI: Move NVS saving and restoring code to drivers/acpi\n\nThe saving of the ACPI NVS area during hibernation and suspend and\nrestoring it during the subsequent resume is entirely specific to\nACPI, so move it to drivers/acpi and drop the CONFIG_SUSPEND_NVS\nconfiguration option which is redundant.\n\nSigned-off-by: Rafael J. Wysocki \u003crjw@sisk.pl\u003e\nSigned-off-by: Len Brown \u003clen.brown@intel.com\u003e\n" }, { "commit": "26fcaf60fe3861409eb4c455c5c0d0f00f599b08", "tree": "43b0b91df3a1c8d136b63ce499001a05c9a02c93", "parents": [ "3c0eee3fe6a3a1c745379547c7e7c904aa64f6d5" ], "author": { "name": "Jiri Slaby", "email": "jslaby@suse.cz", "time": "Fri Jan 07 01:42:31 2011 +0100" }, "committer": { "name": "Len Brown", "email": "len.brown@intel.com", "time": "Fri Jan 07 00:26:45 2011 -0500" }, "message": "PM: Fix oops in suspend/hibernate code related to failing ioremap()\n\nWhen ioremap() fails (which might happen for some reason), we nicely\noops in suspend_nvs_save() due to NULL dereference by memcpy() in there.\nFail gracefully instead.\n\nSigned-off-by: Jiri Slaby \u003cjslaby@suse.cz\u003e\nSigned-off-by: Rafael J. Wysocki \u003crjw@sisk.pl\u003e\nSigned-off-by: Len Brown \u003clen.brown@intel.com\u003e\n" }, { "commit": "938cfed18bec2c7361f37efc954712a7cc42c353", "tree": "39aa3792d84ae74d7c5cbf7c14779ebe5b221e31", "parents": [ "eccdfe2d245a882feacc4630c9bc29805e9929c8" ], "author": { "name": "Jean Pihet", "email": "j-pihet@ti.com", "time": "Wed Jan 05 19:49:01 2011 +0100" }, "committer": { "name": "Ingo Molnar", "email": "mingo@elte.hu", "time": "Wed Jan 05 21:25:28 2011 +0100" }, "message": "perf: Add calls to suspend trace point\n\nUses the machine_suspend trace point, called from the\ngeneric kernel suspend_devices_and_enter function.\n\nSigned-off-by: Jean Pihet \u003cj-pihet@ti.com\u003e\nAcked-by: Rafael J. Wysocki \u003crjw@sisk.pl\u003e\nCc: Arjan van de Ven \u003carjan@linux.intel.com\u003e\nCC: Thomas Renninger \u003ctrenn@suse.de\u003e\nCc: Len Brown \u003clen.brown@intel.com\u003e\nCc: Pavel Machek \u003cpavel@ucw.cz\u003e\nCc: Steven Rostedt \u003crostedt@goodmis.org\u003e\nCc: Arnaldo Carvalho de Melo \u003cacme@redhat.com\u003e\nCc: Peter Zijlstra \u003ca.p.zijlstra@chello.nl\u003e\nCc: linux-pm@lists.linux-foundation.org\nLKML-Reference: \u003c1294253342-29056-2-git-send-email-j-pihet@ti.com\u003e\nSigned-off-by: Ingo Molnar \u003cmingo@elte.hu\u003e\n" }, { "commit": "a2867e08c8e3bdbc00caf56bc3bdde19ccc058e3", "tree": "34cee3dede448f30bb100d8301c422f481678bcc", "parents": [ "1e75227ef0571031cd18536ab768ee35667ec5b9" ], "author": { "name": "Rafael J. Wysocki", "email": "rjw@sisk.pl", "time": "Fri Dec 03 22:58:31 2010 +0100" }, "committer": { "name": "Rafael J. Wysocki", "email": "rjw@sisk.pl", "time": "Fri Dec 24 15:02:42 2010 +0100" }, "message": "PM / Wakeup: Replace pm_check_wakeup_events() with pm_wakeup_pending()\n\nTo avoid confusion with the meaning and return value of\npm_check_wakeup_events() replace it with pm_wakeup_pending() that\nwill work the other way around (ie. return true when system-wide\npower transition should be aborted).\n\nSigned-off-by: Rafael J. Wysocki \u003crjw@sisk.pl\u003e\n" }, { "commit": "5262a47502adcfc3a64403120768f528418a3b79", "tree": "5c60e077979fd3d8eed966493b2afaa026b62022", "parents": [ "5729c63a51f0f8a351e0f1dc7b3250ebac12c309" ], "author": { "name": "MyungJoo Ham", "email": "myungjoo.ham@samsung.com", "time": "Fri Nov 26 23:07:56 2010 +0100" }, "committer": { "name": "Rafael J. Wysocki", "email": "rjw@sisk.pl", "time": "Fri Dec 24 15:02:40 2010 +0100" }, "message": "PM / Hibernate: When failed, in_suspend should be reset\n\nWhen hibernation failed due to an error in swsusp_write() called by\nhibernate(), it skips calling \"power_down()\" and returns. When\nhibernate() is called again (probably after fixing up so that\nswsusp_write() wouldn\u0027t fail again), before \"in_suspend \u003d 1\" of\ncreate_image is called, in_suspend should be 0. However, because\nhibernate() did not reset \"in_suspend\" after a failure, it\u0027s already 1.\n\nThis patch fixes such inconsistency of \"in_suspend\" value.\n\nSigned-off-by: MyungJoo Ham \u003cmyungjoo.ham@samsung.com\u003e\nSigned-off-by: Kyungmin Park \u003ckyungmin.park@samsung.com\u003e\nSigned-off-by: Rafael J. Wysocki \u003crjw@sisk.pl\u003e\n" }, { "commit": "5729c63a51f0f8a351e0f1dc7b3250ebac12c309", "tree": "739030dfbc26519ec7fd813d797f9865678df11d", "parents": [ "8cfe400ca54fd1ed96f962bea5f7e20b09b6d69f" ], "author": { "name": "MyungJoo Ham", "email": "myungjoo.ham@samsung.com", "time": "Fri Nov 26 23:07:48 2010 +0100" }, "committer": { "name": "Rafael J. Wysocki", "email": "rjw@sisk.pl", "time": "Fri Dec 24 15:02:40 2010 +0100" }, "message": "PM / Hibernate: hibernation_ops-\u003eleave should be checked too\n\nBecause hibernate calls hibernation_ops-\u003eleave() without checking\nwhether hibernation_ops-\u003eleave is NULL or not, hiberantion_set_ops\nshould WARN_ON if hibernation_ops-\u003eleave is NULL.\n\nThis patch added one more condition to check hibernation_ops-\u003eleave.\n\nSigned-off-by: MyungJoo Ham \u003cmyungjoo.ham@samsung.com\u003e\nSigned-off-by: Kyungmin Park \u003ckyungmin.park@samsung.com\u003e\nAcked-by: Pavel Machek \u003cpavel@ucw.cz\u003e\nSigned-off-by: Rafael J. Wysocki \u003crjw@sisk.pl\u003e\n" }, { "commit": "8cfe400ca54fd1ed96f962bea5f7e20b09b6d69f", "tree": "393f1eb68d2497b04778c2e062fc4e1450df33eb", "parents": [ "133f1128b2bf178a1976b17c54bd14ce6feb90bf" ], "author": { "name": "Tejun Heo", "email": "tj@kernel.org", "time": "Fri Nov 26 23:07:27 2010 +0100" }, "committer": { "name": "Rafael J. Wysocki", "email": "rjw@sisk.pl", "time": "Fri Dec 24 15:02:40 2010 +0100" }, "message": "Freezer: Fix a race during freezing of TASK_STOPPED tasks\n\nAfter calling freeze_task(), try_to_freeze_tasks() see whether the\ntask is stopped or traced and if so, considers it to be frozen;\nhowever, nothing guarantees that either the task being frozen sees\nTIF_FREEZE or the freezer sees TASK_STOPPED -\u003e TASK_RUNNING\ntransition. The task being frozen may wake up and not see TIF_FREEZE\nwhile the freezer fails to notice the transition and believes the task\nis still stopped.\n\nThis patch fixes the race by making freeze_task() always go through\nfake_signal_wake_up() for applicable tasks. The function goes through\nthe target task\u0027s scheduler lock and thus guarantees that either the\ntarget sees TIF_FREEZE or try_to_freeze_task() sees TASK_RUNNING.\n\nSigned-off-by: Tejun Heo \u003ctj@kernel.org\u003e\nSigned-off-by: Rafael J. Wysocki \u003crjw@sisk.pl\u003e\n" }, { "commit": "133f1128b2bf178a1976b17c54bd14ce6feb90bf", "tree": "206b00394eb2f0df8025a64304de46786d4ae55f", "parents": [ "6675bc056790b403d198a173498d377187754142" ], "author": { "name": "Tracey Dent", "email": "tdent48227@gmail.com", "time": "Thu Nov 25 23:41:29 2010 +0100" }, "committer": { "name": "Rafael J. Wysocki", "email": "rjw@sisk.pl", "time": "Fri Dec 24 15:02:40 2010 +0100" }, "message": "PM: Use proper ccflag flag in kernel/power/Makefile\n\nUse the ccflags-$ flag instead of EXTRA_CFLAGS because EXTRA_CFLAGS is\ndeprecated and should now be switched. According to\n(documentation/kbuild/makefiles.txt).\n\nSigned-off-by: Tracey Dent \u003ctdent48227@gmail.com\u003e\nSigned-off-by: Rafael J. Wysocki \u003crjw@sisk.pl\u003e\n" }, { "commit": "4b7bd364700d9ac8372eff48832062b936d0793b", "tree": "0dbf78c95456a0b02d07fcd473281f04a87e266d", "parents": [ "c0d8768af260e2cbb4bf659ae6094a262c86b085", "90a8a73c06cc32b609a880d48449d7083327e11a" ], "author": { "name": "Jiri Kosina", "email": "jkosina@suse.cz", "time": "Wed Dec 22 18:57:02 2010 +0100" }, "committer": { "name": "Jiri Kosina", "email": "jkosina@suse.cz", "time": "Wed Dec 22 18:57:02 2010 +0100" }, "message": "Merge branch \u0027master\u0027 into for-next\n\nConflicts:\n\tMAINTAINERS\n\tarch/arm/mach-omap2/pm24xx.c\n\tdrivers/scsi/bfa/bfa_fcpim.c\n\nNeeded to update to apply fixes for which the old branch was too\noutdated.\n" }, { "commit": "be8cd644c49dca4212e975455c8e7119b848ebe8", "tree": "5c7c7aa4ab10c823381918f91d0d475acea49aec", "parents": [ "1497dd1d29c6a53fcd3c80f7ac8d0e0239e7389e" ], "author": { "name": "Rafael J. Wysocki", "email": "rjw@sisk.pl", "time": "Sat Dec 11 21:46:44 2010 +0100" }, "committer": { "name": "Rafael J. Wysocki", "email": "rjw@sisk.pl", "time": "Thu Dec 16 17:08:58 2010 +0100" }, "message": "PM / Hibernate: Restore old swap signature to avoid user space breakage\n\nCommit 3624eb0 (PM / Hibernate: Modify signature used to mark swap)\nattempted to modify hibernate signature used to mark swap partitions\ncontaining hibernation images, so that old kernels don\u0027t try to\nhandle compressed images. However, this change broke resume from\nhibernation on Fedora 14 that apparently doesn\u0027t pass the resume\u003d\nargument to the kernel and tries to trigger resume from early user\nspace. This doesn\u0027t work, because the signature is now different,\nso the old signature has to be restored to avoid the problem.\n\nAddresses https://bugzilla.kernel.org/show_bug.cgi?id\u003d22732 .\n\nReported-by: Dr. David Alan Gilbert \u003clinux@treblig.org\u003e\nReported-by: Zhang Rui \u003crui.zhang@intel.com\u003e\nReported-by: Pascal Chapperon \u003cpascal.chapperon@wanadoo.fr\u003e\nSigned-off-by: Rafael J. Wysocki \u003crjw@sisk.pl\u003e\n" }, { "commit": "1497dd1d29c6a53fcd3c80f7ac8d0e0239e7389e", "tree": "5c5fa252c06826d2bcfd3121698c79eeba613d8a", "parents": [ "b0c3844d8af6b9f3f18f31e1b0502fbefa2166be" ], "author": { "name": "Takashi Iwai", "email": "tiwai@suse.de", "time": "Fri Dec 10 00:16:39 2010 +0100" }, "committer": { "name": "Rafael J. Wysocki", "email": "rjw@sisk.pl", "time": "Thu Dec 16 17:08:43 2010 +0100" }, "message": "PM / Hibernate: Fix PM_POST_* notification with user-space suspend\n\nThe user-space hibernation sends a wrong notification after the image\nrestoration because of thinko for the file flag check. RDONLY\ncorresponds to hibernation and WRONLY to restoration, confusingly.\n\nSigned-off-by: Takashi Iwai \u003ctiwai@suse.de\u003e\nSigned-off-by: Rafael J. Wysocki \u003crjw@sisk.pl\u003e\nCc: stable@kernel.org\n" }, { "commit": "c9e664f1fdf34aa8cede047b206deaa8f1945af0", "tree": "6038002f46173ca785936ac2fe54177197f98a08", "parents": [ "9f339caf8454f0c21983111350ede93983db4340" ], "author": { "name": "Rafael J. Wysocki", "email": "rjw@sisk.pl", "time": "Fri Dec 03 22:57:45 2010 +0100" }, "committer": { "name": "Rafael J. Wysocki", "email": "rjw@sisk.pl", "time": "Mon Dec 06 23:52:08 2010 +0100" }, "message": "PM / Hibernate: Fix memory corruption related to swap\n\nThere is a problem that swap pages allocated before the creation of\na hibernation image can be released and used for storing the contents\nof different memory pages while the image is being saved. Since the\nkernel stored in the image doesn\u0027t know of that, it causes memory\ncorruption to occur after resume from hibernation, especially on\nsystems with relatively small RAM that need to swap often.\n\nThis issue can be addressed by keeping the GFP_IOFS bits clear\nin gfp_allowed_mask during the entire hibernation, including the\nsaving of the image, until the system is finally turned off or\nthe hibernation is aborted. Unfortunately, for this purpose\nit\u0027s necessary to rework the way in which the hibernate and\nsuspend code manipulates gfp_allowed_mask.\n\nThis change is based on an earlier patch from Hugh Dickins.\n\nSigned-off-by: Rafael J. Wysocki \u003crjw@sisk.pl\u003e\nReported-by: Ondrej Zary \u003clinux@rainbow-software.org\u003e\nAcked-by: Hugh Dickins \u003chughd@google.com\u003e\nReviewed-by: KAMEZAWA Hiroyuki \u003ckamezawa.hiroyu@jp.fujitsu.com\u003e\nCc: stable@kernel.org\n" }, { "commit": "9f339caf8454f0c21983111350ede93983db4340", "tree": "ebe959b206b1edfd4d3976617527d43d3858b00c", "parents": [ "698fd6a2c3ca05ec796072defb5c415289a86cdc" ], "author": { "name": "Bojan Smojver", "email": "bojan@rexursive.com", "time": "Thu Nov 25 23:41:39 2010 +0100" }, "committer": { "name": "Rafael J. Wysocki", "email": "rjw@sisk.pl", "time": "Mon Dec 06 23:38:29 2010 +0100" }, "message": "PM / Hibernate: Use async I/O when reading compressed hibernation image\n\nThis is a fix for reading LZO compressed image using async I/O.\nEssentially, instead of having just one page into which we keep\nreading blocks from swap, we allocate enough of them to cover the\nlargest compressed size and then let block I/O pick them all up. Once\nwe have them all (and here we wait), we decompress them, as usual.\nObviously, the very first block we still pick up synchronously,\nbecause we need to know the size of the lot before we pick up the\nrest.\n\nAlso fixed the copyright line, which I\u0027ve forgotten before.\n\nSigned-off-by: Bojan Smojver \u003cbojan@rexursive.com\u003e\nSigned-off-by: Rafael J. Wysocki \u003crjw@sisk.pl\u003e\n" }, { "commit": "2f55ac072f5344519348c0c94b3d2f4cca46847b", "tree": "f3d544ab2812503b12a205b2515111a796638ffb", "parents": [ "acc2472ed33fc5e72482cc3b3b846077d97c2f8b" ], "author": { "name": "Lionel Debroux", "email": "lionel_debroux@yahoo.fr", "time": "Tue Nov 16 14:14:02 2010 +0100" }, "committer": { "name": "Jiri Kosina", "email": "jkosina@suse.cz", "time": "Tue Nov 16 14:14:02 2010 +0100" }, "message": "suspend: constify platform_suspend_ops\n\nWhile at it, fix two checkpatch errors.\nSeveral non-const struct instances constified by this patch were added after\nthe introduction of platform_suspend_ops in checkpatch.pl\u0027s list of \"should\nbe const\" structs (79404849e90a41ea2109bd0e2f7c7164b0c4ce73).\n\nPatch against mainline.\nInspired by hunks of the grsecurity patch, updated for newer kernels.\n\nSigned-off-by: Lionel Debroux \u003clionel_debroux@yahoo.fr\u003e\nAcked-by: Ingo Molnar \u003cmingo@elte.hu\u003e\nSigned-off-by: Jiri Kosina \u003cjkosina@suse.cz\u003e\n" }, { "commit": "073ef1f6e508688392580e4f35dcad9aabd1e100", "tree": "2b82dc274ab415524c9c3ab7b8f2cc2d66654b2e", "parents": [ "c996d8b9a8f37bd1b4dd7823abc42780b20998f8" ], "author": { "name": "Lionel Debroux", "email": "lionel_debroux@yahoo.fr", "time": "Tue Nov 09 21:48:49 2010 +0100" }, "committer": { "name": "Jiri Kosina", "email": "jkosina@suse.cz", "time": "Tue Nov 16 14:13:58 2010 +0100" }, "message": "hibernation: constify platform_hibernation_ops\n\nPatch against mainline.\n\nChanges since v1: added one hunk; no longer adding \"const\" qualifier to\npointers in platform_hibernation_ops after seeing\nb4144e4f6e3b448d322095ca08af393682a69e33.\n\nSigned-off-by: Jiri Kosina \u003cjkosina@suse.cz\u003e\n" }, { "commit": "d4d77629953eabd3c14f6fa5746f6b28babfc55f", "tree": "38cce0d4764ecb34a9f7f49332959780e28bb786", "parents": [ "75f1dc0d076d1c1168f2115f1941ea627d38bd5a" ], "author": { "name": "Tejun Heo", "email": "tj@kernel.org", "time": "Sat Nov 13 11:55:18 2010 +0100" }, "committer": { "name": "Tejun Heo", "email": "tj@kernel.org", "time": "Sat Nov 13 11:55:18 2010 +0100" }, "message": "block: clean up blkdev_get() wrappers and their users\n\nAfter recent blkdev_get() modifications, open_by_devnum() and\nopen_bdev_exclusive() are simple wrappers around blkdev_get().\nReplace them with blkdev_get_by_dev() and blkdev_get_by_path().\n\nblkdev_get_by_dev() is identical to open_by_devnum().\nblkdev_get_by_path() is slightly different in that it doesn\u0027t\nautomatically add %FMODE_EXCL to @mode.\n\nAll users are converted. Most conversions are mechanical and don\u0027t\nintroduce any behavior difference. There are several exceptions.\n\n* btrfs now sets FMODE_EXCL in btrfs_device-\u003emode, so there\u0027s no\n reason to OR it explicitly on blkdev_put().\n\n* gfs2, nilfs2 and the generic mount_bdev() now set FMODE_EXCL in\n sb-\u003es_mode.\n\n* With the above changes, sb-\u003es_mode now always should contain\n FMODE_EXCL. WARN_ON_ONCE() added to kill_block_super() to detect\n errors.\n\nThe new blkdev_get_*() functions are with proper docbook comments.\nWhile at it, add function description to blkdev_get() too.\n\nSigned-off-by: Tejun Heo \u003ctj@kernel.org\u003e\nCc: Philipp Reisner \u003cphilipp.reisner@linbit.com\u003e\nCc: Neil Brown \u003cneilb@suse.de\u003e\nCc: Mike Snitzer \u003csnitzer@redhat.com\u003e\nCc: Joern Engel \u003cjoern@lazybastard.org\u003e\nCc: Chris Mason \u003cchris.mason@oracle.com\u003e\nCc: Jan Kara \u003cjack@suse.cz\u003e\nCc: \"Theodore Ts\u0027o\" \u003ctytso@mit.edu\u003e\nCc: KONISHI Ryusuke \u003ckonishi.ryusuke@lab.ntt.co.jp\u003e\nCc: reiserfs-devel@vger.kernel.org\nCc: xfs-masters@oss.sgi.com\nCc: Alexander Viro \u003cviro@zeniv.linux.org.uk\u003e\n" }, { "commit": "e525fd89d380c4a94c0d63913a1dd1a593ed25e7", "tree": "d226ef40d3f99e42fcf272ad432585cbd641ebec", "parents": [ "e09b457bdb7e8d23fc54dcef0930ac697d8de895" ], "author": { "name": "Tejun Heo", "email": "tj@kernel.org", "time": "Sat Nov 13 11:55:17 2010 +0100" }, "committer": { "name": "Tejun Heo", "email": "tj@kernel.org", "time": "Sat Nov 13 11:55:17 2010 +0100" }, "message": "block: make blkdev_get/put() handle exclusive access\n\nOver time, block layer has accumulated a set of APIs dealing with bdev\nopen, close, claim and release.\n\n* blkdev_get/put() are the primary open and close functions.\n\n* bd_claim/release() deal with exclusive open.\n\n* open/close_bdev_exclusive() are combination of open and claim and\n the other way around, respectively.\n\n* bd_link/unlink_disk_holder() to create and remove holder/slave\n symlinks.\n\n* open_by_devnum() wraps bdget() + blkdev_get().\n\nThe interface is a bit confusing and the decoupling of open and claim\nmakes it impossible to properly guarantee exclusive access as\nin-kernel open + claim sequence can disturb the existing exclusive\nopen even before the block layer knows the current open if for another\nexclusive access. Reorganize the interface such that,\n\n* blkdev_get() is extended to include exclusive access management.\n @holder argument is added and, if is @FMODE_EXCL specified, it will\n gain exclusive access atomically w.r.t. other exclusive accesses.\n\n* blkdev_put() is similarly extended. It now takes @mode argument and\n if @FMODE_EXCL is set, it releases an exclusive access. Also, when\n the last exclusive claim is released, the holder/slave symlinks are\n removed automatically.\n\n* bd_claim/release() and close_bdev_exclusive() are no longer\n necessary and either made static or removed.\n\n* bd_link_disk_holder() remains the same but bd_unlink_disk_holder()\n is no longer necessary and removed.\n\n* open_bdev_exclusive() becomes a simple wrapper around lookup_bdev()\n and blkdev_get(). It also has an unexpected extra bdev_read_only()\n test which probably should be moved into blkdev_get().\n\n* open_by_devnum() is modified to take @holder argument and pass it to\n blkdev_get().\n\nMost of bdev open/close operations are unified into blkdev_get/put()\nand most exclusive accesses are tested atomically at the open time (as\nit should). This cleans up code and removes some, both valid and\ninvalid, but unnecessary all the same, corner cases.\n\nopen_bdev_exclusive() and open_by_devnum() can use further cleanup -\nrename to blkdev_get_by_path() and blkdev_get_by_devt() and drop\nspecial features. Well, let\u0027s leave them for another day.\n\nMost conversions are straight-forward. drbd conversion is a bit more\ninvolved as there was some reordering, but the logic should stay the\nsame.\n\nSigned-off-by: Tejun Heo \u003ctj@kernel.org\u003e\nAcked-by: Neil Brown \u003cneilb@suse.de\u003e\nAcked-by: Ryusuke Konishi \u003ckonishi.ryusuke@lab.ntt.co.jp\u003e\nAcked-by: Mike Snitzer \u003csnitzer@redhat.com\u003e\nAcked-by: Philipp Reisner \u003cphilipp.reisner@linbit.com\u003e\nCc: Peter Osterlund \u003cpetero2@telia.com\u003e\nCc: Martin Schwidefsky \u003cschwidefsky@de.ibm.com\u003e\nCc: Heiko Carstens \u003cheiko.carstens@de.ibm.com\u003e\nCc: Jan Kara \u003cjack@suse.cz\u003e\nCc: Andrew Morton \u003cakpm@linux-foundation.org\u003e\nCc: Andreas Dilger \u003cadilger.kernel@dilger.ca\u003e\nCc: \"Theodore Ts\u0027o\" \u003ctytso@mit.edu\u003e\nCc: Mark Fasheh \u003cmfasheh@suse.com\u003e\nCc: Joel Becker \u003cjoel.becker@oracle.com\u003e\nCc: Alex Elder \u003caelder@sgi.com\u003e\nCc: Christoph Hellwig \u003chch@infradead.org\u003e\nCc: dm-devel@redhat.com\nCc: drbd-dev@lists.linbit.com\nCc: Leo Chen \u003cleochen@broadcom.com\u003e\nCc: Scott Branden \u003csbranden@broadcom.com\u003e\nCc: Chris Mason \u003cchris.mason@oracle.com\u003e\nCc: Steven Whitehouse \u003cswhiteho@redhat.com\u003e\nCc: Dave Kleikamp \u003cshaggy@linux.vnet.ibm.com\u003e\nCc: Joern Engel \u003cjoern@logfs.org\u003e\nCc: reiserfs-devel@vger.kernel.org\nCc: Alexander Viro \u003cviro@zeniv.linux.org.uk\u003e\n" }, { "commit": "43e60861fe9d39740cf5b355f58fecedf0d8e9ba", "tree": "7751208ba2b579d22e70bd5043c6b4c63847feb5", "parents": [ "d08a5ace18dce9b18d8eb56bb6c0feef082b1b33" ], "author": { "name": "Mark Brown", "email": "broonie@opensource.wolfsonmicro.com", "time": "Thu Nov 11 01:51:26 2010 +0100" }, "committer": { "name": "Rafael J. Wysocki", "email": "rjw@sisk.pl", "time": "Thu Nov 11 01:51:26 2010 +0100" }, "message": "PM / OPP: Hide OPP configuration when SoCs do not provide an implementation\n\nSince the OPP API is only useful with an appropraite SoC-specific\nimplementation there is no point in offering the ability to enable\nthe API on general systems. Provide an ARCH_HAS OPP Kconfig symbol\nwhich masks out the option unless selected by an implementation.\n\nSigned-off-by: Mark Brown \u003cbroonie@opensource.wolfsonmicro.com\u003e\nAcked-by: Nishanth Menon \u003cnm@ti.com\u003e\nAcked-by: Kevin Hilman \u003ckhilman@deeprootsystems.com\u003e\nSigned-off-by: Rafael J. Wysocki \u003crjw@sisk.pl\u003e\n" }, { "commit": "b595076a180a56d1bb170e6eceda6eb9d76f4cd3", "tree": "bc01ec7283808013e0b8ce7713fd6fc40f810429", "parents": [ "6aaccece1c483f189f76f1282b3984ff4c7ecb0a" ], "author": { "name": "Uwe Kleine-König", "email": "u.kleine-koenig@pengutronix.de", "time": "Mon Nov 01 15:38:34 2010 -0400" }, "committer": { "name": "Jiri Kosina", "email": "jkosina@suse.cz", "time": "Mon Nov 01 15:38:34 2010 -0400" }, "message": "tree-wide: fix comment/printk typos\n\n\"gadget\", \"through\", \"command\", \"maintain\", \"maintain\", \"controller\", \"address\",\n\"between\", \"initiali[zs]e\", \"instead\", \"function\", \"select\", \"already\",\n\"equal\", \"access\", \"management\", \"hierarchy\", \"registration\", \"interest\",\n\"relative\", \"memory\", \"offset\", \"already\",\n\nSigned-off-by: Uwe Kleine-König \u003cu.kleine-koenig@pengutronix.de\u003e\nSigned-off-by: Jiri Kosina \u003cjkosina@suse.cz\u003e\n" } ], "next": "3ecb01df3261d3b1f02ccfcf8384e2a255d2a1d0" }