)]}' { "log": [ { "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": "4e111751cfcb75f26d2725eab934b6eb91a3d115", "tree": "b3d63b5b44bd2036db6e0f0b2e81769c84cc5ca3", "parents": [ "ca64b0cd3a12d7704f4e98f4f5d51f41eb5047a2", "02f8c6aee8df3cdc935e9bdd4f2d020306035dbe" ], "author": { "name": "Colin Cross", "email": "ccross@android.com", "time": "Wed Aug 10 18:04:30 2011 -0700" }, "committer": { "name": "Colin Cross", "email": "ccross@android.com", "time": "Wed Aug 10 18:04:30 2011 -0700" }, "message": "Merge commit \u0027v3.0\u0027 into android-3.0\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": "a63fdc5156f2ef5690b6cf03d72b0c4917efbba7", "tree": "03d9b67a5d07ab9d805ea39db2f331740eba1d4c", "parents": [ "620917de59eeb934b9f8cf35cc2d95c1ac8ed0fc" ], "author": { "name": "Benjamin Herrenschmidt", "email": "benh@kernel.crashing.org", "time": "Tue Jun 14 10:57:50 2011 +1000" }, "committer": { "name": "Benjamin Herrenschmidt", "email": "benh@kernel.crashing.org", "time": "Tue Jul 12 11:08:01 2011 +1000" }, "message": "mm: Move definition of MIN_MEMORY_BLOCK_SIZE to a header\n\nThe macro MIN_MEMORY_BLOCK_SIZE is currently defined twice in two .c\nfiles, and I need it in a third one to fix a powerpc bug, so let\u0027s\nfirst move it into a header\n\nSigned-off-by: Benjamin Herrenschmidt \u003cbenh@kernel.crashing.org\u003e\nAcked-by: Ingo Molnar \u003cmingo@elte.hu\u003e\n" }, { "commit": "887596224cca4dc4669c53e4d7a33fcfc9d9e823", "tree": "51cf1ce6f98ddf3e304c06b45c28265dfc9e4503", "parents": [ "e3bbfa78bab125f58b831b5f7f45b5a305091d72" ], "author": { "name": "Colin Cross", "email": "ccross@android.com", "time": "Mon Jul 11 10:51:49 2011 +0200" }, "committer": { "name": "Rafael J. Wysocki", "email": "rjw@sisk.pl", "time": "Mon Jul 11 10:51:49 2011 +0200" }, "message": "PM: Reintroduce dropped call to check_wakeup_irqs\n\nPatch 2e711c04dbbf7a7732a3f7073b1fc285d12b369d\n(PM: Remove sysdev suspend, resume and shutdown operations)\ndeleted sysdev_suspend(), which was being relied on to call\ncheck_wakeup_irqs() in suspend. If check_wakeup_irqs() is not\ncalled, wake interrupts that are pending when suspend is\nentered may be lost. It also breaks IRQCHIP_MASK_ON_SUSPEND,\nwhich is handled in check_wakeup_irqs().\n\nThis patch adds a call to check_wakeup_irqs() in syscore_suspend(),\nsimilar to what was deleted in sysdev_suspend().\n\nSigned-off-by: Colin Cross \u003cccross@android.com\u003e\nSigned-off-by: Rafael J. Wysocki \u003crjw@sisk.pl\u003e\n" }, { "commit": "814cdea670616252e4cdf297a07b02ce59698bf1", "tree": "c4a5665995e813c252b07f1e863166059bfb5bcb", "parents": [ "487ffb052891a552fecf865ad4b24bbe7945a413", "fe0d42203cb5616eeff68b14576a0f7e2dd56625" ], "author": { "name": "Dima Zavin", "email": "dima@android.com", "time": "Thu Jul 07 17:55:44 2011 -0700" }, "committer": { "name": "Dima Zavin", "email": "dima@android.com", "time": "Thu Jul 07 17:55:44 2011 -0700" }, "message": "Merge commit \u0027v3.0-rc6\u0027 into android-3.0\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": "e32c14667e4fe9f16ac9b918d15d29abd2315a55", "tree": "10caca50ec1cd2a62645122059a9f0fd14e35368", "parents": [ "a88985f2b5cc71e524aec001b81f878bed5d29fb" ], "author": { "name": "Colin Cross", "email": "ccross@android.com", "time": "Wed Jun 29 13:43:12 2011 -0700" }, "committer": { "name": "Colin Cross", "email": "ccross@android.com", "time": "Wed Jun 29 13:43:12 2011 -0700" }, "message": "Revert \"PM: Prevent waiting forever on asynchronous resume after abort\"\n\nThis reverts commit fa92a3d6959546baa27e892188d3e9bb79c31741.\n" }, { "commit": "a88985f2b5cc71e524aec001b81f878bed5d29fb", "tree": "de372676647caf0f89689e1d4f61be27ecdd6810", "parents": [ "c797ca58ffc136a7f64761d8c6b85cdbab3cfed8" ], "author": { "name": "Colin Cross", "email": "ccross@android.com", "time": "Wed Jun 29 13:42:56 2011 -0700" }, "committer": { "name": "Colin Cross", "email": "ccross@android.com", "time": "Wed Jun 29 13:42:56 2011 -0700" }, "message": "Revert \"PM: Wait for completion of the parent resume before resuming\"\n\nThis reverts commit a0f07aae54e87a9fad6d19c0e57398f54d858f06.\n" }, { "commit": "c89b857ce6d803905b2c9d71bc9effdd286c45ed", "tree": "6cf4a6e23f68f3b65906210dccb272ab2f9c5c74", "parents": [ "2e34b429a404675dc4fc4ad2ee339eea028da3ca", "663dd6dcaf7e95526e469e91f41972a9c0cca30c" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Tue Jun 28 11:15:36 2011 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Tue Jun 28 11:15:36 2011 -0700" }, "message": "Merge branch \u0027driver-core-linus\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/driver-core-2.6\n\n* \u0027driver-core-linus\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/driver-core-2.6:\n Connector: Correctly set the error code in case of success when dispatching receive callbacks\n Connector: Set the CN_NETLINK_USERS correctly\n pti: PTI semantics fix in pti_tty_cleanup.\n pti: ENXIO error case memory leak PTI fix.\n pti: double-free security PTI fix\n drivers:misc: ti-st: fix skipping of change remote baud\n drivers/base/platform.c: don\u0027t mark platform_device_register_resndata() as __init_or_module\n st_kim: Handle case of no device found for ID 0\n firmware: fix GOOGLE_SMI kconfig dependency warning\n" }, { "commit": "4d1518f5668ef1b3dff6c3b30fa761fe5573cdaa", "tree": "9e9c6d6b4c8d241ce392d31c2fb8ca07f9c9b753", "parents": [ "6d0e0e84f66d32c33511984dd3badd32364b863c" ], "author": { "name": "Rafael J. Wysocki", "email": "rjw@sisk.pl", "time": "Tue Jun 21 23:24:33 2011 +0200" }, "committer": { "name": "Rafael J. Wysocki", "email": "rjw@sisk.pl", "time": "Tue Jun 21 23:24:33 2011 +0200" }, "message": "PM / Runtime: Handle clocks correctly if CONFIG_PM_RUNTIME is unset\n\nCommit 85eb8c8d0b0900c073b0e6f89979ac9c439ade1a (PM / Runtime:\nGeneric clock manipulation rountines for runtime PM (v6)) converted\nthe shmobile platform to using generic code for runtime PM clock\nmanagement, but it changed the behavior for CONFIG_PM_RUNTIME unset\nincorrectly.\n\nSpecifically, for CONFIG_PM_RUNTIME unset pm_runtime_clk_notify()\nshould enable clocks for action equal to BUS_NOTIFY_BIND_DRIVER and\nit should disable them for action equal to BUS_NOTIFY_UNBOUND_DRIVER\n(instead of BUS_NOTIFY_ADD_DEVICE and BUS_NOTIFY_DEL_DEVICE,\nrespectively). Make this function behave as appropriate.\n\nSigned-off-by: Rafael J. Wysocki \u003crjw@sisk.pl\u003e\nAcked-by: Magnus Damm \u003cdamm@opensource.se\u003e\n" }, { "commit": "6d0e0e84f66d32c33511984dd3badd32364b863c", "tree": "215916af1632fbaff9d46676d14dafd52143d578", "parents": [ "8440f4b19494467883f8541b7aa28c7bbf6ac92b" ], "author": { "name": "Alan Stern", "email": "stern@rowland.harvard.edu", "time": "Sat Jun 18 22:42:09 2011 +0200" }, "committer": { "name": "Rafael J. Wysocki", "email": "rjw@sisk.pl", "time": "Tue Jun 21 23:20:20 2011 +0200" }, "message": "PM: Fix async resume following suspend failure\n\nThe PM core doesn\u0027t handle suspend failures correctly when it comes to\nasynchronously suspended devices. These devices are moved onto the\ndpm_suspended_list as soon as the corresponding async thread is\nstarted up, and they remain on the list even if they fail to suspend\nor the sleep transition is cancelled before they get suspended. As a\nresult, when the PM core unwinds the transition, it tries to resume\nthe devices even though they were never suspended.\n\nThis patch (as1474) fixes the problem by adding a new \"is_suspended\"\nflag to dev_pm_info. Devices are resumed only if the flag is set.\n\n[rjw:\n * Moved the dev-\u003epower.is_suspended check into device_resume(),\n because we need to complete dev-\u003epower.completion and clear\n dev-\u003epower.is_prepared too for devices whose\n dev-\u003epower.is_suspended flags are unset.\n * Fixed __device_suspend() to avoid setting dev-\u003epower.is_suspended\n if async_error is different from zero.]\n\nSigned-off-by: Alan Stern \u003cstern@rowland.harvard.edu\u003e\nSigned-off-by: Rafael J. Wysocki \u003crjw@sisk.pl\u003e\nCc: stable@kernel.org\n" }, { "commit": "f76b168b6f117a49d36307053e1acbe30580ea5b", "tree": "2aa0cc19b27764d8eb55ce85eaf226a60ce27756", "parents": [ "78420884e680da8fbc3240de2d3106437042381e" ], "author": { "name": "Alan Stern", "email": "stern@rowland.harvard.edu", "time": "Sat Jun 18 20:22:23 2011 +0200" }, "committer": { "name": "Rafael J. Wysocki", "email": "rjw@sisk.pl", "time": "Tue Jun 21 23:19:50 2011 +0200" }, "message": "PM: Rename dev_pm_info.in_suspend to is_prepared\n\nThis patch (as1473) renames the \"in_suspend\" field in struct\ndev_pm_info to \"is_prepared\", in preparation for an upcoming change.\nThe new name is more descriptive of what the field really means.\n\nSigned-off-by: Alan Stern \u003cstern@rowland.harvard.edu\u003e\nSigned-off-by: Rafael J. Wysocki \u003crjw@sisk.pl\u003e\nCc: stable@kernel.org\n" }, { "commit": "1b13947f3de59f61e1feb84b9e17812eaba8b807", "tree": "ddf65043c28a9435d8755021655ee4c736bfeb6e", "parents": [ "292b96396c25c465f7f17d5c0d0e182a6b7a4e26" ], "author": { "name": "Benoit Goby", "email": "benoit@android.com", "time": "Mon Feb 07 13:55:26 2011 -0800" }, "committer": { "name": "Colin Cross", "email": "ccross@android.com", "time": "Tue Jun 14 09:09:54 2011 -0700" }, "message": "PM: Increase dpm suspend timeout\n\nusbhid devices have a 10s timeout waiting for the out queue to clear.\nIncreased the watchdog to 12s.\n\nChange-Id: I96368fca6dff98e4eba8aedb09c23be964c8f4b4\nSigned-off-by: Benoit Goby \u003cbenoit@android.com\u003e\n" }, { "commit": "8e42bee3ab6a46c6ac8c9754efb3dde29b9762b2", "tree": "e0798a59708ab64675456f998ea1e52d7b7089ec", "parents": [ "1613ecd0e1282b13559c45a7406ef46b8bd367ef" ], "author": { "name": "Benoit Goby", "email": "benoit@android.com", "time": "Wed Jan 26 18:28:33 2011 -0800" }, "committer": { "name": "Colin Cross", "email": "ccross@android.com", "time": "Tue Jun 14 09:09:50 2011 -0700" }, "message": "PM: Change dpm watchdog to support async suspend\n\nExclude from the watchdog the time spent waiting for children that\nare resumed asynchronously and time every devices, whether or not they\nresumed synchronously.\n\nChange-Id: I84209dfd5df72842e045096c906fd61e20e6d183\nSigned-off-by: Benoit Goby \u003cbenoit@android.com\u003e\n" }, { "commit": "34dcf173c5f6256210741c0c83bbebf4e017d5ad", "tree": "12a8ea05b17a897c5013a36b1e30de98a366f610", "parents": [ "0ee5695f24a1629c4147ed44650fe8847891efde" ], "author": { "name": "Benoit Goby", "email": "benoit@android.com", "time": "Fri Jan 21 15:53:44 2011 -0800" }, "committer": { "name": "Colin Cross", "email": "ccross@android.com", "time": "Tue Jun 14 09:09:50 2011 -0700" }, "message": "PM: Dump suspend thread stack on dpm suspend timeout\n\nWhen a driver takes more than 3 seconds to suspend, dump the suspend\nthread stack since BUG() might only dump the idle thread stack.\n\nChange-Id: If854db355fdcf3b773ea20b1b5e031def6d4b114\nSigned-off-by: Benoit Goby \u003cbenoit@android.com\u003e\n" }, { "commit": "a0f07aae54e87a9fad6d19c0e57398f54d858f06", "tree": "a498ad9c9bf85b9c409a8da11dcaf97aced6066e", "parents": [ "1c4f95f81916c95b991019107782a2fa002b30bb" ], "author": { "name": "Benoit Goby", "email": "benoit@android.com", "time": "Mon Dec 13 15:27:06 2010 -0800" }, "committer": { "name": "Colin Cross", "email": "ccross@android.com", "time": "Tue Jun 14 09:09:39 2011 -0700" }, "message": "PM: Wait for completion of the parent resume before resuming\n\nIf the parent device is in the DPM_RESUMING state, resume might get called\nbefore the parent\u0027s resume has completed, because dpm_wait won\u0027t get\ncalled. This issue was introduced by:\n3d46a3c PM: Prevent waiting forever on asynchronous resume after abort\n\nWait for completion of the parent resume if the parent state is \u003e\u003d DPM_OFF\nor \u003d\u003d DPM_RESUMING\n\nSigned-off-by: Benoit Goby \u003cbenoit@android.com\u003e\n[dima: fixed to work on 2.6.38, use .in_suspend instead of .state]\nSigned-off-by: Dima Zavin \u003cdima@android.com\u003e\n" }, { "commit": "fa92a3d6959546baa27e892188d3e9bb79c31741", "tree": "db64b42fee24086a8da5ec2aed4dee8167598210", "parents": [ "435aacd2a0cf0fc6402719fb69a3fac614686347" ], "author": { "name": "Colin Cross", "email": "ccross@android.com", "time": "Wed Sep 01 18:35:55 2010 -0700" }, "committer": { "name": "Colin Cross", "email": "ccross@android.com", "time": "Tue Jun 14 09:09:35 2011 -0700" }, "message": "PM: Prevent waiting forever on asynchronous resume after abort\n\nOnly wait on a parent device during resume if the parent device is\nsuspended.\n\nConsider three drivers, A, B, and C. The parent of A is C, and C\nhas async_suspend set. On boot, C-\u003epower.completion is initialized\nto 0.\n\nDuring the first suspend:\nsuspend_devices_and_enter(...)\n dpm_resume(...)\n device_suspend(A)\n device_suspend(B) returns error, aborts suspend\n dpm_resume_end(...)\n dpm_resume(...)\n device_resume(A)\n dpm_wait(A-\u003eparent \u003d\u003d C)\n wait_for_completion(C-\u003epower.completion)\n\nThe wait_for_completion will never complete, because\ncomplete_all(C-\u003epower.completion) will only be called from\ndevice_suspend(C) or device_resume(C), neither of which is called\nif suspend is aborted before C.\n\nAfter a successful suspend-\u003eresume cycle, where B doesn\u0027t abort\nsuspend, C-\u003epower.completion is left in the completed state by the\ncall to device_resume(C), and the same call path will work if B\naborts suspend.\n\nSigned-off-by: Colin Cross \u003cccross@android.com\u003e\n" }, { "commit": "9272a144e54b2fb53fea8552b4f797b069a6f425", "tree": "cf6fc82b2d20ebcf38899cfd8691661be335afef", "parents": [ "f86e4b09b7297ac880b88bb19e23661dfeeb47f7" ], "author": { "name": "San Mehat", "email": "san@google.com", "time": "Thu Aug 13 09:40:42 2009 -0700" }, "committer": { "name": "Colin Cross", "email": "ccross@android.com", "time": "Tue Jun 14 09:09:17 2011 -0700" }, "message": "drivers: power: Add watchdog timer to catch drivers which lockup during suspend.\n\n\tRather than hard-lock the kernel, we now BUG() when a driver takes\n\u003e 3 seconds to suspend. If the underlying platform supports panic dumps,\nthen the data can be collected for debug.\n\nSigned-off-by: San Mehat \u003csan@google.com\u003e\n" }, { "commit": "3b3eca3116861113ccc0e1ca3b98cb43598f46a7", "tree": "958427e5260ec95b04faaef18b5c08249ce8dfda", "parents": [ "99592ba4a80edb84938e7e0cf71fdecff1ce67fd" ], "author": { "name": "Rafael J. Wysocki", "email": "rjw@sisk.pl", "time": "Tue Jun 07 23:34:58 2011 +0200" }, "committer": { "name": "Rafael J. Wysocki", "email": "rjw@sisk.pl", "time": "Tue Jun 07 23:34:58 2011 +0200" }, "message": "PM / Runtime: Fix loops in pm_runtime_clk_notify()\n\nThe loops over connection ID strings in pm_runtime_clk_notify()\nshould actually iterate over the strings and not over the elements\nof the first of them, so make them behave as appropriate.\n\nThis fixes a regression introduced by commit 600b776eb39a13a28b090\n(OMAP1 / PM: Use generic clock manipulation routines for runtime PM).\n\nReported-and-tested-by: Janusz Krzysztofik \u003cjkrzyszt@tis.icnet.pl\u003e\nSigned-off-by: Rafael J. Wysocki \u003crjw@sisk.pl\u003e\n" }, { "commit": "bb2b43fefab723f4a0760146e7bed59d41a50e53", "tree": "6b10e25669c7edc00280b5ace564be29347d767c", "parents": [ "7316a9f2a94c14e66e9421a777dffc509a2fe0e3" ], "author": { "name": "Andrew Morton", "email": "akpm@linux-foundation.org", "time": "Mon May 23 14:44:19 2011 -0700" }, "committer": { "name": "Greg Kroah-Hartman", "email": "gregkh@suse.de", "time": "Tue Jun 07 10:01:17 2011 -0700" }, "message": "drivers/base/platform.c: don\u0027t mark platform_device_register_resndata() as __init_or_module\n\nThis reverts 737a3bb9416ce2a7c7a4 (\"Driver core: move platform device\ncreation helpers to .init.text (if MODULE\u003dn)\"). That patch assumed that\nplatform_device_register_resndata() is only ever called from __init code\nbut that isn\u0027t true in the case ioctl-\u003edrm_ioctl-\u003eradeon_cp_init().\n\nAddresses https://bugzilla.kernel.org/show_bug.cgi?id\u003d35192\n\nCc: Uwe Kleine-König \u003cu.kleine-koenig@pengutronix.de\u003e\nReported-by: Anthony Basile \u003cblueness@gentoo.org\u003e\nCc: Greg KH \u003cgregkh@suse.de\u003e\nCc: David Airlie \u003cairlied@linux.ie\u003e\nCc: \u003cstable@kernel.org\u003e\nSigned-off-by: Andrew Morton \u003cakpm@linux-foundation.org\u003e\nSigned-off-by: Greg Kroah-Hartman \u003cgregkh@suse.de\u003e\n" }, { "commit": "fa25c503dfa203b921199ea42c0046c89f2ed49f", "tree": "9a56c17ffda1183c66dc112ceba76ece65f0a4e6", "parents": [ "bb005a59e08733bb416126dc184f73120fc6366b" ], "author": { "name": "KOSAKI Motohiro", "email": "kosaki.motohiro@jp.fujitsu.com", "time": "Tue May 24 17:11:28 2011 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Wed May 25 08:39:07 2011 -0700" }, "message": "mm: per-node vmstat: show proper vmstats\n\ncommit 2ac390370a (\"writeback: add\n/sys/devices/system/node/\u003cnode\u003e/vmstat\") added vmstat entry. But\nstrangely it only show nr_written and nr_dirtied.\n\n # cat /sys/devices/system/node/node20/vmstat\n nr_written 0\n nr_dirtied 0\n\nOf course, It\u0027s not adequate. With this patch, the vmstat show all vm\nstastics as /proc/vmstat.\n\n # cat /sys/devices/system/node/node0/vmstat\n\tnr_free_pages 899224\n\tnr_inactive_anon 201\n\tnr_active_anon 17380\n\tnr_inactive_file 31572\n\tnr_active_file 28277\n\tnr_unevictable 0\n\tnr_mlock 0\n\tnr_anon_pages 17321\n\tnr_mapped 8640\n\tnr_file_pages 60107\n\tnr_dirty 33\n\tnr_writeback 0\n\tnr_slab_reclaimable 6850\n\tnr_slab_unreclaimable 7604\n\tnr_page_table_pages 3105\n\tnr_kernel_stack 175\n\tnr_unstable 0\n\tnr_bounce 0\n\tnr_vmscan_write 0\n\tnr_writeback_temp 0\n\tnr_isolated_anon 0\n\tnr_isolated_file 0\n\tnr_shmem 260\n\tnr_dirtied 1050\n\tnr_written 938\n\tnuma_hit 962872\n\tnuma_miss 0\n\tnuma_foreign 0\n\tnuma_interleave 8617\n\tnuma_local 962872\n\tnuma_other 0\n\tnr_anon_transparent_hugepages 0\n\n[akpm@linux-foundation.org: no externs in .c files]\nSigned-off-by: KOSAKI Motohiro \u003ckosaki.motohiro@jp.fujitsu.com\u003e\nCc: Michael Rubin \u003cmrubin@google.com\u003e\nCc: Wu Fengguang \u003cfengguang.wu@intel.com\u003e\nAcked-by: David Rientjes \u003crientjes@google.com\u003e\nCc: Randy Dunlap \u003crdunlap@xenotime.net\u003e\nSigned-off-by: Andrew Morton \u003cakpm@linux-foundation.org\u003e\nSigned-off-by: Linus Torvalds \u003ctorvalds@linux-foundation.org\u003e\n" }, { "commit": "57d19e80f459dd845fb3cfeba8e6df8471bac142", "tree": "8254766715720228db3d50f1ef3c7fe003c06d65", "parents": [ "ee9ec4f82049c678373a611ce20ac67fe9ad836e", "e64851f5a0ad6ec991f74ebb3108c35aa0323d5f" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Mon May 23 09:12:26 2011 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Mon May 23 09:12:26 2011 -0700" }, "message": "Merge branch \u0027for-linus\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/trivial\n\n* \u0027for-linus\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/trivial: (39 commits)\n b43: fix comment typo reqest -\u003e request\n Haavard Skinnemoen has left Atmel\n cris: typo in mach-fs Makefile\n Kconfig: fix copy/paste-ism for dell-wmi-aio driver\n doc: timers-howto: fix a typo (\"unsgined\")\n perf: Only include annotate.h once in tools/perf/util/ui/browsers/annotate.c\n md, raid5: Fix spelling error in comment (\u0027Ofcourse\u0027 --\u003e \u0027Of course\u0027).\n treewide: fix a few typos in comments\n regulator: change debug statement be consistent with the style of the rest\n Revert \"arm: mach-u300/gpio: Fix mem_region resource size miscalculations\"\n audit: acquire creds selectively to reduce atomic op overhead\n rtlwifi: don\u0027t touch with treewide double semicolon removal\n treewide: cleanup continuations and remove logging message whitespace\n ath9k_hw: don\u0027t touch with treewide double semicolon removal\n include/linux/leds-regulator.h: fix syntax in example code\n tty: fix typo in descripton of tty_termios_encode_baud_rate\n xtensa: remove obsolete BKL kernel option from defconfig\n m68k: fix comment typo \u0027occcured\u0027\n arch:Kconfig.locks Remove unused config option.\n treewide: remove extra semicolons\n ...\n" }, { "commit": "39ab05c8e0b519ff0a04a869f065746e6e8c3d95", "tree": "e73f0ba74c4ea7a80dff9b2dd9445a3a74190e28", "parents": [ "1477fcc290b3d5c2614bde98bf3b1154c538860d", "c42d2237143fcf35cff642cefe2bcf7786aae312" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Thu May 19 18:24:11 2011 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Thu May 19 18:24:11 2011 -0700" }, "message": "Merge branch \u0027driver-core-next\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/driver-core-2.6\n\n* \u0027driver-core-next\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/driver-core-2.6: (44 commits)\n debugfs: Silence DEBUG_STRICT_USER_COPY_CHECKS\u003dy warning\n sysfs: remove \"last sysfs file:\" line from the oops messages\n drivers/base/memory.c: fix warning due to \"memory hotplug: Speed up add/remove when blocks are larger than PAGES_PER_SECTION\"\n memory hotplug: Speed up add/remove when blocks are larger than PAGES_PER_SECTION\n SYSFS: Fix erroneous comments for sysfs_update_group().\n driver core: remove the driver-model structures from the documentation\n driver core: Add the device driver-model structures to kerneldoc\n Translated Documentation/email-clients.txt\n RAW driver: Remove call to kobject_put().\n reboot: disable usermodehelper to prevent fs access\n efivars: prevent oops on unload when efi is not enabled\n Allow setting of number of raw devices as a module parameter\n Introduce CONFIG_GOOGLE_FIRMWARE\n driver: Google Memory Console\n driver: Google EFI SMI\n x86: Better comments for get_bios_ebda()\n x86: get_bios_ebda_length()\n misc: fix ti-st build issues\n params.c: Use new strtobool function to process boolean inputs\n debugfs: move to new strtobool\n ...\n\nFix up trivial conflicts in fs/debugfs/file.c due to the same patch\nbeing applied twice, and an unrelated cleanup nearby.\n" }, { "commit": "6538df80194e305f1b78cafb556f4bb442f808b3", "tree": "72927d33d82f0e9502811abfc10d722a7423fff2", "parents": [ "91e7c75ba93c48a82670d630b9daac92ff70095d" ], "author": { "name": "Rafael J. Wysocki", "email": "rjw@sisk.pl", "time": "Tue May 17 23:26:21 2011 +0200" }, "committer": { "name": "Rafael J. Wysocki", "email": "rjw@sisk.pl", "time": "Tue May 17 23:26:21 2011 +0200" }, "message": "PM: Introduce generic prepare and complete callbacks for subsystems\n\nIntroduce generic .prepare() and .complete() power management\ncallbacks, currently missing, that can be used by subsystems and\npower domains and export them. Provide NULL definitions of all\nthe generic system sleep callbacks for CONFIG_PM_SLEEP unset.\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": "13e381365614855bf14c8ad68f9b65e3afd3dd2c", "tree": "b51f9b4eda56b768f2cc8f5646dd02a8d49d900c", "parents": [ "13d53f8775c6a00b070a3eef6833795412eb7fcd" ], "author": { "name": "Eric Dumazet", "email": "eric.dumazet@gmail.com", "time": "Wed May 11 22:40:45 2011 +0200" }, "committer": { "name": "Rafael J. Wysocki", "email": "rjw@sisk.pl", "time": "Tue May 17 23:19:19 2011 +0200" }, "message": "PM / Wakeup: Remove useless synchronize_rcu() call\n\nwakeup_source_add() adds an item into wakeup_sources list.\n\nThere is no need to call synchronize_rcu() at this point.\n\nIts only needed in wakeup_source_remove()\n\nSigned-off-by: Eric Dumazet \u003ceric.dumazet@gmail.com\u003e\nSigned-off-by: Rafael J. Wysocki \u003crjw@sisk.pl\u003e\n" }, { "commit": "e762318baae3002944d68220910aef7caffcd065", "tree": "01da9af1ae09f6723a3a5da06e452aba4c364817", "parents": [ "a144c6a6c924aa1da04dd77fb84b89927354fdff" ], "author": { "name": "Rafael J. Wysocki", "email": "rjw@sisk.pl", "time": "Sat May 07 18:11:52 2011 +0200" }, "committer": { "name": "Rafael J. Wysocki", "email": "rjw@sisk.pl", "time": "Tue May 17 23:19:18 2011 +0200" }, "message": "PM / Wakeup: Fix build warning related to the \"wakeup\" sysfs file\n\nThe \"wakeup\" device sysfs file is only created if CONFIG_PM_SLEEP\nis set, so put it under CONFIG_PM_SLEEP and make a build warning\nrelated to it go away.\n\nSigned-off-by: Rafael J. Wysocki \u003crjw@sisk.pl\u003e\nAcked-by: Greg Kroah-Hartman \u003cgregkh@suse.de\u003e\n" }, { "commit": "a144c6a6c924aa1da04dd77fb84b89927354fdff", "tree": "10cab9080a722a191086f58b9f304329e8a8b942", "parents": [ "e1866b33b1e89f077b7132daae3dfd9a594e9a1a" ], "author": { "name": "Rafael J. Wysocki", "email": "rjw@sisk.pl", "time": "Fri May 06 20:09:42 2011 +0200" }, "committer": { "name": "Rafael J. Wysocki", "email": "rjw@sisk.pl", "time": "Tue May 17 23:19:17 2011 +0200" }, "message": "PM: Print a warning if firmware is requested when tasks are frozen\n\nSome drivers erroneously use request_firmware() from their -\u003eresume()\n(or -\u003ethaw(), or -\u003erestore()) callbacks, which is not going to work\nunless the firmware has been built in. This causes system resume to\nstall until the firmware-loading timeout expires, which makes users\nthink that the resume has failed and reboot their machines\nunnecessarily. For this reason, make _request_firmware() print a\nwarning and return immediately with error code if it has been called\nwhen tasks are frozen and it\u0027s impossible to start any new usermode\nhelpers.\n\nSigned-off-by: Rafael J. Wysocki \u003crjw@sisk.pl\u003e\nAcked-by: Greg Kroah-Hartman \u003cgregkh@suse.de\u003e\nReviewed-by: Valdis Kletnieks \u003cvaldis.kletnieks@vt.edu\u003e\n" }, { "commit": "e1866b33b1e89f077b7132daae3dfd9a594e9a1a", "tree": "674760cf6db30a664112ef73ad15b7b676a4debd", "parents": [ "ee940d8dccd899aa1777ea84da3d9cd04b1d2e8e" ], "author": { "name": "Rafael J. Wysocki", "email": "rjw@sisk.pl", "time": "Fri Apr 29 00:33:45 2011 +0200" }, "committer": { "name": "Rafael J. Wysocki", "email": "rjw@sisk.pl", "time": "Tue May 17 23:19:17 2011 +0200" }, "message": "PM / Runtime: Rework runtime PM handling during driver removal\n\nThe driver core tries to prevent race conditions between runtime PM\nand driver removal from happening by incrementing the runtime PM\nusage counter of the device and executing pm_runtime_barrier() before\nrunning the bus notifier and the -\u003eremove() callbacks provided by the\ndevice\u0027s subsystem or driver. This guarantees that, if a future\nruntime suspend of the device has been scheduled or a runtime resume\nor idle request has been queued up right before the driver removal,\nit will be canceled or waited for to complete and no other\nasynchronous runtime suspend or idle requests for the device will be\nput into the PM workqueue until the -\u003eremove() callback returns.\nHowever, it doesn\u0027t prevent resume requests from being queued up\nafter pm_runtime_barrier() has been called and it doesn\u0027t prevent\npm_runtime_resume() from executing the device subsystem\u0027s runtime\nresume callback. Morever, it prevents the device\u0027s subsystem or\ndriver from putting the device into the suspended state by calling\npm_runtime_suspend() from its -\u003eremove() routine. This turns out to\nbe a major inconvenience for some subsystems and drivers that want to\nleave the devices they handle in the suspended state.\n\nTo really prevent runtime PM callbacks from racing with the bus\nnotifier callback in __device_release_driver(), which is necessary,\nbecause the notifier is used by some subsystems to carry out\noperations affecting the runtime PM functionality, use\npm_runtime_get_sync() instead of the combination of\npm_runtime_get_noresume() and pm_runtime_barrier(). This will resume\nthe device if it\u0027s in the suspended state and will prevent it from\nbeing suspended again until pm_runtime_put_*() is called.\n\nTo allow subsystems and drivers to put devices into the suspended\nstate by calling pm_runtime_suspend() from their -\u003eremove() routines,\nexecute pm_runtime_put_sync() after running the bus notifier in\n__device_release_driver(). This will require subsystems and drivers\nto make their -\u003eremove() callbacks avoid races with runtime PM\ndirectly, but it will allow of more flexibility in the handling of\ndevices during the removal of their drivers.\n\nSigned-off-by: Rafael J. Wysocki \u003crjw@sisk.pl\u003e\n" }, { "commit": "72874daa5e9064c4e8d689e6a04b1e96f687f872", "tree": "dd6b6926f8349845144a82ae5318d516431edfbd", "parents": [ "2064af917b3ba7589070064ca4ed12cecd99a63c" ], "author": { "name": "Rafael J. Wysocki", "email": "rjw@sisk.pl", "time": "Tue May 03 19:45:32 2011 +0200" }, "committer": { "name": "Rafael J. Wysocki", "email": "rjw@sisk.pl", "time": "Mon May 16 20:17:48 2011 +0200" }, "message": "PM: Fix build issue in clock_ops.c for CONFIG_PM_RUNTIME unset\n\nFix a build issue in drivers/base/power/clock_ops.c occuring when\nCONFIG_PM_RUNTIME is not set.\n\nSigned-off-by: Rafael J. Wysocki \u003crjw@sisk.pl\u003e\n" }, { "commit": "2064af917b3ba7589070064ca4ed12cecd99a63c", "tree": "36f7e08bbfb33079fc62b4a810a83fe4f3985636", "parents": [ "600b776eb39a13a28b090ba9efceb0c69d4508aa" ], "author": { "name": "Kevin Hilman", "email": "khilman@ti.com", "time": "Fri Apr 29 00:37:26 2011 +0200" }, "committer": { "name": "Rafael J. Wysocki", "email": "rjw@sisk.pl", "time": "Mon May 16 20:17:47 2011 +0200" }, "message": "PM: Revert \"driver core: platform_bus: allow runtime override of dev_pm_ops\"\n\nThe platform_bus_set_pm_ops() operation is deprecated in favor of the\nnew device power domain infrastructre implemented in commit\n7538e3db6e015e890825fbd9f8659952896ddd5b (PM: add support for device\npower domains)\n\nSigned-off-by: Kevin Hilman \u003ckhilman@ti.com\u003e\nSigned-off-by: Rafael J. Wysocki \u003crjw@sisk.pl\u003e\n" }, { "commit": "a236c71766a5f69edf189e2eaeb0aa587c8c5684", "tree": "f0db043b6e4364a28bf4f190a3fefd9e96bfff99", "parents": [ "5409d2cd841cf2c76396470e566500f6505f8d2a" ], "author": { "name": "Andrew Morton", "email": "akpm@linux-foundation.org", "time": "Thu May 12 12:45:31 2011 -0700" }, "committer": { "name": "Greg Kroah-Hartman", "email": "gregkh@suse.de", "time": "Thu May 12 13:27:19 2011 -0700" }, "message": "drivers/base/memory.c: fix warning due to \"memory hotplug: Speed up add/remove when blocks are larger than PAGES_PER_SECTION\"\n\ndrivers/base/memory.c: In function \u0027memory_block_change_state\u0027:\ndrivers/base/memory.c:281: warning: unused variable \u0027i\u0027\n\nless beer, more testing\n\nCc: Anton Blanchard \u003canton@samba.org\u003e\nSigned-off-by: Andrew Morton \u003cakpm@linux-foundation.org\u003e\nSigned-off-by: Greg Kroah-Hartman \u003cgregkh@suse.de\u003e\n" }, { "commit": "5409d2cd841cf2c76396470e566500f6505f8d2a", "tree": "ba91b4eb9d982461b45cf810380b53a2a9916408", "parents": [ "1f8e1cdac616e510eeb2dc2a9226bf597bc6cfd6" ], "author": { "name": "Anton Blanchard", "email": "anton@samba.org", "time": "Wed May 11 17:25:14 2011 +1000" }, "committer": { "name": "Greg Kroah-Hartman", "email": "gregkh@suse.de", "time": "Wed May 11 15:19:27 2011 -0700" }, "message": "memory hotplug: Speed up add/remove when blocks are larger than PAGES_PER_SECTION\n\nOn ppc64 the minimum memory section for hotplug is 16MB but most\nrecent machines have a memory block size of 256MB. This means\nmemory_block_change_state does 16 separate calls to\nmemory_section_action.\n\nThis also means we call the notifiers 16 times and the hook\nin the ehea network driver is quite costly. To offline one 256MB\nregion takes:\n\n# time echo offline \u003e /sys/devices/system/memory/memory32/state\n7.9s\n\nThis patch removes the loop and calls online_pages or\nremove_memory once for the entire region and in doing so makes\nthe logic simpler since we don\u0027t have to back out if things fail\npart way through.\n\nThe same test to offline one region now takes:\n\n# time echo online \u003e /sys/devices/system/memory/memory32/state\n0.67s\n\nOver 11 times faster.\n\nSigned-off-by: Anton Blanchard \u003canton@samba.org\u003e\nSigned-off-by: Greg Kroah-Hartman \u003cgregkh@suse.de\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": "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": "8b313a38ecffc0ff0b4c5115f0a461f73b7dfdb6", "tree": "f0e9501dc9d8353736e4824443f7bb603042a076", "parents": [ "38ade3a1fa0421c12627c7b48c33e89414fc9b76" ], "author": { "name": "Rafael J. Wysocki", "email": "rjw@sisk.pl", "time": "Fri Apr 29 00:36:32 2011 +0200" }, "committer": { "name": "Rafael J. Wysocki", "email": "rjw@sisk.pl", "time": "Fri Apr 29 00:36:32 2011 +0200" }, "message": "PM / Platform: Use generic runtime PM callbacks directly\n\nOnce shmobile platforms have been converted to using power domains\nfor overriding the platform bus type\u0027s PM callbacks, it isn\u0027t\nnecessary to use the __weakly defined wrappers around the generinc\nruntime PM callbacks in the platform bus type any more.\n\nSigned-off-by: Rafael J. Wysocki \u003crjw@sisk.pl\u003e\n" }, { "commit": "69c9dd1ecf446ad8a830e4afc539a2a1adc85b78", "tree": "2c43906b23ce709057b7cc0546fbcf31d1f9a8d6", "parents": [ "4d27e9dcff00a6425d779b065ec8892e4f391661" ], "author": { "name": "Rafael J. Wysocki", "email": "rjw@sisk.pl", "time": "Fri Apr 29 00:36:05 2011 +0200" }, "committer": { "name": "Rafael J. Wysocki", "email": "rjw@sisk.pl", "time": "Fri Apr 29 00:36:05 2011 +0200" }, "message": "PM: Export platform bus type\u0027s default PM callbacks\n\nExport the default PM callbacks defined for the platform bus type so\nthat they can be used by power domains for suspending and resuming\nplatform devices in the future.\n\nSigned-off-by: Rafael J. Wysocki \u003crjw@sisk.pl\u003e\n" }, { "commit": "4d27e9dcff00a6425d779b065ec8892e4f391661", "tree": "6602f1dcfad3e3065a1c081cf89f2d020976600d", "parents": [ "fafc9929c668f8bae6dd1f109f33a86d2cb3c460" ], "author": { "name": "Rafael J. Wysocki", "email": "rjw@sisk.pl", "time": "Fri Apr 29 00:35:50 2011 +0200" }, "committer": { "name": "Rafael J. Wysocki", "email": "rjw@sisk.pl", "time": "Fri Apr 29 00:35:50 2011 +0200" }, "message": "PM: Make power domain callbacks take precedence over subsystem ones\n\nChange the PM core\u0027s behavior related to power domains in such a way\nthat, if a power domain is defined for a given device, its callbacks\nwill be executed instead of and not in addition to the device\nsubsystem\u0027s PM callbacks.\n\nThe idea behind the initial implementation of power domains handling\nby the PM core was that power domain callbacks would be executed in\naddition to subsystem callbacks, so that it would be possible to\nextend the subsystem callbacks by using power domains. It turns out,\nhowever, that this wouldn\u0027t be really convenient in some important\nsituations.\n\nFor example, there are systems in which power can only be removed\nfrom entire power domains. On those systems it is not desirable to\nexecute device drivers\u0027 PM callbacks until it is known that power is\ngoing to be removed from the devices in question, which means that\nthey should be executed by power domain callbacks rather then by\nsubsystem (e.g. bus type) PM callbacks, because subsystems generally\nhave no information about what devices belong to which power domain.\nThus, for instance, if the bus type in question is the platform bus\ntype, its PM callbacks generally should not be called in addition to\npower domain callbacks, because they run device drivers\u0027 callbacks\nunconditionally if defined.\n\nWhile in principle the default subsystem PM callbacks, or a subset of\nthem, may be replaced with different functions, it doesn\u0027t seem\ncorrect to do so, because that would change the subsystem\u0027s behavior\nwith respect to all devices in the system, regardless of whether or\nnot they belong to any power domains. Thus, the only remaining\noption is to make power domain callbacks take precedence over\nsubsystem callbacks.\n\nSigned-off-by: Rafael J. Wysocki \u003crjw@sisk.pl\u003e\nAcked-by: Grant Likely \u003cgrant.likely@secretlab.ca\u003e\nAcked-by: Kevin Hilman \u003ckhilman@ti.com\u003e\n" }, { "commit": "22110faf8c8e980013790e6a5214de32b3303730", "tree": "fb8239c3e4969cd43981eb10846802ca89b09224", "parents": [ "5dd12af05ca6b7d052c06a9ca4ff755fdfa25ae4" ], "author": { "name": "Rafael J. Wysocki", "email": "rjw@sisk.pl", "time": "Tue Apr 26 11:33:09 2011 +0200" }, "committer": { "name": "Rafael J. Wysocki", "email": "rjw@sisk.pl", "time": "Tue Apr 26 11:33:09 2011 +0200" }, "message": "PM / Wakeup: Fix initialization of wakeup-related device sysfs files\n\nIt turns out that some PCI devices are only found to be\nwakeup-capable during registration, in which case, when\ndevice_set_wakeup_capable() is called, device_is_registered() already\nreturns \u0027true\u0027 for the given device, but dpm_sysfs_add() hasn\u0027t been\ncalled for it yet. This leads to situations in which the device\u0027s\npower.can_wakeup flag is not set as requested because of failing\nwakeup_sysfs_add() and its wakeup-related sysfs files are not\ncreated, although they should be present. This is a post-2.6.38\nregression introduced by commit cb8f51bdadb7969139c2e39c2defd4cde98c1\n(PM: Do not create wakeup sysfs files for devices that cannot wake\nup).\n\nTo work around this problem initialize the device\u0027s power.entry\nfield to an empty list head and make device_set_wakeup_capable()\ncheck if it is still empty before attempting to add the devices\nwakeup-related sysfs files with wakeup_sysfs_add(). Namely, if\npower.entry is still empty at this point, device_pm_add() hasn\u0027t been\ncalled yet for the device and its wakeup-related files will be\ncreated later, so device_set_wakeup_capable() doesn\u0027t have to create\nthem.\n\nReported-and-tested-by: Tino Keitel \u003ctino.keitel@tikei.de\u003e\nSigned-off-by: Rafael J. Wysocki \u003crjw@sisk.pl\u003e\nAcked-by: Greg Kroah-Hartman \u003cgregkh@suse.de\u003e\n" }, { "commit": "07f9479a40cc778bc1462ada11f95b01360ae4ff", "tree": "0676cf38df3844004bb3ebfd99dfa67a4a8998f5", "parents": [ "9d5e6bdb3013acfb311ab407eeca0b6a6a3dedbf", "cd2e49e90f1cae7726c9a2c54488d881d7f1cd1c" ], "author": { "name": "Jiri Kosina", "email": "jkosina@suse.cz", "time": "Tue Apr 26 10:22:15 2011 +0200" }, "committer": { "name": "Jiri Kosina", "email": "jkosina@suse.cz", "time": "Tue Apr 26 10:22:59 2011 +0200" }, "message": "Merge branch \u0027master\u0027 into for-next\n\nFast-forwarded to current state of Linus\u0027 tree as there are patches to be\napplied for files that didn\u0027t exist on the old branch.\n" }, { "commit": "85723943537bf6a73bdf1140b2088fbe0c17c3c2", "tree": "cd74c9bc8ce1aa0fab85b25f0531e90d547b691c", "parents": [ "c8705082404823a5bb3e02a32ba0764399b9e6f2" ], "author": { "name": "Wanlong Gao", "email": "wanlong.gao@gmail.com", "time": "Sat Apr 23 22:18:26 2011 +0800" }, "committer": { "name": "Greg Kroah-Hartman", "email": "gregkh@suse.de", "time": "Mon Apr 25 15:52:40 2011 -0700" }, "message": "drivers:base:fix the coding format of memory.c\n\nFix the line longer than 80 of memory_uevent function .\n\nSigned-off-by: Wanlong Gao \u003cwanlong.gao@gmail.com\u003e\nSigned-off-by: Greg Kroah-Hartman \u003cgregkh@suse.de\u003e\n" }, { "commit": "c8705082404823a5bb3e02a32ba0764399b9e6f2", "tree": "1853345f3c0ca963365ff9a07fd2d92e09454799", "parents": [ "4a03d6f7c863a039b937649a93341615f531358e" ], "author": { "name": "Uwe Kleine-König", "email": "u.kleine-koenig@pengutronix.de", "time": "Wed Apr 20 09:44:46 2011 +0200" }, "committer": { "name": "Greg Kroah-Hartman", "email": "gregkh@suse.de", "time": "Fri Apr 22 17:09:13 2011 -0700" }, "message": "driver core: let dev_set_drvdata return int instead of void as it can fail\n\nBefore commit\n\n\tb402843 (Driver core: move dev_get/set_drvdata to drivers/base/dd.c)\n\ncalling dev_set_drvdata with dev\u003dNULL was an unchecked error. After some\ndiscussion about what to return in this case removing the check (and so\nproducing a null pointer exception) seems fine.\n\nSigned-off-by: Uwe Kleine-König \u003cu.kleine-koenig@pengutronix.de\u003e\nSigned-off-by: Greg Kroah-Hartman \u003cgregkh@suse.de\u003e\n" }, { "commit": "4a03d6f7c863a039b937649a93341615f531358e", "tree": "70906acfe285ec87c8b037e61da5fc27dd21f78b", "parents": [ "cea896238fbfdbce254f51fc8fd78c59df50081f" ], "author": { "name": "Uwe Kleine-König", "email": "u.kleine-koenig@pengutronix.de", "time": "Wed Apr 20 09:44:45 2011 +0200" }, "committer": { "name": "Greg Kroah-Hartman", "email": "gregkh@suse.de", "time": "Fri Apr 22 17:09:13 2011 -0700" }, "message": "driver core/platform_device_add_resources: free resource before overwriting\n\nReviewed-by: Viresh Kumar \u003cviresh.kumar@st.com\u003e\nSigned-off-by: Uwe Kleine-König \u003cu.kleine-koenig@pengutronix.de\u003e\nSigned-off-by: Greg Kroah-Hartman \u003cgregkh@suse.de\u003e\n" }, { "commit": "cea896238fbfdbce254f51fc8fd78c59df50081f", "tree": "4536217e6a2f43432384e526e962d2240b141c23", "parents": [ "251e031d132ea3d03e0a32f2240c67f449979c5d" ], "author": { "name": "Uwe Kleine-König", "email": "u.kleine-koenig@pengutronix.de", "time": "Wed Apr 20 09:44:44 2011 +0200" }, "committer": { "name": "Greg Kroah-Hartman", "email": "gregkh@suse.de", "time": "Fri Apr 22 17:09:13 2011 -0700" }, "message": "driver core/platform_device_add_resources: set resource to NULL if !res\n\nThis makes the res \u003d NULL case more consistant to the res !\u003d NULL case\nas now both overwrite pdev-\u003eresource.\n\nReviewed-by: Viresh Kumar \u003cviresh.kumar@st.com\u003e\nSigned-off-by: Uwe Kleine-König \u003cu.kleine-koenig@pengutronix.de\u003e\nSigned-off-by: Greg Kroah-Hartman \u003cgregkh@suse.de\u003e\n" }, { "commit": "251e031d132ea3d03e0a32f2240c67f449979c5d", "tree": "83ee22c8d152196875959a58c3e5fb99544468e4", "parents": [ "27a33f9e8fb203e71925257cf039fe6ec623c5d1" ], "author": { "name": "Uwe Kleine-König", "email": "u.kleine-koenig@pengutronix.de", "time": "Wed Apr 20 09:44:43 2011 +0200" }, "committer": { "name": "Greg Kroah-Hartman", "email": "gregkh@suse.de", "time": "Fri Apr 22 17:09:12 2011 -0700" }, "message": "driver core/platform_device_add_data: free platform data before overwriting\n\nReviewed-by: Viresh Kumar \u003cviresh.kumar@st.com\u003e\nSigned-off-by: Uwe Kleine-König \u003cu.kleine-koenig@pengutronix.de\u003e\nSigned-off-by: Greg Kroah-Hartman \u003cgregkh@suse.de\u003e\n" }, { "commit": "27a33f9e8fb203e71925257cf039fe6ec623c5d1", "tree": "4aa52696ba58a294c854ddc61422d6c47a1963d6", "parents": [ "7f100d1566d6ee353a43be92599511fc438ec281" ], "author": { "name": "Uwe Kleine-König", "email": "u.kleine-koenig@pengutronix.de", "time": "Wed Apr 20 09:44:42 2011 +0200" }, "committer": { "name": "Greg Kroah-Hartman", "email": "gregkh@suse.de", "time": "Fri Apr 22 17:09:11 2011 -0700" }, "message": "driver core/platform_device_add_data: set platform_data to NULL if !data\n\nThis makes the data \u003d NULL case more consistent to the data !\u003d NULL case.\nThe functional change is that now\n\n\tplatform_device_add_data(somepdev, NULL, somesize)\n\nsets pdev-\u003edev.platform_data to NULL instead of not touching it.\n\nReviewed-by: Viresh Kumar \u003cviresh.kumar@st.com\u003e\nSigned-off-by: Uwe Kleine-König \u003cu.kleine-koenig@pengutronix.de\u003e\nSigned-off-by: Greg Kroah-Hartman \u003cgregkh@suse.de\u003e\n" }, { "commit": "7f100d1566d6ee353a43be92599511fc438ec281", "tree": "408ffc2cc8ccaa67e3c20c6527b9e12566b12ac2", "parents": [ "8497d6a21c4b17052e868bd53a74c82b557a6c46" ], "author": { "name": "Karthigan Srinivasan", "email": "karthigan.srinivasan@hp.com", "time": "Mon Apr 18 16:16:52 2011 -0500" }, "committer": { "name": "Greg Kroah-Hartman", "email": "gregkh@suse.de", "time": "Fri Apr 22 17:06:30 2011 -0700" }, "message": "drivers/base/core.c: Fixed brace coding style issue.\n\nFixed brace coding style issue.\n\nSigned-off-by: Karthigan Srinivasan \u003ckarthigan.srinivasan@hp.com\u003e\nSigned-off-by: Greg Kroah-Hartman \u003cgregkh@suse.de\u003e\n" }, { "commit": "8497d6a21c4b17052e868bd53a74c82b557a6c46", "tree": "f20b4098f8811a0dc7790a26150c969e5ae2ae80", "parents": [ "fc2711992b8601c20b7cc078f533e55c3106fbd4" ], "author": { "name": "Sebastian Ott", "email": "sebott@linux.vnet.ibm.com", "time": "Tue Apr 12 19:05:37 2011 +0200" }, "committer": { "name": "Greg Kroah-Hartman", "email": "gregkh@suse.de", "time": "Fri Apr 22 17:06:29 2011 -0700" }, "message": "driver-core: fix race between device_register and driver_register\n\nWhen a device is registered to a bus it will be a) added to the list\nof devices of the bus and b) bind to a driver (if one matches). As a\nresult of a driver being registered at this bus between a) and b) this\ndevice could already be bound to a driver. This leads to a warning\nand incorrect refcounting.\nTo fix this add a check to device_attach to identify an already bound\ndevice.\n\nSigned-off-by: Sebastian Ott \u003csebott@linux.vnet.ibm.com\u003e\nSigned-off-by: Greg Kroah-Hartman \u003cgregkh@suse.de\u003e\n" }, { "commit": "aed65af1cc2f6fc9ded5a8158f1405a02cf6d2ff", "tree": "fd7051c0d25a6f463db9593a981ca3e558d17b4f", "parents": [ "695cca8763078c743417886e80af8ccb78bec9f2" ], "author": { "name": "Stephen Hemminger", "email": "shemminger@vyatta.com", "time": "Mon Mar 28 09:12:52 2011 -0700" }, "committer": { "name": "Greg Kroah-Hartman", "email": "gregkh@suse.de", "time": "Tue Apr 19 16:45:51 2011 -0700" }, "message": "drivers: make device_type const\n\nThe device_type structure does not contain data that changes\nduring usage and should be const. This allows devices to declare\nthe struct const.\n\nI have patches to change all the subsystems, but need the infra\nstructure change first.\n\nSigned-off-by: Stephen Hemminger \u003cshemminger@vyatta.com\u003e\nSigned-off-by: Greg Kroah-Hartman \u003cgregkh@suse.de\u003e\n" }, { "commit": "19234c0819da0e043a02710488dfd9b242b42eba", "tree": "c55331dd010e5fe257e001261f1a31f53f62dff4", "parents": [ "2ca6f62f595c01f689b269db6736de5544da7667" ], "author": { "name": "Rafael J. Wysocki", "email": "rjw@sisk.pl", "time": "Wed Apr 20 00:36:11 2011 +0200" }, "committer": { "name": "Rafael J. Wysocki", "email": "rjw@sisk.pl", "time": "Wed Apr 20 00:36:11 2011 +0200" }, "message": "PM: Add missing syscore_suspend() and syscore_resume() calls\n\nDevice suspend/resume infrastructure is used not only by the suspend\nand hibernate code in kernel/power, but also by APM, Xen and the\nkexec jump feature. However, commit 40dc166cb5dddbd36aa4ad11c03915ea\n(PM / Core: Introduce struct syscore_ops for core subsystems PM)\nfailed to add syscore_suspend() and syscore_resume() calls to that\ncode, which generally leads to breakage when the features in question\nare used.\n\nTo fix this problem, add the missing syscore_suspend() and\nsyscore_resume() calls to arch/x86/kernel/apm_32.c, kernel/kexec.c\nand drivers/xen/manage.c.\n\nSigned-off-by: Rafael J. Wysocki \u003crjw@sisk.pl\u003e\nAcked-by: Greg Kroah-Hartman \u003cgregkh@suse.de\u003e\nAcked-by: Ian Campbell \u003cian.campbell@citrix.com\u003e\n" }, { "commit": "aaa119a3d4e0b7421c82ae3fbe288e65d0f3485f", "tree": "134923311a0ec019a1365f3ed87ffe32dae37f19", "parents": [ "6faf9a54156fb4d01d73344cc90cb52dda074433", "d419e4c0f7584ffc5c72d9aeeaac485cc756ebcf" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Tue Apr 12 17:18:05 2011 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Tue Apr 12 17:18:05 2011 -0700" }, "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 fix XEN_SAVE_RESTORE Kconfig dependencies\n PM / Hibernate: Introduce CONFIG_HIBERNATE_CALLBACKS\n" }, { "commit": "e710d7d5a9cab1041b7a3cf9e655b75d92786857", "tree": "916fc4d0e3e42e9fbd0e9051fe19c5bb082f4e8f", "parents": [ "a6360dd37e1a144ed11e6548371bade559a1e4df" ], "author": { "name": "Samuel Ortiz", "email": "sameo@linux.intel.com", "time": "Fri Apr 08 00:43:01 2011 +0200" }, "committer": { "name": "Samuel Ortiz", "email": "sameo@linux.intel.com", "time": "Tue Apr 12 11:13:00 2011 +0200" }, "message": "mfd: Fetch cell pointer from platform_device-\u003emfd_cell\n\nIn order for MFD drivers to fetch their cell pointer but also their\nplatform data one, an mfd cell pointer is added to the platform_device\nstructure.\nThat allows all MFD sub devices drivers to be MFD agnostic, unless\nthey really need to access their MFD cell data. Most of them don\u0027t,\nespecially the ones for IPs used by both MFD and non MFD SoCs.\n\nCc: Grant Likely \u003cgrant.likely@secretlab.ca\u003e\nAcked-by: Greg KH \u003cgregkh@suse.de\u003e\nSigned-off-by: Samuel Ortiz \u003csameo@linux.intel.com\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": "9f0af69b2dd34d2c21817d599db7bdb3c972a759", "tree": "68f76d50a1dc4d5393175904bb22338c44f012ac", "parents": [ "06794eaeb766989e450c1b459ae28da76e1f8719" ], "author": { "name": "Nikanth Karthikesan", "email": "knikanth@suse.de", "time": "Thu Mar 24 11:46:18 2011 +0530" }, "committer": { "name": "Jiri Kosina", "email": "jkosina@suse.cz", "time": "Sun Apr 10 17:01:05 2011 +0200" }, "message": "sysfs-memory: fix uninitialized variable warning and clean-up code.\n\nsysfs-memory: Fix uninitialized variable warning and clean-up code.\n\nSigned-off-by: Nikanth Karthikesan \u003cknikanth@suse.de\u003e\nSigned-off-by: Jiri Kosina \u003cjkosina@suse.cz\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": "d47d81c0e9abdc3c88653fabff5beae82c949b09", "tree": "1745f3316996e3cb0a02dcd7af90b88d836b6d17", "parents": [ "e00e56dfd3cf1d209ce630a2b440c91e4a30bbd3" ], "author": { "name": "Rafael J. Wysocki", "email": "rjw@sisk.pl", "time": "Wed Mar 23 22:16:41 2011 +0100" }, "committer": { "name": "Rafael J. Wysocki", "email": "rjw@sisk.pl", "time": "Wed Mar 23 22:16:41 2011 +0100" }, "message": "Introduce ARCH_NO_SYSDEV_OPS config option (v2)\n\nIntroduce Kconfig option allowing architectures where sysdev\noperations used during system suspend, resume and shutdown have been\ncompletely replaced with struct sycore_ops operations to avoid\nbuilding sysdev code that will never be used.\n\nMake callbacks in struct sys_device and struct sysdev_driver depend\non ARCH_NO_SYSDEV_OPS to allows us to verify if all of the references\nhave been actually removed from the code the given architecture\ndepends on.\n\nMake x86 select ARCH_NO_SYSDEV_OPS.\n\nSigned-off-by: Rafael J. Wysocki \u003crjw@sisk.pl\u003e\n" }, { "commit": "a5e6b135bdff649e4330f98e2e80dbb1984f7e77", "tree": "475bfb1163c59d1370fd77415255afba768f9520", "parents": [ "971f115a50afbe409825c9f3399d5a3b9aca4381", "9d90c8d9cde929cbc575098e825d7c29d9f45054" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Wed Mar 16 15:05:40 2011 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Wed Mar 16 15:05:40 2011 -0700" }, "message": "Merge branch \u0027driver-core-next\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/driver-core-2.6\n\n* \u0027driver-core-next\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/driver-core-2.6: (50 commits)\n printk: do not mangle valid userspace syslog prefixes\n efivars: Add Documentation\n efivars: Expose efivars functionality to external drivers.\n efivars: Parameterize operations.\n efivars: Split out variable registration\n efivars: parameterize efivars\n efivars: Make efivars bin_attributes dynamic\n efivars: move efivars globals into struct efivars\n drivers:misc: ti-st: fix debugging code\n kref: Fix typo in kref documentation\n UIO: add PRUSS UIO driver support\n Fix spelling mistakes in Documentation/zh_CN/SubmittingPatches\n firmware: Fix unaligned memory accesses in dmi-sysfs\n firmware: Add documentation for /sys/firmware/dmi\n firmware: Expose DMI type 15 System Event Log\n firmware: Break out system_event_log in dmi-sysfs\n firmware: Basic dmi-sysfs support\n firmware: Add DMI entry types to the headers\n Driver core: convert platform_{get,set}_drvdata to static inline functions\n Translate linux-2.6/Documentation/magic-number.txt into Chinese\n ...\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": "7ae496187876d264c712d7c102c45edb8eb41363", "tree": "b444c78a2104467259bb6ec34cc4a7815fa68185", "parents": [ "a8b7228cdce9937ebc302a28db8599035e7b3c86" ], "author": { "name": "Nishanth Menon", "email": "nm@ti.com", "time": "Fri Feb 25 23:46:18 2011 +0100" }, "committer": { "name": "Rafael J. Wysocki", "email": "rjw@sisk.pl", "time": "Tue Mar 15 00:43:17 2011 +0100" }, "message": "PM / OPP: opp_find_freq_exact() documentation fix\n\nopp_find_freq_exact() documentation has is_available instead\nof available. This also fixes warning with the kernel-doc:\nscripts/kernel-doc drivers/base/power/opp.c \u003e/dev/null\nWarning(drivers/base/power/opp.c:246): No description found for parameter \u0027available\u0027\nWarning(drivers/base/power/opp.c:246): Excess function parameter \u0027is_available\u0027 description in \u0027opp_find_freq_exact\u0027\n\nSigned-off-by: Nishanth Menon \u003cnm@ti.com\u003e\nSigned-off-by: Rafael J. Wysocki \u003crjw@sisk.pl\u003e\n" }, { "commit": "9659cc0678b954f187290c6e8b247a673c5d37e1", "tree": "b9b391d2397b0583757dd1529a85d714dbb81697", "parents": [ "cf4fb80ca3d591cae366ae8364e3c3f7a68bd249" ], "author": { "name": "Rafael J. Wysocki", "email": "rjw@sisk.pl", "time": "Fri Feb 18 23:20:21 2011 +0100" }, "committer": { "name": "Rafael J. Wysocki", "email": "rjw@sisk.pl", "time": "Tue Mar 15 00:43:17 2011 +0100" }, "message": "PM: Make system-wide PM and runtime PM treat subsystems consistently\n\nThe code handling system-wide power transitions (eg. suspend-to-RAM)\ncan in theory execute callbacks provided by the device\u0027s bus type,\ndevice type and class in each phase of the power transition. In\nturn, the runtime PM core code only calls one of those callbacks at\na time, preferring bus type callbacks to device type or class\ncallbacks and device type callbacks to class callbacks.\n\nIt seems reasonable to make them both behave in the same way in that\nrespect. Moreover, even though a device may belong to two subsystems\n(eg. bus type and device class) simultaneously, in practice power\nmanagement callbacks for system-wide power transitions are always\nprovided by only one of them (ie. if the bus type callbacks are\ndefined, the device class ones are not and vice versa). Thus it is\npossible to modify the code handling system-wide power transitions\nso that it follows the core runtime PM code (ie. treats the\nsubsystem callbacks as mutually exclusive).\n\nOn the other hand, the core runtime PM code will choose to execute,\nfor example, a runtime suspend callback provided by the device type\neven if the bus type\u0027s struct dev_pm_ops object exists, but the\nruntime_suspend pointer in it happens to be NULL. This is confusing,\nbecause it may lead to the execution of callbacks from different\nsubsystems during different operations (eg. the bus type suspend\ncallback may be executed during runtime suspend of the device, while\nthe device type callback will be executed during system suspend).\n\nMake all of the power management code treat subsystem callbacks in\na consistent way, such that:\n(1) If the device\u0027s type is defined (eg. dev-\u003etype is not NULL)\n and its pm pointer is not NULL, the callbacks from dev-\u003etype-\u003epm\n will be used.\n(2) If dev-\u003etype is NULL or dev-\u003etype-\u003epm is NULL, but the device\u0027s\n class is defined (eg. dev-\u003eclass is not NULL) and its pm pointer\n is not NULL, the callbacks from dev-\u003eclass-\u003epm will be used.\n(3) If dev-\u003etype is NULL or dev-\u003etype-\u003epm is NULL and dev-\u003eclass is\n NULL or dev-\u003eclass-\u003epm is NULL, the callbacks from dev-\u003ebus-\u003epm\n will be used provided that both dev-\u003ebus and dev-\u003ebus-\u003epm are\n not NULL.\n\nSigned-off-by: Rafael J. Wysocki \u003crjw@sisk.pl\u003e\nAcked-by: Kevin Hilman \u003ckhilman@ti.com\u003e\nReasoning-sounds-sane-to: Grant Likely \u003cgrant.likely@secretlab.ca\u003e\nAcked-by: Greg Kroah-Hartman \u003cgregkh@suse.de\u003e\n" }, { "commit": "7538e3db6e015e890825fbd9f8659952896ddd5b", "tree": "01a6d8c97599474d9c5fc1ed0eb6f0addaec5652", "parents": [ "6831c6edc7b272a08dd2a6c71bb183a48fe98ae6" ], "author": { "name": "Rafael J. Wysocki", "email": "rjw@sisk.pl", "time": "Wed Feb 16 21:53:17 2011 +0100" }, "committer": { "name": "Rafael J. Wysocki", "email": "rjw@sisk.pl", "time": "Tue Mar 15 00:43:16 2011 +0100" }, "message": "PM: Add support for device power domains\n\nThe platform bus type is often used to handle Systems-on-a-Chip (SoC)\nwhere all devices are represented by objects of type struct\nplatform_device. In those cases the same \"platform\" device driver\nmay be used with multiple different system configurations, but the\nactions needed to put the devices it handles into a low-power state\nand back into the full-power state may depend on the design of the\ngiven SoC. The driver, however, cannot possibly include all the\ninformation necessary for the power management of its device on all\nthe systems it is used with. Moreover, the device hierarchy in its\ncurrent form also is not suitable for representing this kind of\ninformation.\n\nThe patch below attempts to address this problem by introducing\nobjects of type struct dev_power_domain that can be used for\nrepresenting power domains within a SoC. Every struct\ndev_power_domain object provides a sets of device power\nmanagement callbacks that can be used to perform what\u0027s needed for\ndevice power management in addition to the operations carried out by\nthe device\u0027s driver and subsystem.\n\nNamely, if a struct dev_power_domain object is pointed to by the\npwr_domain field in a struct device, the callbacks provided by its\nops member will be executed in addition to the corresponding\ncallbacks provided by the device\u0027s subsystem and driver during all\npower transitions.\n\nSigned-off-by: Rafael J. Wysocki \u003crjw@sisk.pl\u003e\nTested-and-acked-by: Kevin Hilman \u003ckhilman@ti.com\u003e\n" }, { "commit": "e8665002477f0278f84f898145b1f141ba26ee26", "tree": "f22348cc3c0cf341216d422e01d2ac033973a0a5", "parents": [ "88a6f33e4d7143f94f8e787fa4065ac873507984" ], "author": { "name": "Rafael J. Wysocki", "email": "rjw@sisk.pl", "time": "Sat Feb 12 01:42:41 2011 +0100" }, "committer": { "name": "Rafael J. Wysocki", "email": "rjw@sisk.pl", "time": "Tue Mar 15 00:43:16 2011 +0100" }, "message": "PM: Allow pm_runtime_suspend() to succeed during system suspend\n\nThe dpm_prepare() function increments the runtime PM reference\ncounters of all devices to prevent pm_runtime_suspend() from\nexecuting subsystem-level callbacks. However, this was supposed to\nguard against a specific race condition that cannot happen, because\nthe power management workqueue is freezable, so pm_runtime_suspend()\ncan only be called synchronously during system suspend and we can\nrely on subsystems and device drivers to avoid doing that\nunnecessarily.\n\nMake dpm_prepare() drop the runtime PM reference to each device\nafter making sure that runtime resume is not pending for it.\n\nSigned-off-by: Rafael J. Wysocki \u003crjw@sisk.pl\u003e\nAcked-by: Kevin Hilman \u003ckhilman@ti.com\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": "cb8f51bdadb7969139c2e39c2defd4cde98c1ea8", "tree": "a6d6e20878460d50b8f61d5fe3237818c54065eb", "parents": [ "4681b17154b3fd81f898802262985f662344e6ed" ], "author": { "name": "Rafael J. Wysocki", "email": "rjw@sisk.pl", "time": "Tue Feb 08 23:26:02 2011 +0100" }, "committer": { "name": "Rafael J. Wysocki", "email": "rjw@sisk.pl", "time": "Tue Mar 15 00:43:14 2011 +0100" }, "message": "PM: Do not create wakeup sysfs files for devices that cannot wake up\n\nCurrently, wakeup sysfs attributes are created for all devices,\nregardless of whether or not they are wakeup-capable. This is\nexcessive and complicates wakeup device identification from user\nspace (i.e. to identify wakeup-capable devices user space has to read\n/sys/devices/.../power/wakeup for all devices and see if they are not\nempty).\n\nFix this issue by avoiding to create wakeup sysfs files for devices\nthat cannot wake up the system from sleep states (i.e. whose\npower.can_wakeup flags are unset during registration) and modify\ndevice_set_wakeup_capable() so that it adds (or removes) the relevant\nsysfs attributes if a device\u0027s wakeup capability status is changed.\n\nSigned-off-by: Rafael J. Wysocki \u003crjw@sisk.pl\u003e\n" }, { "commit": "0295a34d61f14522fddb26856191520d2e1d7e77", "tree": "6ad5f6f7c467f512d36f3955f629aef1fa667c11", "parents": [ "790c7885a4b2105e41f7a80b035fdb78e406154f" ], "author": { "name": "Mandeep Singh Baines", "email": "msb@chromium.org", "time": "Mon Jan 31 11:07:14 2011 +0100" }, "committer": { "name": "Rafael J. Wysocki", "email": "rjw@sisk.pl", "time": "Tue Mar 15 00:43:14 2011 +0100" }, "message": "PM: Use appropriate printk() priority level in trace.c\n\nprintk()s without a priority level default to KERN_WARNING. To reduce\nnoise at KERN_WARNING, this patch sets the priority level appriopriately\nfor unleveled printks()s. This should be useful to folks that look at\ndmesg warnings closely.\n\nChanged these messages to pr_info().\n\nSigned-off-by: Mandeep Singh Baines \u003cmsb@chromium.org\u003e\nSigned-off-by: Rafael J. Wysocki \u003crjw@sisk.pl\u003e\n" }, { "commit": "790c7885a4b2105e41f7a80b035fdb78e406154f", "tree": "dd0e725335ffe47ebd940f04cbd44db88a39759d", "parents": [ "378eef99ad45700aabfba2bd962516e5608b259a" ], "author": { "name": "Rafael J. Wysocki", "email": "rjw@sisk.pl", "time": "Mon Jan 31 11:07:01 2011 +0100" }, "committer": { "name": "Rafael J. Wysocki", "email": "rjw@sisk.pl", "time": "Tue Mar 15 00:43:14 2011 +0100" }, "message": "PM / Wakeup: Don\u0027t update events_check_enabled in pm_get_wakeup_count()\n\nSince pm_save_wakeup_count() has just been changed to clear\nevents_check_enabled unconditionally before checking if there are\nany new wakeup events registered since the last read from\n/sys/power/wakeup_count, the detection of wakeup events during\nsuspend may be disabled, after it\u0027s been enabled, by writing a\n\"wrong\" value back to /sys/power/wakeup_count. For this reason,\nit is not necessary to update events_check_enabled in\npm_get_wakeup_count() any more.\n\nSigned-off-by: Rafael J. Wysocki \u003crjw@sisk.pl\u003e\n" }, { "commit": "378eef99ad45700aabfba2bd962516e5608b259a", "tree": "d9a0d584495e5b6ee764b6d740cece46f3b5ed1d", "parents": [ "023d3779145ec6b7a0f38f19672a347b92feb74e" ], "author": { "name": "Rafael J. Wysocki", "email": "rjw@sisk.pl", "time": "Mon Jan 31 11:06:50 2011 +0100" }, "committer": { "name": "Rafael J. Wysocki", "email": "rjw@sisk.pl", "time": "Tue Mar 15 00:43:13 2011 +0100" }, "message": "PM / Wakeup: Make pm_save_wakeup_count() work as documented\n\nAccording to Documentation/ABI/testing/sysfs-power, the\n/sys/power/wakeup_count interface should only make the kernel react\nto wakeup events during suspend if the last write to it has been\nsuccessful. However, if /sys/power/wakeup_count is written to two\ntimes in a row, where the first write is successful and the second\nis not, the kernel will still react to wakeup events during suspend\ndue to a bug in pm_save_wakeup_count().\n\nFix the bug by making pm_save_wakeup_count() clear\nevents_check_enabled unconditionally before checking if there are\nany new wakeup events registered since the previous read from\n/sys/power/wakeup_count.\n\nSigned-off-by: Rafael J. Wysocki \u003crjw@sisk.pl\u003e\n" }, { "commit": "023d3779145ec6b7a0f38f19672a347b92feb74e", "tree": "1ec78dc731dad2b8155faf6625617284f1b3b76d", "parents": [ "dc1b83ab08f1954335692cdcd499f78c94f4c42a" ], "author": { "name": "Rafael J. Wysocki", "email": "rjw@sisk.pl", "time": "Mon Jan 31 11:06:39 2011 +0100" }, "committer": { "name": "Rafael J. Wysocki", "email": "rjw@sisk.pl", "time": "Tue Mar 15 00:43:13 2011 +0100" }, "message": "PM / Wakeup: Combine atomic counters to avoid reordering issues\n\nThe memory barrier in wakeup_source_deactivate() is supposed to\nprevent the callers of pm_wakeup_pending() and pm_get_wakeup_count()\nfrom seeing the new value of events_in_progress (0, in particular)\nand the old value of event_count at the same time. However, if\nwakeup_source_deactivate() is executed by CPU0 and, for instance,\npm_wakeup_pending() is executed by CPU1, where both processors can\nreorder operations, the memory barrier in wakeup_source_deactivate()\ndoesn\u0027t affect CPU1 which can reorder reads. In that case CPU1 may\nvery well decide to fetch event_count before it\u0027s modified and\nevents_in_progress after it\u0027s been updated, so pm_wakeup_pending()\nmay fail to detect a wakeup event. This issue can be addressed by\nusing a single atomic variable to store both events_in_progress\nand event_count, so that they can be updated together in a single\natomic operation.\n\nSigned-off-by: Rafael J. Wysocki \u003crjw@sisk.pl\u003e\n" }, { "commit": "481e20799bdcf98fd5a1d829d187239a90b15395", "tree": "70e2560564252c84edf64ff3822d4ac9702a9b5a", "parents": [ "6add7cd618b4d4dc525731beb539c5e06e891855" ], "author": { "name": "Ferenc Wagner", "email": "wferi@niif.hu", "time": "Fri Jan 07 15:17:47 2011 +0100" }, "committer": { "name": "Greg Kroah-Hartman", "email": "gregkh@suse.de", "time": "Thu Feb 03 16:36:40 2011 -0800" }, "message": "driver core: Replace the dangerous to_root_device macro with an inline function\n\nThe original macro worked only when applied to variables named \u0027dev\u0027.\nWhile this could have been fixed by simply renaming the macro argument,\na more type-safe replacement by an inline function is preferred.\n\nSigned-off-by: Ferenc Wagner \u003cwferi@niif.hu\u003e\nSigned-off-by: Greg Kroah-Hartman \u003cgregkh@suse.de\u003e\n" }, { "commit": "6add7cd618b4d4dc525731beb539c5e06e891855", "tree": "624d7f27f6d869468d3355b31f27f2b2a00ad83e", "parents": [ "1dc41aa6d6172d61c10638d11933a3595a41d51a" ], "author": { "name": "Nathan Fontenot", "email": "nfont@austin.ibm.com", "time": "Mon Jan 31 10:55:23 2011 -0600" }, "committer": { "name": "Greg Kroah-Hartman", "email": "gregkh@suse.de", "time": "Thu Feb 03 16:08:58 2011 -0800" }, "message": "memory hotplug: sysfs probe routine should add all memory sections\n\nAs a follow-on to the recent patches I submitted that allowed for a sysfs\nmemory block to span multiple memory sections, we should also update the\nprobe routine to online all of the memory sections in a memory block. Without\nthis patch the current code will only add a single memory section. I think\nthe probe routine should add all of the memory sections in the specified memory\nblock so that its behavior is in line with memory hotplug actions through\nthe sysfs interfaces.\n\nThis patch applies on top of the previous sysfs memory updates to allow\na sysfs directory o span multiple memory sections.\n\nhttps://lkml.org/lkml/2011/1/20/245\n\nSigned-off-by: Nathan Fontenot \u003cnfont@austin.ibm.com\u003e\nSigned-off-by: Greg Kroah-Hartman \u003cgregkh@suse.de\u003e\n" }, { "commit": "d33601644cd3b09afb2edd9474517edc441c8fad", "tree": "1fc119bb30895d39d2dc9d1f738fb8d82c095ab1", "parents": [ "0c2c99b1b8ab5d294f176d631e945ebdefcce4cd" ], "author": { "name": "Nathan Fontenot", "email": "nfont@austin.ibm.com", "time": "Thu Jan 20 10:44:29 2011 -0600" }, "committer": { "name": "Greg Kroah-Hartman", "email": "gregkh@suse.de", "time": "Thu Feb 03 16:08:57 2011 -0800" }, "message": "memory hotplug: Update phys_index to [start|end]_section_nr\n\nUpdate the \u0027phys_index\u0027 property of a the memory_block struct to be\ncalled start_section_nr, and add a end_section_nr property. The\ndata tracked here is the same but the updated naming is more in line\nwith what is stored here, namely the first and last section number\nthat the memory block spans.\n\nThe names presented to userspace remain the same, phys_index for\nstart_section_nr and end_phys_index for end_section_nr, to avoid breaking\nanything in userspace.\n\nThis also updates the node sysfs code to be aware of the new capability for\na memory block to contain multiple memory sections and be aware of the memory\nblock structure name changes (start_section_nr). This requires an additional\nparameter to unregister_mem_sect_under_nodes so that we know which memory\nsection of the memory block to unregister.\n\nSigned-off-by: Nathan Fontenot \u003cnfont@austin.ibm.com\u003e\nReviewed-by: Robin Holt \u003cholt@sgi.com\u003e\nReviewed-by: KAMEZAWA Hiroyuki \u003ckamezawa.hiroyu@jp.fujitsu.com\u003e\nSigned-off-by: Greg Kroah-Hartman \u003cgregkh@suse.de\u003e\n" }, { "commit": "0c2c99b1b8ab5d294f176d631e945ebdefcce4cd", "tree": "7ef92584ef4deaa50e8164cc707b47dccf38409b", "parents": [ "e8d9792aa514e49bf618713987c393d93babc2c5" ], "author": { "name": "Nathan Fontenot", "email": "nfont@austin.ibm.com", "time": "Thu Jan 20 10:43:34 2011 -0600" }, "committer": { "name": "Greg Kroah-Hartman", "email": "gregkh@suse.de", "time": "Thu Feb 03 16:08:57 2011 -0800" }, "message": "memory hotplug: Allow memory blocks to span multiple memory sections\n\nUpdate the memory sysfs code such that each sysfs memory directory is now\nconsidered a memory block that can span multiple memory sections per\nmemory block. The default size of each memory block is SECTION_SIZE_BITS\nto maintain the current behavior of having a single memory section per\nmemory block (i.e. one sysfs directory per memory section).\n\nFor architectures that want to have memory blocks span multiple\nmemory sections they need only define their own memory_block_size_bytes()\nroutine.\n\nUpdate the memory hotplug documentation to reflect the new behaviors of\nmemory blocks reflected in sysfs.\n\nSigned-off-by: Nathan Fontenot \u003cnfont@austin.ibm.com\u003e\nReviewed-by: Robin Holt \u003cholt@sgi.com\u003e\nReviewed-by: KAMEZAWA Hiroyuki \u003ckamezawa.hiroyu@jp.fujitsu.com\u003e\nSigned-off-by: Greg Kroah-Hartman \u003cgregkh@suse.de\u003e\n" }, { "commit": "f4203e3032e5ae74c3e89df85a5a6d96022d0c49", "tree": "c1030cc10185144df78137ad2bf85ef03ede3d54", "parents": [ "1f7da214e26a8ee4fbb66af50e27147d5d115c5a" ], "author": { "name": "Borislav Petkov", "email": "borislav.petkov@amd.com", "time": "Tue Feb 01 17:19:56 2011 +0100" }, "committer": { "name": "Greg Kroah-Hartman", "email": "gregkh@suse.de", "time": "Thu Feb 03 15:41:03 2011 -0800" }, "message": "sysdev: Do not register with sysdev when erroring on add\n\nWhen encountering an error while executing the driver\u0027s -\u003eadd method, we\nshould cancel registration and unwind what we\u0027ve regged so far. The low\nlevel -\u003eadd methods do return proper error codes but those aren\u0027t looked\nat in sysdev_driver_register(). Fix that by sharing the unregistering\ncode.\n\nSigned-off-by: Borislav Petkov \u003cborislav.petkov@amd.com\u003e\nSigned-off-by: Greg Kroah-Hartman \u003cgregkh@suse.de\u003e\n" }, { "commit": "345279bc105e5a331ee81b0e8446b61f2c155784", "tree": "ef6039b8349c59ad29a78f6d165889111d5767f8", "parents": [ "072fc8f0a8df9bf36392f15b729044cb2ad27332" ], "author": { "name": "Borislav Petkov", "email": "borislav.petkov@amd.com", "time": "Tue Feb 01 17:19:57 2011 +0100" }, "committer": { "name": "Greg Kroah-Hartman", "email": "gregkh@suse.de", "time": "Thu Feb 03 15:39:17 2011 -0800" }, "message": "sysdev: Fixup warning message\n\nUse gcc\u0027s __func__ instead of the function name.\n\nSigned-off-by: Borislav Petkov \u003cborislav.petkov@amd.com\u003e\nSigned-off-by: Greg Kroah-Hartman \u003cgregkh@suse.de\u003e\n" }, { "commit": "072fc8f0a8df9bf36392f15b729044cb2ad27332", "tree": "4e4fba1f8e36da34fcb44d015a217d1e2bb4c790", "parents": [ "8ba6ebf583f12da32036fc0f003ab4043e54692e" ], "author": { "name": "Bob Liu", "email": "lliubbo@gmail.com", "time": "Wed Jan 26 18:33:32 2011 +0800" }, "committer": { "name": "Greg Kroah-Hartman", "email": "gregkh@suse.de", "time": "Thu Feb 03 15:39:17 2011 -0800" }, "message": "firmware_classs: change val uevent\u0027s type to bool\n\nSome place in firmware_class.c using \"int uevent\" define, but others use \"bool\nuevent\".\nThis patch replace all int uevent define to bool.\n\nSigned-off-by: Bob Liu \u003clliubbo@gmail.com\u003e\nAcked-by: Dmitry Torokhov \u003cdtor@mail.ru\u003e\nSigned-off-by: Greg Kroah-Hartman \u003cgregkh@suse.de\u003e\n" }, { "commit": "a5462516aa9942bd68c8769d4bcefa8a7c718300", "tree": "f13126cc825173266f7ad3cb514698418faa7074", "parents": [ "ebf53826e105f488f4f628703a108e98940d1dc5" ], "author": { "name": "Timur Tabi", "email": "timur@freescale.com", "time": "Mon Dec 13 14:08:52 2010 -0600" }, "committer": { "name": "Greg Kroah-Hartman", "email": "gregkh@suse.de", "time": "Thu Feb 03 15:10:18 2011 -0800" }, "message": "driver-core: document restrictions on device_rename()\n\nAdd text, courtesy of Kay Sievers, that provides some background on\ndevice_rename() and why it shouldn\u0027t be used.\n\nSigned-off-by: Timur Tabi \u003ctimur@freescale.com\u003e\nSigned-off-by: Greg Kroah-Hartman \u003cgregkh@suse.de\u003e\n" }, { "commit": "c3810c88788d505d4ffd786addd111b745e42161", "tree": "cc70c4e1ec62adb4f51cf7e1f45ed296a0475f04", "parents": [ "c723fdab8aa728dc2bf0da6a0de8bb9c3f588d84" ], "author": { "name": "Alan Stern", "email": "stern@rowland.harvard.edu", "time": "Tue Jan 25 20:50:07 2011 +0100" }, "committer": { "name": "Rafael J. Wysocki", "email": "rjw@sisk.pl", "time": "Tue Jan 25 20:50:07 2011 +0100" }, "message": "PM / Runtime: Don\u0027t enable interrupts while running in_interrupt\n\nThis patch (as1445) fixes a bug in the runtime PM core left over from\nthe addition of the no_callbacks flag. If this flag is set then it is\npossible for rpm_suspend() to be called in_interrupt, so when\nreleasing spinlocks it\u0027s important not to re-enable interrupts.\n\nTo avoid an unnecessary save-and-restore of the interrupt flag, the\npatch also inlines a pm_request_idle() call.\n\nThis fixes Bugzilla #27482.\n\n(The offending code was added in 2.6.37, so it\u0027s not necessary to apply\nthis to any earlier stable kernels.)\n\nSigned-off-by: Alan Stern \u003cstern@rowland.harvard.edu\u003e\nReported-by: tim blechmann \u003ctim@klingt.org\u003e\nCC: \u003cstable@kernel.org\u003e\nSigned-off-by: Rafael J. Wysocki \u003crjw@sisk.pl\u003e\n" }, { "commit": "6a108a14fa356ef607be308b68337939e56ea94e", "tree": "1bf260572bd8f95ed867307a2bcf5d881c8ae4a6", "parents": [ "12fcdba1b7ae8b25696433f420b775aeb556d89b" ], "author": { "name": "David Rientjes", "email": "rientjes@google.com", "time": "Thu Jan 20 14:44:16 2011 -0800" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Thu Jan 20 17:02:05 2011 -0800" }, "message": "kconfig: rename CONFIG_EMBEDDED to CONFIG_EXPERT\n\nThe meaning of CONFIG_EMBEDDED has long since been obsoleted; the option\nis used to configure any non-standard kernel with a much larger scope than\nonly small devices.\n\nThis patch renames the option to CONFIG_EXPERT in init/Kconfig and fixes\nreferences to the option throughout the kernel. A new CONFIG_EMBEDDED\noption is added that automatically selects CONFIG_EXPERT when enabled and\ncan be used in the future to isolate options that should only be\nconsidered for embedded systems (RISC architectures, SLOB, etc).\n\nCalling the option \"EXPERT\" more accurately represents its intention: only\nexpert users who understand the impact of the configuration changes they\nare making should enable it.\n\nReviewed-by: Ingo Molnar \u003cmingo@elte.hu\u003e\nAcked-by: David Woodhouse \u003cdavid.woodhouse@intel.com\u003e\nSigned-off-by: David Rientjes \u003crientjes@google.com\u003e\nCc: Greg KH \u003cgregkh@suse.de\u003e\nCc: \"David S. Miller\" \u003cdavem@davemloft.net\u003e\nCc: Jens Axboe \u003caxboe@kernel.dk\u003e\nCc: Arnd Bergmann \u003carnd@arndb.de\u003e\nCc: Robin Holt \u003cholt@sgi.com\u003e\nCc: \u003clinux-arch@vger.kernel.org\u003e\nSigned-off-by: Andrew Morton \u003cakpm@linux-foundation.org\u003e\nSigned-off-by: Linus Torvalds \u003ctorvalds@linux-foundation.org\u003e\n" }, { "commit": "05b258e99725112c4febeab4fad23ea2c8908a3a", "tree": "f373644f42104eef9c78299d52cec4f6975a3ef0", "parents": [ "9992af102974f3f8a02a1f2729c3461881539e26" ], "author": { "name": "David Rientjes", "email": "rientjes@google.com", "time": "Thu Jan 13 15:47:14 2011 -0800" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Thu Jan 13 17:32:46 2011 -0800" }, "message": "thp: transparent hugepage sysfs meminfo\n\nAdd hugepage statistics to per-node sysfs meminfo\n\nReviewed-by: Rik van Riel \u003criel@redhat.com\u003e\nSigned-off-by: David Rientjes \u003crientjes@google.com\u003e\nSigned-off-by: Andrea Arcangeli \u003caarcange@redhat.com\u003e\nSigned-off-by: Andrew Morton \u003cakpm@linux-foundation.org\u003e\nSigned-off-by: Linus Torvalds \u003ctorvalds@linux-foundation.org\u003e\n" }, { "commit": "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": "e54be894eae10eca9892e965cc9532f5d5a11767", "tree": "27ace4446e42058ef4813a34bf63b55a870e7a12", "parents": [ "949f6711b83d2809d1ccb9d830155a65fdacdff9", "c6c0ac664c86ff6408fadbed4913938c8a732e26" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Mon Jan 10 16:10:33 2011 -0800" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Mon Jan 10 16:10:33 2011 -0800" }, "message": "Merge branch \u0027driver-core-next\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/driver-core-2.6\n\n* \u0027driver-core-next\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/driver-core-2.6:\n driver core: Document that device_rename() is only for networking\n sysfs: remove useless test from sysfs_merge_group\n driver-core: merge private parts of class and bus\n driver core: fix whitespace in class_attr_string\n" }, { "commit": "facc7a96d443d84060a8679c3fcc51d20d4981c3", "tree": "e2d633b07766609aedac0708adcde2bc2e37e68a", "parents": [ "c8940eca75e6d1ea57f6c491a30bd1023c64c9ad", "4ead36407b41eae942c8c9f70ef963cd369c90e2" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Mon Jan 10 08:15:37 2011 -0800" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Mon Jan 10 08:15:37 2011 -0800" }, "message": "Merge branch \u0027for-linus\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/hid\n\n* \u0027for-linus\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/hid: (34 commits)\n HID: roccat: Update sysfs attribute doc\n HID: roccat: don\u0027t use #pragma pack\n HID: roccat: Add support for Roccat Kone[+] v2\n HID: roccat: reduce number of functions in kone and pyra drivers\n HID: roccat: declare meaning of pack pragma usage in driver headers\n HID: roccat: use class for char device for sysfs attribute creation\n sysfs: Introducing binary attributes for struct class\n HID: hidraw: add compatibility ioctl() for 32-bit applications.\n HID: hid-picolcd: Fix memory leak in picolcd_debug_out_report()\n HID: picolcd: fix misuse of logical operation in place of bitop\n HID: usbhid: base runtime PM on modern API\n HID: replace offsets values with their corresponding BTN_* defines\n HID: hid-mosart: support suspend/resume\n HID: hid-mosart: ignore buttons report\n HID: hid-picolcd: don\u0027t use flush_scheduled_work()\n HID: simplify an index check in hid_lookup_collection\n HID: Hoist assigns from ifs\n HID: Remove superfluous __inline__\n HID: Use vzalloc for vmalloc/memset(,0...)\n HID: Add and use hid_\u003clevel\u003e: dev_\u003clevel\u003e equivalents\n ...\n" }, { "commit": "c97415a72521071c235e0879f9a600014afd87b1", "tree": "4b71de5a0074f93daf4ddea07888c70c3bcc0eaf", "parents": [ "a7153258b70ccbe3922fcee9ca4271d4f4c2bc55" ], "author": { "name": "Stefan Achatz", "email": "erazor_de@users.sourceforge.net", "time": "Fri Nov 26 19:57:29 2010 +0000" }, "committer": { "name": "Jiri Kosina", "email": "jkosina@suse.cz", "time": "Sat Jan 08 01:09:21 2011 +0100" }, "message": "sysfs: Introducing binary attributes for struct class\n\nAdded dev_bin_attrs to struct class similar to existing dev_attrs.\n\nSigned-off-by: Stefan Achatz \u003cerazor_de@users.sourceforge.net\u003e\nAcked-by: Greg Kroah-Hartman \u003cgregkh@suse.de\u003e\nSigned-off-by: Jiri Kosina \u003cjkosina@suse.cz\u003e\n" }, { "commit": "4b31db8a16fa0d4d6a0fa42d044e7a4f4dad3641", "tree": "4075d84f26fdd8e70ec62c9b541caa1ea23cebda", "parents": [ "5c1a07ab3e78ef68fc9ccf419c969e8ed88d7cb6" ], "author": { "name": "Rafael J. Wysocki", "email": "rjw@sisk.pl", "time": "Fri Dec 24 15:04:06 2010 +0100" }, "committer": { "name": "Rafael J. Wysocki", "email": "rjw@sisk.pl", "time": "Fri Dec 24 15:04:06 2010 +0100" }, "message": "PM / Runtime: Generic resume shouldn\u0027t set RPM_ACTIVE unconditionally\n\nThe __pm_generic_resume() function changes the given device\u0027s runtime\nPM status to RPM_ACTIVE if its driver\u0027s callback returns 0, but it\nonly should do that if the rumtime PM is enabled for the device.\n\nSigned-off-by: Rafael J. Wysocki \u003crjw@sisk.pl\u003e\n" }, { "commit": "5c1a07ab3e78ef68fc9ccf419c969e8ed88d7cb6", "tree": "4c3866f747a5947ed7f687d625059381944304e5", "parents": [ "b64959e6158d6dcb640fc22d7f43b94ad1c91135" ], "author": { "name": "Rafael J. Wysocki", "email": "rjw@sisk.pl", "time": "Fri Dec 24 15:03:34 2010 +0100" }, "committer": { "name": "Rafael J. Wysocki", "email": "rjw@sisk.pl", "time": "Fri Dec 24 15:03:34 2010 +0100" }, "message": "PM: Use dev_name() in core device suspend and resume routines\n\nUse dev_name() wherever applicable in drivers/base/power/main.c.\n\nSigned-off-by: Rafael J. Wysocki \u003crjw@sisk.pl\u003e\n" }, { "commit": "b64959e6158d6dcb640fc22d7f43b94ad1c91135", "tree": "51208ab0468472bd2e8a33ed44a5eaa69d8247ed", "parents": [ "b8c76f6aed0ab7df73a6410f3f82de2c831bb144" ], "author": { "name": "Rafael J. Wysocki", "email": "rjw@sisk.pl", "time": "Thu Dec 16 17:11:45 2010 +0100" }, "committer": { "name": "Rafael J. Wysocki", "email": "rjw@sisk.pl", "time": "Fri Dec 24 15:02:44 2010 +0100" }, "message": "PM: Permit registration of parentless devices during system suspend\n\nThe registration of a new parentless device during system suspend\nwill not lead to any complications affecting the PM core (the device\nwill be effectively seen after the subsequent resume has completed),\nso remove the code used for detection of such events.\n\nSigned-off-by: Rafael J. Wysocki \u003crjw@sisk.pl\u003e\n" }, { "commit": "b8c76f6aed0ab7df73a6410f3f82de2c831bb144", "tree": "1194ded4c23f62ab253a2e0712cfdd436aa2365b", "parents": [ "5b219a51fdceaf76e0e18da57c7efb9e5586e567" ], "author": { "name": "Rafael J. Wysocki", "email": "rjw@sisk.pl", "time": "Thu Dec 16 00:51:21 2010 +0100" }, "committer": { "name": "Rafael J. Wysocki", "email": "rjw@sisk.pl", "time": "Fri Dec 24 15:02:44 2010 +0100" }, "message": "PM: Replace the device power.status field with a bit field\n\nThe device power.status field is too complicated for its purpose\n(storing the information about whether or not the device is in the\n\"active\" state from the PM core\u0027s point of view), so replace it with\na bit field and modify all of its users accordingly.\n\nSigned-off-by: Rafael J. Wysocki \u003crjw@sisk.pl\u003e\n" }, { "commit": "5b219a51fdceaf76e0e18da57c7efb9e5586e567", "tree": "de72cbfa6c47170a1118716ffafc5a876d4ebfbc", "parents": [ "8a43a9ab7b329aa8590f8a064df9bf8c80987507" ], "author": { "name": "Rafael J. Wysocki", "email": "rjw@sisk.pl", "time": "Thu Dec 16 00:51:08 2010 +0100" }, "committer": { "name": "Rafael J. Wysocki", "email": "rjw@sisk.pl", "time": "Fri Dec 24 15:02:43 2010 +0100" }, "message": "PM: Remove redundant checks from core device resume routines\n\nSince a separate list of devices is used to link devices that have\ncompleted each stage of suspend (or resume), it is not necessary to\ncheck dev-\u003epower.status in the core device resume routines any more.\n\nSigned-off-by: Rafael J. Wysocki \u003crjw@sisk.pl\u003e\n" }, { "commit": "8a43a9ab7b329aa8590f8a064df9bf8c80987507", "tree": "7e60bb0dd5f4dcf6531aa3aad196930f02553166", "parents": [ "2cbb3ce1ad19e66858a4284dd6c4bb958162c483" ], "author": { "name": "Rafael J. Wysocki", "email": "rjw@sisk.pl", "time": "Thu Dec 16 00:50:30 2010 +0100" }, "committer": { "name": "Rafael J. Wysocki", "email": "rjw@sisk.pl", "time": "Fri Dec 24 15:02:43 2010 +0100" }, "message": "PM: Use a different list of devices for each stage of device suspend\n\nInstead of keeping all devices in the same list during system suspend\nand resume, regardless of what suspend-resume callbacks have been\nexecuted for them already, use separate lists of devices that have\nhad their -\u003eprepare(), -\u003esuspend() and -\u003esuspend_noirq() callbacks\nexecuted. This will allow us to simplify the core device suspend and\nresume routines.\n\nSigned-off-by: Rafael J. Wysocki \u003crjw@sisk.pl\u003e\n" }, { "commit": "2cbb3ce1ad19e66858a4284dd6c4bb958162c483", "tree": "ae1fd63072a8f57813a98c589680d1f41e08f919", "parents": [ "d83f905e126f8cbc5e4addc5d1a64aea785b732e" ], "author": { "name": "Rafael J. Wysocki", "email": "rjw@sisk.pl", "time": "Wed Dec 15 00:17:29 2010 +0100" }, "committer": { "name": "Rafael J. Wysocki", "email": "rjw@sisk.pl", "time": "Fri Dec 24 15:02:42 2010 +0100" }, "message": "PM: Avoid compiler warning in pm_noirq_op()\n\nThe compiler complains that calltime may be uninitialized in\npm_noirq_op(), so add extra initialization for that variable to\navoid the warning.\n\nSigned-off-by: Rafael J. Wysocki \u003crjw@sisk.pl\u003e\n" }, { "commit": "d83f905e126f8cbc5e4addc5d1a64aea785b732e", "tree": "45778fff5807b9e844f5290d4f0674433d157102", "parents": [ "a2867e08c8e3bdbc00caf56bc3bdde19ccc058e3" ], "author": { "name": "Rafael J. Wysocki", "email": "rjw@sisk.pl", "time": "Fri Dec 03 23:14:26 2010 +0100" }, "committer": { "name": "Rafael J. Wysocki", "email": "rjw@sisk.pl", "time": "Fri Dec 24 15:02:42 2010 +0100" }, "message": "PM: Use pm_wakeup_pending() in __device_suspend()\n\nBefore starting to suspend a device in __device_suspend() check if\nthere\u0027s a request to abort the power transition and return -EBUSY\nin that case.\n\nSigned-off-by: Rafael J. Wysocki \u003crjw@sisk.pl\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": "1e75227ef0571031cd18536ab768ee35667ec5b9", "tree": "13535aa717c401d390f6ab3cbd87e030aa2a75ef", "parents": [ "7ac4dcabdb482d4e74c9d36782d00bc6c4c01619" ], "author": { "name": "Rafael J. Wysocki", "email": "rjw@sisk.pl", "time": "Fri Dec 03 22:58:05 2010 +0100" }, "committer": { "name": "Rafael J. Wysocki", "email": "rjw@sisk.pl", "time": "Fri Dec 24 15:02:41 2010 +0100" }, "message": "PM: Prevent dpm_prepare() from returning errors unnecessarily\n\nCurrently dpm_prepare() returns error code if it finds that a device\nbeing suspended has a pending runtime resume request. However, it\nshould not do that if the checking for wakeup events is not enabled.\nOn the other hand, if the checking for wakeup events is enabled, it\ncan return error when a wakeup event is detected, regardless of its\nsource.\n\nSigned-off-by: Rafael J. Wysocki \u003crjw@sisk.pl\u003e\n" }, { "commit": "c7b61de5b7b17f0df34dc7d2f8b9576f8bd36fce", "tree": "d8cf6be1aab175839973d2c76060bd41d65b2ed5", "parents": [ "5262a47502adcfc3a64403120768f528418a3b79" ], "author": { "name": "Alan Stern", "email": "stern@rowland.harvard.edu", "time": "Wed Dec 01 00:14:42 2010 +0100" }, "committer": { "name": "Rafael J. Wysocki", "email": "rjw@sisk.pl", "time": "Fri Dec 24 15:02:41 2010 +0100" }, "message": "PM / Runtime: Add synchronous runtime interface for interrupt handlers (v3)\n\nThis patch (as1431c) makes the synchronous runtime-PM interface\nsuitable for use in interrupt handlers. Subsystems can call the new\npm_runtime_irq_safe() function to tell the PM core that a device\u0027s\nruntime_suspend and runtime_resume callbacks should be invoked with\ninterrupts disabled and the spinlock held. This permits the\npm_runtime_get_sync() and the new pm_runtime_put_sync_suspend()\nroutines to be called from within interrupt handlers.\n\nWhen a device is declared irq-safe in this way, the PM core increments\nthe parent\u0027s usage count, so the parent will never be runtime\nsuspended. This prevents difficult situations in which an irq-safe\ndevice can\u0027t resume because it is forced to wait for its non-irq-safe\nparent.\n\nSigned-off-by: Alan Stern \u003cstern@rowland.harvard.edu\u003e\nSigned-off-by: Rafael J. Wysocki \u003crjw@sisk.pl\u003e\n" }, { "commit": "6675bc056790b403d198a173498d377187754142", "tree": "2e792c4871a5e900b49b2ad4fa5f2e027d6ee121", "parents": [ "eda4b716ea1f2a647a39cebae66b3fae4c4b80e4" ], "author": { "name": "Aaro Koskinen", "email": "aaro.koskinen@nokia.com", "time": "Thu Nov 25 23:41:19 2010 +0100" }, "committer": { "name": "Rafael J. Wysocki", "email": "rjw@sisk.pl", "time": "Fri Dec 24 15:02:39 2010 +0100" }, "message": "PM / Runtime: Fix comments to match runtime callback code\n\nCommit 05aa55dddb9ee4045c320661068bea78dad6a6e5 changed routines to\nsucceed if the driver handler is not defined. Comments were not updated.\n\nSigned-off-by: Aaro Koskinen \u003caaro.koskinen@nokia.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" } ], "next": "c6c0ac664c86ff6408fadbed4913938c8a732e26" }