)]}' { "log": [ { "commit": "9a170caed6fce89da77852575a7eee7dbadee332", "tree": "489082522869cb382a2dc464ccbd474846693a37", "parents": [ "45ff46c54a31bf8924b61e3e3411654410a3b5c3", "7b4f3990a22fbe800945f12001bc30db374d0af5" ], "author": { "name": "Dave Airlie", "email": "airlied@redhat.com", "time": "Wed Oct 06 10:11:56 2010 +1000" }, "committer": { "name": "Dave Airlie", "email": "airlied@redhat.com", "time": "Wed Oct 06 10:11:56 2010 +1000" }, "message": "Merge remote branch \u0027intel/drm-intel-next\u0027 of ../drm-next into drm-core-next\n\n* \u0027intel/drm-intel-next\u0027 of ../drm-next: (266 commits)\n drm/i915: Avoid circular locking from intel_fbdev_fini()\n drm/i915: mark display port DPMS state as \u0027ON\u0027 when enabling output\n drm/i915: Skip pread/pwrite if size to copy is 0.\n drm/i915: avoid struct mutex output_poll mutex lock loop on unload\n drm/i915: Rephrase pwrite bounds checking to avoid any potential overflow\n drm/i915: Sanity check pread/pwrite\n drm/i915: Use pipe state to tell when pipe is off\n drm/i915: vblank status not valid while training display port\n drivers/gpu/drm/i915/i915_gem.c: Add missing error handling code\n drm/i915: Don\u0027t mask the return code whilst relocating.\n drm/i915: If the GPU hangs twice within 5 seconds, declare it wedged.\n drm/i915: Only print \u0027generating error event\u0027 if we actually are\n drm/i915: Try to reset gen2 devices.\n drm/i915: Clear fence registers on GPU reset\n drm/i915: Force the domain to CPU on unbinding whilst wedged.\n drm: Move the GTT accounting to i915\n drm/i915: Fix refleak during eviction.\n i915: Added function to initialize VBT settings\n drm/i915: Remove redundant deletion of obj-\u003egpu_write_list\n drm/i915: Make get/put pages static\n ...\n" }, { "commit": "7b4f3990a22fbe800945f12001bc30db374d0af5", "tree": "2e894f736ba0c4c05b481e7db8d8a122c70a9850", "parents": [ "2c6be944111a873ce96865f1a6033056bdf0d0e2" ], "author": { "name": "Chris Wilson", "email": "chris@chris-wilson.co.uk", "time": "Mon Oct 04 15:33:04 2010 +0100" }, "committer": { "name": "Chris Wilson", "email": "chris@chris-wilson.co.uk", "time": "Mon Oct 04 16:11:54 2010 +0100" }, "message": "drm/i915: Avoid circular locking from intel_fbdev_fini()\n\nlockdep spots that the fb_info-\u003elock takes the dev-\u003estruct_mutex during\ninit (due to the device probing) and so we can not hold\ndev-\u003estruct_mutex when unregistering the framebuffer. Simply reverse the\norder of initialisation during cleanup and so do the intel_fbdev_fini()\nbefore the intel_modeset_cleanup.\n\nSigned-off-by: Chris Wilson \u003cchris@chris-wilson.co.uk\u003e\n" }, { "commit": "2c6be944111a873ce96865f1a6033056bdf0d0e2", "tree": "5bc4b69e9669e878dd45ad72078d2591d95e750e", "parents": [ "35b62a89b0723ca05831f2edfff6deebe1806f21" ], "author": { "name": "Keith Packard", "email": "keithp@keithp.com", "time": "Sun Oct 03 13:33:49 2010 -0700" }, "committer": { "name": "Chris Wilson", "email": "chris@chris-wilson.co.uk", "time": "Mon Oct 04 10:16:09 2010 +0100" }, "message": "drm/i915: mark display port DPMS state as \u0027ON\u0027 when enabling output\n\nThe display port DPMS state is tracked internally in the display port\ndriver so that when a hotplug event comes along, the driver can know\nwhether to try retraining the link. This doesn\u0027t work well if the\ndriver never sets the DPMS state to ON when the output is enabled.\n\nSigned-off-by: Keith Packard \u003ckeithp@keithp.com\u003e\nSigned-off-by: Chris Wilson \u003cchris@chris-wilson.co.uk\u003e\n" }, { "commit": "35b62a89b0723ca05831f2edfff6deebe1806f21", "tree": "39a62777f29a4c814991d317b83562ccda961f41", "parents": [ "df6d075a4d8b151f2c011de01c09bdc92a7bb935" ], "author": { "name": "Chris Wilson", "email": "chris@chris-wilson.co.uk", "time": "Sun Sep 26 20:23:38 2010 +0100" }, "committer": { "name": "Chris Wilson", "email": "chris@chris-wilson.co.uk", "time": "Mon Oct 04 10:07:46 2010 +0100" }, "message": "drm/i915: Skip pread/pwrite if size to copy is 0.\n\nSigned-off-by: Chris Wilson \u003cchris@chris-wilson.co.uk\u003e\n" }, { "commit": "df6d075a4d8b151f2c011de01c09bdc92a7bb935", "tree": "9579e31bc46c4c11580b57a32e2cc0baddeb1405", "parents": [ "f87ea7613126ace98c0cb8b86f58e16a0e539375", "7dcd2499deab8f10011713c40bc2f309c9b65077" ], "author": { "name": "Chris Wilson", "email": "chris@chris-wilson.co.uk", "time": "Mon Oct 04 10:07:38 2010 +0100" }, "committer": { "name": "Chris Wilson", "email": "chris@chris-wilson.co.uk", "time": "Mon Oct 04 10:07:38 2010 +0100" }, "message": "Merge branch \u0027drm-intel-fixes\u0027 into drm-intel-next\n" }, { "commit": "f87ea7613126ace98c0cb8b86f58e16a0e539375", "tree": "937bdba45e1fc7152daa48f9bcd83aee3462aaf8", "parents": [ "58e10eb92d36a62568349d985c9140d9be16a99c" ], "author": { "name": "Keith Packard", "email": "keithp@keithp.com", "time": "Sun Oct 03 19:36:26 2010 -0700" }, "committer": { "name": "Chris Wilson", "email": "chris@chris-wilson.co.uk", "time": "Mon Oct 04 09:43:16 2010 +0100" }, "message": "drm/i915: avoid struct mutex output_poll mutex lock loop on unload\n\nCancel the output polling work proc before acquiring the struct mutex\nto avoid acquiring the work proc mutex with the struct mutex\nheld. This avoids inverting the lock order seen when the work proc\nruns.\n\nSigned-off-by: Keith Packard \u003ckeithp@keithp.com\u003e\nSigned-off-by: Chris Wilson \u003cchris@chris-wilson.co.uk\u003e\n" }, { "commit": "7dcd2499deab8f10011713c40bc2f309c9b65077", "tree": "1fc0476339e3fabd6b2a5f62dba1fd10abfd82f8", "parents": [ "ce9d419dbecc292cc3e06e8b1d6d123d3fa813a4" ], "author": { "name": "Chris Wilson", "email": "chris@chris-wilson.co.uk", "time": "Sun Sep 26 20:21:44 2010 +0100" }, "committer": { "name": "Chris Wilson", "email": "chris@chris-wilson.co.uk", "time": "Sun Oct 03 14:16:18 2010 +0100" }, "message": "drm/i915: Rephrase pwrite bounds checking to avoid any potential overflow\n\n... and do the same for pread.\n\nSigned-off-by: Chris Wilson \u003cchris@chris-wilson.co.uk\u003e\nCc: stable@kernel.org\n" }, { "commit": "ce9d419dbecc292cc3e06e8b1d6d123d3fa813a4", "tree": "a65b65d58e52bb05b3f08c6610f5d6345e5f4879", "parents": [ "ab7ad7f6451580aa7eccc0ba62807c872088a8f9" ], "author": { "name": "Chris Wilson", "email": "chris@chris-wilson.co.uk", "time": "Sun Sep 26 20:50:05 2010 +0100" }, "committer": { "name": "Chris Wilson", "email": "chris@chris-wilson.co.uk", "time": "Sun Oct 03 14:16:17 2010 +0100" }, "message": "drm/i915: Sanity check pread/pwrite\n\nMove the access control up from the fast paths, which are no longer\nuniversally taken first, up into the caller. This then duplicates some\nsanity checking along the slow paths, but is much simpler.\nTracked as CVE-2010-2962.\n\nReported-by: Kees Cook \u003ckees@ubuntu.com\u003e\nSigned-off-by: Chris Wilson \u003cchris@chris-wilson.co.uk\u003e\nCc: stable@kernel.org\n" }, { "commit": "58e10eb92d36a62568349d985c9140d9be16a99c", "tree": "6ffaf65e64db390f6a28c1dca8c43d4eb1493f94", "parents": [ "1cdf7fef793c715d8c4998575aba3741fa4a0b01", "ab7ad7f6451580aa7eccc0ba62807c872088a8f9" ], "author": { "name": "Chris Wilson", "email": "chris@chris-wilson.co.uk", "time": "Sun Oct 03 10:56:11 2010 +0100" }, "committer": { "name": "Chris Wilson", "email": "chris@chris-wilson.co.uk", "time": "Sun Oct 03 10:56:11 2010 +0100" }, "message": "Merge branch \u0027drm-intel-fixes\u0027 into drm-intel-next\n\nConflicts:\n\tdrivers/gpu/drm/i915/i915_gem_evict.c\n\tdrivers/gpu/drm/i915/intel_display.c\n\tdrivers/gpu/drm/i915/intel_dp.c\n" }, { "commit": "ab7ad7f6451580aa7eccc0ba62807c872088a8f9", "tree": "3db4739a40c0276e2c8ee99a9465317360769e90", "parents": [ "b99a9d9bb62a984bdfcb6c973dfe180bd776abbe" ], "author": { "name": "Keith Packard", "email": "keithp@keithp.com", "time": "Sun Oct 03 00:33:06 2010 -0700" }, "committer": { "name": "Chris Wilson", "email": "chris@chris-wilson.co.uk", "time": "Sun Oct 03 10:23:26 2010 +0100" }, "message": "drm/i915: Use pipe state to tell when pipe is off\n\nInstead of waiting for the display line value to settle, we can simply\nwait for the pipe configuration register \u0027state\u0027 bit to turn off.\n\nContrarywise, disabling the plane will not cause the display line\nvalue to stop changing, so instead we wait for the vblank interrupt\nbit to get set. And, we only do this when we\u0027re not about to wait for\nthe pipe to turn off.\n\nSigned-off-by: Keith Packard \u003ckeithp@keithp.com\u003e\nSigned-off-by: Chris Wilson \u003cchris@chris-wilson.co.uk\u003e\n" }, { "commit": "b99a9d9bb62a984bdfcb6c973dfe180bd776abbe", "tree": "f4a80a59ecb701ff1c41f5098b14b8de15ee7a90", "parents": [ "929f49bf225b1b6cd04d0a7b9c0f7377d9131220" ], "author": { "name": "Keith Packard", "email": "keithp@keithp.com", "time": "Sun Oct 03 00:33:05 2010 -0700" }, "committer": { "name": "Chris Wilson", "email": "chris@chris-wilson.co.uk", "time": "Sun Oct 03 10:22:25 2010 +0100" }, "message": "drm/i915: vblank status not valid while training display port\n\nWhile the display port is in training mode, vblank interrupts don\u0027t\noccur. Because we have to wait for the display port output to turn on\nbefore starting the training sequence, enable the output in \u0027normal\u0027\nmode so that we can tell when a vblank has occurred, then start the\ntraining sequence.\n\nSigned-off-by: Keith Packard \u003ckeithp@keithp.com\u003e\nSigned-off-by: Chris Wilson \u003cchris@chris-wilson.co.uk\u003e\n" }, { "commit": "929f49bf225b1b6cd04d0a7b9c0f7377d9131220", "tree": "5fe20466662036d72936722ae1f7e86f34836934", "parents": [ "e39a01501b228e1be2037d5bddccae2a820af902" ], "author": { "name": "Julia Lawall", "email": "julia@diku.dk", "time": "Sat Oct 02 15:59:17 2010 +0200" }, "committer": { "name": "Chris Wilson", "email": "chris@chris-wilson.co.uk", "time": "Sat Oct 02 15:21:26 2010 +0100" }, "message": "drivers/gpu/drm/i915/i915_gem.c: Add missing error handling code\n\nExtend the error handling code with operations found in other nearby error\nhandling code\n\nA simplified version of the sematic match that finds this problem is as\nfollows: (http://coccinelle.lip6.fr/)\n\n// \u003csmpl\u003e\n@r exists@\n@r@\nstatement S1,S2,S3;\nconstant C1,C2,C3;\n@@\n\n*if (...)\n {... S1 return -C1;}\n...\n*if (...)\n {... when !\u003d S1\n return -C2;}\n...\n*if (...)\n {... S1 return -C3;}\n// \u003c/smpl\u003e\n\nSigned-off-by: Julia Lawall \u003cjulia@diku.dk\u003e\nSigned-off-by: Chris Wilson \u003cchris@chris-wilson.co.uk\u003e\nCc: stable@kernel.org\n" }, { "commit": "1cdf7fef793c715d8c4998575aba3741fa4a0b01", "tree": "00648292c523c4098567aa605cecdcf44cddc128", "parents": [ "ae681d969ac0946e09636f2bef7a126d73e1ad6b" ], "author": { "name": "Chris Wilson", "email": "chris@chris-wilson.co.uk", "time": "Sat Oct 02 15:12:41 2010 +0100" }, "committer": { "name": "Chris Wilson", "email": "chris@chris-wilson.co.uk", "time": "Sat Oct 02 15:12:41 2010 +0100" }, "message": "drm/i915: Don\u0027t mask the return code whilst relocating.\n\nThe return from move_to_gtt_domain() may indicate a pending signal which\nneeds to handled as opposed to an actual error, for instance, so report\nthe original return value rather than forcing an EINVAL.\n\nSigned-off-by: Chris Wilson \u003cchris@chris-wilson.co.uk\u003e\n" }, { "commit": "ae681d969ac0946e09636f2bef7a126d73e1ad6b", "tree": "dc26ce897c7b46a515665e6c56f11d1493f5bdb2", "parents": [ "2fa772f34042cd4ddfb4ffaf5c24f0ce8c1025e9" ], "author": { "name": "Chris Wilson", "email": "chris@chris-wilson.co.uk", "time": "Fri Oct 01 14:57:56 2010 +0100" }, "committer": { "name": "Chris Wilson", "email": "chris@chris-wilson.co.uk", "time": "Fri Oct 01 14:57:56 2010 +0100" }, "message": "drm/i915: If the GPU hangs twice within 5 seconds, declare it wedged.\n\nThe issue is that we may become stuck executing a long running shader\nand continually attempt to reset the GPU. (Or maybe we tickle some bug\nand need to break the vicious cycle.) So if we are detect a second hang\nwithin 5 seconds, give up trying to programme the GPU and report it\nwedged.\n\nSigned-off-by: Chris Wilson \u003cchris@chris-wilson.co.uk\u003e\n" }, { "commit": "2fa772f34042cd4ddfb4ffaf5c24f0ce8c1025e9", "tree": "26aa881ce29bb967bd0afb70e2e924755e70a29a", "parents": [ "dc96e9b8e37641d9d15a8a4cdd18ed7680d8f546" ], "author": { "name": "Chris Wilson", "email": "chris@chris-wilson.co.uk", "time": "Fri Oct 01 13:23:27 2010 +0100" }, "committer": { "name": "Chris Wilson", "email": "chris@chris-wilson.co.uk", "time": "Fri Oct 01 14:48:20 2010 +0100" }, "message": "drm/i915: Only print \u0027generating error event\u0027 if we actually are\n\nSigned-off-by: Chris Wilson \u003cchris@chris-wilson.co.uk\u003e\n" }, { "commit": "dc96e9b8e37641d9d15a8a4cdd18ed7680d8f546", "tree": "5d410cf8a1df84a73380d4fad3c76d725b7adee9", "parents": [ "069efc1dac477a4a51e42c0fe50bdcf85ada626a" ], "author": { "name": "Chris Wilson", "email": "chris@chris-wilson.co.uk", "time": "Fri Oct 01 12:05:06 2010 +0100" }, "committer": { "name": "Chris Wilson", "email": "chris@chris-wilson.co.uk", "time": "Fri Oct 01 14:47:12 2010 +0100" }, "message": "drm/i915: Try to reset gen2 devices.\n\nSo far only found registers for i830, i845, i865 and one of those has no\neffect on i865!\n\nAt this moment in time, attempting to reset i8xx is a little\noptimistic...\n\nSigned-off-by: Chris Wilson \u003cchris@chris-wilson.co.uk\u003e\n" }, { "commit": "069efc1dac477a4a51e42c0fe50bdcf85ada626a", "tree": "b24caf4bc67882566a1bb458532173eb19c016eb", "parents": [ "812ed4924328adf94f45c664b6a4c710a69167e2" ], "author": { "name": "Chris Wilson", "email": "chris@chris-wilson.co.uk", "time": "Thu Sep 30 16:53:18 2010 +0100" }, "committer": { "name": "Chris Wilson", "email": "chris@chris-wilson.co.uk", "time": "Fri Oct 01 14:45:22 2010 +0100" }, "message": "drm/i915: Clear fence registers on GPU reset\n\nWhen the GPU is reset, the fence registers are invalidated, so release\nthe objects and clear them out.\n\nSigned-off-by: Chris Wilson \u003cchris@chris-wilson.co.uk\u003e\n" }, { "commit": "812ed4924328adf94f45c664b6a4c710a69167e2", "tree": "661390c609ebf6e225638d45c7e5bf2206c7e720", "parents": [ "73aa808f10effc280e6eb70267314542a7c29426" ], "author": { "name": "Chris Wilson", "email": "chris@chris-wilson.co.uk", "time": "Thu Sep 30 15:08:57 2010 +0100" }, "committer": { "name": "Chris Wilson", "email": "chris@chris-wilson.co.uk", "time": "Fri Oct 01 14:45:21 2010 +0100" }, "message": "drm/i915: Force the domain to CPU on unbinding whilst wedged.\n\nBugzilla: https://bugs.freedesktop.org/show_bug.cgi?id\u003d30083\nReported-by: Sitsofe Wheeler \u003csitsofe@yahoo.com\u003e\nSigned-off-by: Chris Wilson \u003cchris@chris-wilson.co.uk\u003e\n" }, { "commit": "73aa808f10effc280e6eb70267314542a7c29426", "tree": "e8c7d0e25bb5d0658c47ff0339aec9a65367bbc2", "parents": [ "6a04002bea137d2c6359228316d9c827806e475f" ], "author": { "name": "Chris Wilson", "email": "chris@chris-wilson.co.uk", "time": "Thu Sep 30 11:46:12 2010 +0100" }, "committer": { "name": "Chris Wilson", "email": "chris@chris-wilson.co.uk", "time": "Fri Oct 01 14:45:20 2010 +0100" }, "message": "drm: Move the GTT accounting to i915\n\nOnly drm/i915 does the bookkeeping that makes the information useful,\nand the information maintained is driver specific, so move it out of the\ncore and into its single user.\n\nSigned-off-by: Chris Wilson \u003cchris@chris-wilson.co.uk\u003e\nCc: Dave Airlie \u003cairlied@redhat.com\u003e\n" }, { "commit": "e39a01501b228e1be2037d5bddccae2a820af902", "tree": "8505cc7a009cad8151f0edb3b5696f6249afd154", "parents": [ "d270ae34eb77c58dea60e5b1e300a698d2ce39ac" ], "author": { "name": "Chris Wilson", "email": "chris@chris-wilson.co.uk", "time": "Wed Sep 29 22:23:05 2010 +0100" }, "committer": { "name": "Chris Wilson", "email": "chris@chris-wilson.co.uk", "time": "Fri Oct 01 10:03:16 2010 +0100" }, "message": "drm/i915: Fix refleak during eviction.\n\nNow that we hold onto a reference whilst evicting objects, we need to\nbe sure that we drop all the references taken -- even on the error\npaths.\n\nSigned-off-by: Chris Wilson \u003cchris@chris-wilson.co.uk\u003e\n" }, { "commit": "6a04002bea137d2c6359228316d9c827806e475f", "tree": "d6bcaa07ed37b90ad9dad9cdf0e0c94d74cb3ccc", "parents": [ "f394940b8d275064f080a59dac636688dae3531a" ], "author": { "name": "Simon Que", "email": "sque@chromium.org", "time": "Thu Sep 30 09:36:39 2010 +0100" }, "committer": { "name": "Chris Wilson", "email": "chris@chris-wilson.co.uk", "time": "Thu Sep 30 09:46:58 2010 +0100" }, "message": "i915: Added function to initialize VBT settings\n\nAdded a function that sets the LVDS values to default settings. This\nwill be called by intel_init_bios before checking for the VBT (video BIOS\ntable). The default values are thus loaded regardless of whether a VBT\nis found.\n\nThe default settings in each parse function have been moved to the new\nfunction. This consolidates all the default settings into one place.\n\nThe default dither bit value has been changed from 0 to 1. We can\nassume that display devices will want dithering enabled.\n\nSigned-off-by: Simon Que \u003csque@chromium.org\u003e\nAcked-by: Olof Johansson \u003colof@lixom.net\u003e\n[ickle: fixup for -next]\nSigned-off-by: Chris Wilson \u003cchris@chris-wilson.co.uk\u003e\n" }, { "commit": "f394940b8d275064f080a59dac636688dae3531a", "tree": "1d316f7eaf9fa92b8829e5a9f5ef2ec9684a337a", "parents": [ "5cdf58817433345157644140f2f509f00c06d479" ], "author": { "name": "Chris Wilson", "email": "chris@chris-wilson.co.uk", "time": "Wed Sep 29 21:19:54 2010 +0100" }, "committer": { "name": "Chris Wilson", "email": "chris@chris-wilson.co.uk", "time": "Thu Sep 30 09:30:51 2010 +0100" }, "message": "drm/i915: Remove redundant deletion of obj-\u003egpu_write_list\n\nAt that point as the object is no longer in any GPU write domain it must\nnot be on the list, so the list_del() is redundant.\n\nSigned-off-by: Chris Wilson \u003cchris@chris-wilson.co.uk\u003e\n" }, { "commit": "5cdf58817433345157644140f2f509f00c06d479", "tree": "07ff068968ccf9694e21a1b32a2227d2eda64562", "parents": [ "8f2480fb05991f1a5522dd48332cd9db4f7745c6" ], "author": { "name": "Chris Wilson", "email": "chris@chris-wilson.co.uk", "time": "Mon Sep 27 15:51:07 2010 +0100" }, "committer": { "name": "Chris Wilson", "email": "chris@chris-wilson.co.uk", "time": "Thu Sep 30 09:30:13 2010 +0100" }, "message": "drm/i915: Make get/put pages static\n\nSigned-off-by: Chris Wilson \u003cchris@chris-wilson.co.uk\u003e\n" }, { "commit": "8f2480fb05991f1a5522dd48332cd9db4f7745c6", "tree": "ad5d0eb418249096e1ee3ce13fb94bb98723f6bf", "parents": [ "d21d5975686fbc107f9352006b06e1e92b4c5810" ], "author": { "name": "Chris Wilson", "email": "chris@chris-wilson.co.uk", "time": "Sun Sep 26 11:44:19 2010 +0100" }, "committer": { "name": "Chris Wilson", "email": "chris@chris-wilson.co.uk", "time": "Thu Sep 30 09:30:12 2010 +0100" }, "message": "drm/i915/debugfs: Include list totals\n\nSigned-off-by: Chris Wilson \u003cchris@chris-wilson.co.uk\u003e\n" }, { "commit": "d21d5975686fbc107f9352006b06e1e92b4c5810", "tree": "1933c6c0c7728521e6455d19e75985b553117b54", "parents": [ "23bc598253fa8e9ede6ad29304ea4ed177e9fc23" ], "author": { "name": "Chris Wilson", "email": "chris@chris-wilson.co.uk", "time": "Sun Sep 26 11:19:33 2010 +0100" }, "committer": { "name": "Chris Wilson", "email": "chris@chris-wilson.co.uk", "time": "Thu Sep 30 09:30:12 2010 +0100" }, "message": "drm/i915: Report the deferred free list in debugfs\n\nSigned-off-by: Chris Wilson \u003cchris@chris-wilson.co.uk\u003e\n" }, { "commit": "23bc598253fa8e9ede6ad29304ea4ed177e9fc23", "tree": "0b9c3ecbd8beecae8f15d5ae5a204b0f7aac985d", "parents": [ "891b48cfc8659be486c70a03ad815f9a2485ee58" ], "author": { "name": "Chris Wilson", "email": "chris@chris-wilson.co.uk", "time": "Wed Sep 29 16:10:57 2010 +0100" }, "committer": { "name": "Chris Wilson", "email": "chris@chris-wilson.co.uk", "time": "Thu Sep 30 09:30:11 2010 +0100" }, "message": "drm/i915/debug: Convert i915_verify_active() to scan all lists\n\n... and check more regularly.\n\nSigned-off-by: Chris Wilson \u003cchris@chris-wilson.co.uk\u003e\n" }, { "commit": "891b48cfc8659be486c70a03ad815f9a2485ee58", "tree": "cbc823b8ae71b0776e70986a2283af02bc475c4c", "parents": [ "3d2a812ae4676b74f2033cf09c855074d06f3872" ], "author": { "name": "Chris Wilson", "email": "chris@chris-wilson.co.uk", "time": "Wed Sep 29 12:26:37 2010 +0100" }, "committer": { "name": "Chris Wilson", "email": "chris@chris-wilson.co.uk", "time": "Wed Sep 29 12:26:37 2010 +0100" }, "message": "drm/i915: Avoid blocking the kworker thread on a stuck mutex\n\nJust reschedule the retire requests again if the device is currently\nbusy. The request list will be pruned along other paths so will never\ngrow unbounded and so we can afford to miss the occasional pruning.\n\nSigned-off-by: Chris Wilson \u003cchris@chris-wilson.co.uk\u003e\n" }, { "commit": "3d2a812ae4676b74f2033cf09c855074d06f3872", "tree": "9a21057b835d9d9665423fd99dc3c0d379132634", "parents": [ "97d1ebaf81491afd8b45186056eda7ebf5da7875" ], "author": { "name": "Chris Wilson", "email": "chris@chris-wilson.co.uk", "time": "Wed Sep 29 11:39:53 2010 +0100" }, "committer": { "name": "Chris Wilson", "email": "chris@chris-wilson.co.uk", "time": "Wed Sep 29 11:41:19 2010 +0100" }, "message": "drm/i915/debug: Remove default WATCH_BUF\n\nReplaced by tracepoints.\n\nSigned-off-by: Chris Wilson \u003cchris@chris-wilson.co.uk\u003e\n" }, { "commit": "97d1ebaf81491afd8b45186056eda7ebf5da7875", "tree": "4ba884bc19b532dfedb607e9c702c04b913588ab", "parents": [ "f573c66061184ce28196a22229b6214256ceacd8" ], "author": { "name": "Chris Wilson", "email": "chris@chris-wilson.co.uk", "time": "Wed Sep 29 11:36:22 2010 +0100" }, "committer": { "name": "Chris Wilson", "email": "chris@chris-wilson.co.uk", "time": "Wed Sep 29 11:41:18 2010 +0100" }, "message": "drm/i915/debug: Remove defunct WATCH_LRU\n\nThis has bitrotted through inuse and superseded by tracing and debugfs.\n\nSigned-off-by: Chris Wilson \u003cchris@chris-wilson.co.uk\u003e\n" }, { "commit": "f573c66061184ce28196a22229b6214256ceacd8", "tree": "91f47116c4b64145cf4031ec84f4f2418cb23087", "parents": [ "a8ed0b16a924a59b56906e83d6c033a04a9818f6" ], "author": { "name": "Chris Wilson", "email": "chris@chris-wilson.co.uk", "time": "Tue Sep 28 23:34:44 2010 +0100" }, "committer": { "name": "Chris Wilson", "email": "chris@chris-wilson.co.uk", "time": "Tue Sep 28 23:34:44 2010 +0100" }, "message": "drm/i915/dvo: Fix panel and DDC i2c pins\n\nSigned-off-by: Chris Wilson \u003cchris@chris-wilson.co.uk\u003e\n" }, { "commit": "a8ed0b16a924a59b56906e83d6c033a04a9818f6", "tree": "125d98b944c25394683a66523f99a918c9139a95", "parents": [ "b8232e906381dcba2bb26f0d849d4c25cc9b1368" ], "author": { "name": "Chris Wilson", "email": "chris@chris-wilson.co.uk", "time": "Tue Sep 28 23:33:17 2010 +0100" }, "committer": { "name": "Chris Wilson", "email": "chris@chris-wilson.co.uk", "time": "Tue Sep 28 23:33:17 2010 +0100" }, "message": "drm/i915: Tidy dvo_ch7017 and print out which chip we detect\n\nSigned-off-by: Chris Wilson \u003cchris@chris-wilson.co.uk\u003e\n" }, { "commit": "b8232e906381dcba2bb26f0d849d4c25cc9b1368", "tree": "e3b90d6c19db323debd075c6c62b07f95c04178f", "parents": [ "e0e41598b433c0216814d54c62e7c1834f464d9b" ], "author": { "name": "Chris Wilson", "email": "chris@chris-wilson.co.uk", "time": "Tue Sep 28 16:41:32 2010 +0100" }, "committer": { "name": "Chris Wilson", "email": "chris@chris-wilson.co.uk", "time": "Tue Sep 28 16:47:00 2010 +0100" }, "message": "drm/i915: Disable LVDS i2c probing when using GPIO bit banging\n\nThis check only appears to succeed when using GMBUS, so we need to skip\nit if we have fallen back to using GPIO bit banging.\n\nSigned-off-by: Chris Wilson \u003cchris@chris-wilson.co.uk\u003e\n" }, { "commit": "e0e41598b433c0216814d54c62e7c1834f464d9b", "tree": "a4069b104045797da2dc48c62e1acba0132ba98d", "parents": [ "8daf7473203cd9bd1b9b98200ee1c74dfe4826fe", "d270ae34eb77c58dea60e5b1e300a698d2ce39ac" ], "author": { "name": "Chris Wilson", "email": "chris@chris-wilson.co.uk", "time": "Tue Sep 28 15:48:38 2010 +0100" }, "committer": { "name": "Chris Wilson", "email": "chris@chris-wilson.co.uk", "time": "Tue Sep 28 15:48:38 2010 +0100" }, "message": "Merge branch \u0027drm-intel-fixes\u0027 into drm-intel-next\n" }, { "commit": "8daf7473203cd9bd1b9b98200ee1c74dfe4826fe", "tree": "08fa43cddb8431c47362db00a2e76afa20196d2c", "parents": [ "cb8ea7527b813dd6e19fb07328f7867a5f0a8d0a" ], "author": { "name": "Chris Wilson", "email": "chris@chris-wilson.co.uk", "time": "Tue Sep 28 14:07:26 2010 +0100" }, "committer": { "name": "Chris Wilson", "email": "chris@chris-wilson.co.uk", "time": "Tue Sep 28 14:07:26 2010 +0100" }, "message": "MAINTAINERS: Add contact details for drm/i915\n\nSigned-off-by: Chris Wilson \u003cchris@chris-wilson.co.uk\u003e\n" }, { "commit": "cb8ea7527b813dd6e19fb07328f7867a5f0a8d0a", "tree": "3d1280de5f8b0481b957462dd5e543b5d9661cfe", "parents": [ "e957d7720a2797b31231616014b68f4f6203145e" ], "author": { "name": "Chris Wilson", "email": "chris@chris-wilson.co.uk", "time": "Tue Sep 28 13:35:47 2010 +0100" }, "committer": { "name": "Chris Wilson", "email": "chris@chris-wilson.co.uk", "time": "Tue Sep 28 13:35:47 2010 +0100" }, "message": "drm/i915: Use i2c bit banging instead of GMBUS\n\nThere are several reported instances of GMBUS failing to successfully\nread the EDID, so revert back to bit banging until the issue is\nresolved.\n\nBugzilla: https://bugs.freedesktop.org/show_bug.cgi?id\u003d30371\nSigned-off-by: Chris Wilson \u003cchris@chris-wilson.co.uk\u003e\n" }, { "commit": "e957d7720a2797b31231616014b68f4f6203145e", "tree": "07fd5eb66781405b408830381c99b45c26d34f85", "parents": [ "a56ba56c275b1c2b982c8901ab92bf5a0fd0b757" ], "author": { "name": "Chris Wilson", "email": "chris@chris-wilson.co.uk", "time": "Fri Sep 24 12:52:03 2010 +0100" }, "committer": { "name": "Chris Wilson", "email": "chris@chris-wilson.co.uk", "time": "Tue Sep 28 13:29:10 2010 +0100" }, "message": "drm/i915/sdvo: Fix GMBUSification\n\nBesides a couple of bugs when writing more than a single byte along the\nGMBUS, SDVO was completely failing whilst trying to use GMBUS, so use\nbit banging instead.\n\nSigned-off-by: Chris Wilson \u003cchris@chris-wilson.co.uk\u003e\n" }, { "commit": "a56ba56c275b1c2b982c8901ab92bf5a0fd0b757", "tree": "6f4e9ea2fe775a1f05e16888dc8b5c5c0edce11a", "parents": [ "ced270fa893735363f74bf96e0a8a05ec330d04d" ], "author": { "name": "Chris Wilson", "email": "chris@chris-wilson.co.uk", "time": "Tue Sep 28 10:07:56 2010 +0100" }, "committer": { "name": "Chris Wilson", "email": "chris@chris-wilson.co.uk", "time": "Tue Sep 28 11:30:52 2010 +0100" }, "message": "Revert \"drm/i915: Drop ring-\u003elazy_request\"\n\nWith multiple rings generating requests independently, the outstanding\nrequests must also be track independently.\n\nReported-by: Wang Jinjin \u003cjinjin.wang@intel.com\u003e\nBugzilla: https://bugs.freedesktop.org/show_bug.cgi?id\u003d30380\nSigned-off-by: Chris Wilson \u003cchris@chris-wilson.co.uk\u003e\n" }, { "commit": "d270ae34eb77c58dea60e5b1e300a698d2ce39ac", "tree": "85f6fefbb0cbb93187d668fe44655bef8e1c6ad9", "parents": [ "cf9a2f3afc75d41a61cbc91e725b9ce0746c400a" ], "author": { "name": "Jesse Barnes", "email": "jbarnes@virtuousgeek.org", "time": "Mon Sep 27 10:35:44 2010 -0700" }, "committer": { "name": "Chris Wilson", "email": "chris@chris-wilson.co.uk", "time": "Mon Sep 27 18:43:45 2010 +0100" }, "message": "drm/i915: fix GMCH power reporting\n\nThe IPS driver needs to know the current power consumption of the GMCH\nin order to make decisions about when to increase or decrease the CPU\nand/or GPU power envelope. So fix up the divisions to save the results\nso the numbers are actually correct (contrary to some earlier comments\nand code, these functions do not modify the first argument and use it\nfor the result).\n\nSigned-off-by: Jesse Barnes \u003cjbarnes@virtuousgeek.org\u003e\nSigned-off-by: Chris Wilson \u003cchris@chris-wilson.co.uk\u003e\nCc: stable@kernel.org\n" }, { "commit": "ced270fa893735363f74bf96e0a8a05ec330d04d", "tree": "3037b69b31358ee18ecd30758f6a4e4c79c809cc", "parents": [ "53b2087d218c100657bddcb8ae887fa07862fb81" ], "author": { "name": "Chris Wilson", "email": "chris@chris-wilson.co.uk", "time": "Sun Sep 26 22:47:46 2010 +0100" }, "committer": { "name": "Chris Wilson", "email": "chris@chris-wilson.co.uk", "time": "Sun Sep 26 22:50:36 2010 +0100" }, "message": "drm/i915: Ensure that the mode change flushing is currently uninterruptible\n\nIntroduced by 48b956c5, I had thought I had already fixed this. Oh well.\n\nReported-by: Sitsofe Wheeler \u003csitsofe@yahoo.com\u003e\nSigned-off-by: Chris Wilson \u003cchris@chris-wilson.co.uk\u003e\n" }, { "commit": "53b2087d218c100657bddcb8ae887fa07862fb81", "tree": "a787710a4746854bc187fe1168729d79d13f86b7", "parents": [ "1c25595f8d31392b8c36b54c624d01591dbfb87b" ], "author": { "name": "Chris Wilson", "email": "chris@chris-wilson.co.uk", "time": "Sun Sep 26 22:21:10 2010 +0100" }, "committer": { "name": "Chris Wilson", "email": "chris@chris-wilson.co.uk", "time": "Sun Sep 26 22:21:10 2010 +0100" }, "message": "drm/i915: fix debugging compilation error from previous commit\n\nThere is no equivalent to mutex_destroy() for spinlocks so just delete\nthe code.\n\nSigned-off-by: Chris Wilson \u003cchris@chris-wilson.co.uk\u003e\n" }, { "commit": "1c25595f8d31392b8c36b54c624d01591dbfb87b", "tree": "961ce6bb76bdc7aa7b245bb77fa054df6ee9b463", "parents": [ "447da18742b170b8e09ac71edf63c5798d2dbb0b" ], "author": { "name": "Chris Wilson", "email": "chris@chris-wilson.co.uk", "time": "Sun Sep 26 11:03:27 2010 +0100" }, "committer": { "name": "Chris Wilson", "email": "chris@chris-wilson.co.uk", "time": "Sun Sep 26 11:03:27 2010 +0100" }, "message": "drm/i915: Convert the file mutex into a spinlock\n\nDaniel Vetter pointed out that in this case is would be clearer and\ncleaner to use a spinlock instead of a mutex to protect the per-file\nrequest list manipulation. Make it so.\n\nSigned-off-by: Chris Wilson \u003cchris@chris-wilson.co.uk\u003e\n" }, { "commit": "45ff46c54a31bf8924b61e3e3411654410a3b5c3", "tree": "d428a95421862f8f1917f7a15e9cd78af4e1a60e", "parents": [ "4a445f291ac3faa08f56eaeb6e44856b6b72b74c" ], "author": { "name": "Daniel Vetter", "email": "daniel.vetter@ffwll.ch", "time": "Sun Sep 26 00:24:48 2010 +0200" }, "committer": { "name": "Dave Airlie", "email": "airlied@redhat.com", "time": "Sun Sep 26 13:35:49 2010 +1000" }, "message": "drm: readd drm_lock_free in drm_unlock\n\nI\u0027ve accidently killed a little bit too much in\n\ncommit 1da3f87ebb7edb3e0b829ec4bbe5fb3d9d93986f\nAuthor: Daniel Vetter \u003cdaniel.vetter@ffwll.ch\u003e\nDate: Mon Aug 23 22:53:24 2010 +0200\n\n drm: kill kernel_context_switch callbacks\n\nNote to self: Next time also test with AIGLX disabled.\n\nReported-and-Tested-by: Andy Furniss \u003clists@andyfurniss.entadsl.com\u003e\nBugzilla: https://bugs.freedesktop.org/show_bug.cgi?id\u003d30374\nSigned-off-by: Daniel Vetter \u003cdaniel.vetter@ffwll.ch\u003e\nSigned-off-by: Dave Airlie \u003cairlied@redhat.com\u003e\n" }, { "commit": "447da18742b170b8e09ac71edf63c5798d2dbb0b", "tree": "3c7fc5ff8d4a5c8afde505ae0fa1126f352e205e", "parents": [ "79f321b7e676bd54f563c5ce513588aa90b2cc21" ], "author": { "name": "Daniel Vetter", "email": "daniel.vetter@ffwll.ch", "time": "Fri Sep 24 21:49:27 2010 +0200" }, "committer": { "name": "Chris Wilson", "email": "chris@chris-wilson.co.uk", "time": "Sat Sep 25 12:23:16 2010 +0100" }, "message": "drm/i915: kill ring-\u003esetup_status_page\n\nIt\u0027s the same code, essentially, so kill all copies safe one unified\nversion.\n\nSigned-off-by: Daniel Vetter \u003cdaniel.vetter@ffwll.ch\u003e\nSigned-off-by: Chris Wilson \u003cchris@chris-wilson.co.uk\u003e\n" }, { "commit": "79f321b7e676bd54f563c5ce513588aa90b2cc21", "tree": "9ef460994bb367ee35a58ae566926a33ddd5265f", "parents": [ "3d281d8cca1acb2483444e0d1519c8ab6dda3a47" ], "author": { "name": "Daniel Vetter", "email": "daniel.vetter@ffwll.ch", "time": "Fri Sep 24 21:20:10 2010 +0200" }, "committer": { "name": "Chris Wilson", "email": "chris@chris-wilson.co.uk", "time": "Sat Sep 25 12:23:15 2010 +0100" }, "message": "drm/i915: kill ring-\u003eget_active_head\n\nAll functions are extremely similar, so fold them into one generic\nimplementation.\n\nThis function isn\u0027t used anyway, because there\u0027s not yet a bsd ring\nerror state dumper.\n\nSigned-off-by: Daniel Vetter \u003cdaniel.vetter@ffwll.ch\u003e\nSigned-off-by: Chris Wilson \u003cchris@chris-wilson.co.uk\u003e\n" }, { "commit": "3d281d8cca1acb2483444e0d1519c8ab6dda3a47", "tree": "9d40394e09361254aa1c8208f5b56dfbd1a31cf1", "parents": [ "bf7e0e1268f72ea1687140603a910eeaca031fa1" ], "author": { "name": "Daniel Vetter", "email": "daniel.vetter@ffwll.ch", "time": "Fri Sep 24 21:14:22 2010 +0200" }, "committer": { "name": "Chris Wilson", "email": "chris@chris-wilson.co.uk", "time": "Sat Sep 25 12:23:15 2010 +0100" }, "message": "drm/i915: kill per-ring macros\n\nTwo macros that use a base address for HWS_PGA were missing, add them.\nAlso switch the remaining users of *_ACTHD to the ring-base one.\nKill the other ring-specific macros because they\u0027re now unused.\n\nSigned-off-by: Daniel Vetter \u003cdaniel.vetter@ffwll.ch\u003e\n[ickle: And silence checkpatch whilst in the vicinity]\nSigned-off-by: Chris Wilson \u003cchris@chris-wilson.co.uk\u003e\n" }, { "commit": "bf7e0e1268f72ea1687140603a910eeaca031fa1", "tree": "73ed9fd08d9bfc987abfc4f62d45906c25201ce1", "parents": [ "95375b7f9de429100b6e72df5c3abd9a3aaf266c" ], "author": { "name": "Daniel Vetter", "email": "daniel.vetter@ffwll.ch", "time": "Fri Sep 24 21:08:29 2010 +0200" }, "committer": { "name": "Chris Wilson", "email": "chris@chris-wilson.co.uk", "time": "Sat Sep 25 12:23:14 2010 +0100" }, "message": "drm/i915: fix ACTHD for gen \u003c\u003d 3\n\nThis was mixed up in the following patch:\n\ncommit a6c45cf013a57e32ddae43dd4ac911eb4a3919fd\nAuthor: Chris Wilson \u003cchris@chris-wilson.co.uk\u003e\nDate: Fri Sep 17 00:32:17 2010 +0100\n\n drm/i915: INTEL_INFO-\u003egen supercedes i8xx, i9xx, i965g\n\nSigned-off-by: Daniel Vetter \u003cdaniel.vetter@ffwll.ch\u003e\nSigned-off-by: Chris Wilson \u003cchris@chris-wilson.co.uk\u003e\n" }, { "commit": "95375b7f9de429100b6e72df5c3abd9a3aaf266c", "tree": "f6f3393974fb51902f4a50840c0e8ebb3394650e", "parents": [ "76c1dec1979d9b552aab9600eb898ccec394fbbc" ], "author": { "name": "Daniel Vetter", "email": "daniel.vetter@ffwll.ch", "time": "Fri Sep 24 20:54:39 2010 +0200" }, "committer": { "name": "Chris Wilson", "email": "chris@chris-wilson.co.uk", "time": "Sat Sep 25 12:23:13 2010 +0100" }, "message": "drm/i915: kill now unnecessary gtt defines from i915_reg.h\n\nEverything is now handled in intel-gtt.h so these defines\nare only confusing.\n\nSigned-off-by: Daniel Vetter \u003cdaniel.vetter@ffwll.ch\u003e\nSigned-off-by: Chris Wilson \u003cchris@chris-wilson.co.uk\u003e\n" }, { "commit": "76c1dec1979d9b552aab9600eb898ccec394fbbc", "tree": "8e86c83b9b2bb10b556d153238cb4d6e4ca201d9", "parents": [ "30dbf0c07ff4e3e21b827e2a9d6ff7eb34458819" ], "author": { "name": "Chris Wilson", "email": "chris@chris-wilson.co.uk", "time": "Sat Sep 25 11:22:51 2010 +0100" }, "committer": { "name": "Chris Wilson", "email": "chris@chris-wilson.co.uk", "time": "Sat Sep 25 12:23:12 2010 +0100" }, "message": "drm/i915: Make the mutex_lock interruptible on ioctl paths\n\n... and combine it with the wedged completion handler.\n\nSigned-off-by: Chris Wilson \u003cchris@chris-wilson.co.uk\u003e\n" }, { "commit": "30dbf0c07ff4e3e21b827e2a9d6ff7eb34458819", "tree": "273083a7e570ce8ac43a327451afd4172645af7b", "parents": [ "f787a5f59e1b0e320a6b0a37e9a2e306551d1e40" ], "author": { "name": "Chris Wilson", "email": "chris@chris-wilson.co.uk", "time": "Sat Sep 25 10:19:17 2010 +0100" }, "committer": { "name": "Chris Wilson", "email": "chris@chris-wilson.co.uk", "time": "Sat Sep 25 12:23:12 2010 +0100" }, "message": "drm/i915: Adjust hangcheck EIO semantics\n\nOwain Ainsworth reported an issue between the interaction of the\nhangcheck and userspace immediately (and permanently) falling back to\ns/w rasterisation. In order to break the mutex and begin resetting the\nGPU, we must abort the current operation (usually within the wait) and\nclimb sufficiently far back up the call chain to drop the mutex. In his\nimplementation, Owain has a loop within the ioctl handler to detect the\nhang and then sleep until the error handler has run. I\u0027ve chosen to\nreturn to userspace and report an EAGAIN which should trigger the\nuserspace ioctl handler to repeat the call (simply because it felt less\ninvasive...). Before hitting a wedged GPU, we then wait upon completion\nof the error handler.\n\nReported-by: Owain G. Ainsworth \u003czerooa@googlemail.com\u003e\nSigned-off-by: Chris Wilson \u003cchris@chris-wilson.co.uk\u003e\n" }, { "commit": "f787a5f59e1b0e320a6b0a37e9a2e306551d1e40", "tree": "994bdfb8efef803986fbd40e22942de40aa1daf2", "parents": [ "27d64339a8d8465484286a2da93f5f6c36be5c3d" ], "author": { "name": "Chris Wilson", "email": "chris@chris-wilson.co.uk", "time": "Fri Sep 24 16:02:42 2010 +0100" }, "committer": { "name": "Chris Wilson", "email": "chris@chris-wilson.co.uk", "time": "Fri Sep 24 21:03:00 2010 +0100" }, "message": "drm/i915: Only hold a process-local lock whilst throttling.\n\nAvoid cause latencies in other clients by not taking the global struct\nmutex and moving the per-client request manipulation a local per-client\nmutex. For example, this allows a compositor to schedule a page-flip\n(through X) whilst an OpenGL application is monopolising the GPU.\n\nSigned-off-by: Chris Wilson \u003cchris@chris-wilson.co.uk\u003e\n" }, { "commit": "27d64339a8d8465484286a2da93f5f6c36be5c3d", "tree": "2e91c2660fda807d2732a7fbb275e765a72a64db", "parents": [ "e61cb0d5fd172ab95a4501917526382f25158e83" ], "author": { "name": "Hette Visser", "email": "hettevisser@gmail.com", "time": "Fri Sep 24 10:51:30 2010 +0100" }, "committer": { "name": "Chris Wilson", "email": "chris@chris-wilson.co.uk", "time": "Fri Sep 24 14:22:13 2010 +0100" }, "message": "drm/i915/dp: Wait for PP_CONTROL to take effect.\n\nThis patch fixes the black screen bug on Dell e6510, by\nadding two delays to give the eDP panel time to turn on before we\ncontinue with the next write.\n\n300ms is rather arbitray and a rather long sleep, we need to find a way\nof refining this value.\n\nBugzilla: https://bugs.freedesktop.org/show_bug.cgi?id\u003d29278\nSigned-off-by: Chris Wilson \u003cchris@chris-wilson.co.uk\u003e\nAcked-by: Jesse Barnes \u003cjbarnes@virtuousgeek.org\u003e\n" }, { "commit": "e61cb0d5fd172ab95a4501917526382f25158e83", "tree": "5620faa45a505e54f61d26d34f8a4b69ad6ed80c", "parents": [ "5ceb0f9bb7bde101d8b07cb803002591dcb8c804" ], "author": { "name": "Jan Beulich", "email": "JBeulich@novell.com", "time": "Fri Sep 24 13:25:30 2010 +0100" }, "committer": { "name": "Chris Wilson", "email": "chris@chris-wilson.co.uk", "time": "Fri Sep 24 14:22:12 2010 +0100" }, "message": "some clean up to intel-gtt.c\n\nIn commit e517a5e97080bbe52857bd0d7df9b66602d53c4d the call to\nmap_page_into_agp() got removed from intel_i830_setup_flush(), but the\ncounterpart call from intel_i830_fini_flush() to unmap_page_from_agp()\nwas left in place.\n\nAdditionally, the page allocated here never gets its physical address\nused for sending to hardware, so there\u0027s no need to allocate it with\nGFP_DMA32. Nor is __GFP_ZERO really necessary, as the page is used\nonly to store data to force flushing of some internal processor state.\n\nSigned-off-by: Jan Beulich \u003cjbeulich@novell.com\u003e\nCc: Eric Anholt \u003ceric@anholt.net\u003e\nSigned-off-by: Chris Wilson \u003cchris@chris-wilson.co.uk\u003e\n" }, { "commit": "5ceb0f9bb7bde101d8b07cb803002591dcb8c804", "tree": "018ff025a3f5de220ead3b53254c397825be1de3", "parents": [ "270eea0fd71ae95654606ff7448f195fa22d12c5" ], "author": { "name": "Chris Wilson", "email": "chris@chris-wilson.co.uk", "time": "Fri Sep 24 10:24:28 2010 +0100" }, "committer": { "name": "Chris Wilson", "email": "chris@chris-wilson.co.uk", "time": "Fri Sep 24 14:22:11 2010 +0100" }, "message": "drm/i915: Parse the eDP link configuration from the vBIOS\n\nFirst step, lets have a look at the values for troublesome panels and\nsee if they may be used to improve our link training.\n\nSigned-off-by: Chris Wilson \u003cchris@chris-wilson.co.uk\u003e\n" }, { "commit": "270eea0fd71ae95654606ff7448f195fa22d12c5", "tree": "64f6674094c1720c8b87f095800d1cde0a9bb5bc", "parents": [ "e6c3a2a6d358a726c2c52cb0132c9ad8f6f37486" ], "author": { "name": "Chris Wilson", "email": "chris@chris-wilson.co.uk", "time": "Fri Sep 24 01:15:02 2010 +0100" }, "committer": { "name": "Chris Wilson", "email": "chris@chris-wilson.co.uk", "time": "Fri Sep 24 14:22:11 2010 +0100" }, "message": "drm/i915/lvds: Use the GMBUS pin if specified in VBT\n\nSigned-off-by: Chris Wilson \u003cchris@chris-wilson.co.uk\u003e\n" }, { "commit": "e6c3a2a6d358a726c2c52cb0132c9ad8f6f37486", "tree": "c326448ac6aa0abe53d7cb5a9706894572fd19ca", "parents": [ "d3849eded23e6c78b19acc1a3a7811a01d2f541d" ], "author": { "name": "Chris Wilson", "email": "chris@chris-wilson.co.uk", "time": "Thu Sep 23 23:04:43 2010 +0100" }, "committer": { "name": "Chris Wilson", "email": "chris@chris-wilson.co.uk", "time": "Fri Sep 24 14:19:57 2010 +0100" }, "message": "drm/i915: Use an uninterruptible wait for page-flips during modeset\n\nWe need to drain the pending flips prior to disabling the pipe during\nmodeset, and these need to be done in an uninterruptible fashion.\n\nSigned-off-by: Chris Wilson \u003cchris@chris-wilson.co.uk\u003e\n" }, { "commit": "d3849eded23e6c78b19acc1a3a7811a01d2f541d", "tree": "dfb8a00643e40655fa8dc38e857988e368d8b8d5", "parents": [ "780f0ca3e0cd3f0677d9149b7e14bf0878d1dbdc" ], "author": { "name": "Chris Wilson", "email": "chris@chris-wilson.co.uk", "time": "Thu Sep 23 22:12:23 2010 +0100" }, "committer": { "name": "Chris Wilson", "email": "chris@chris-wilson.co.uk", "time": "Fri Sep 24 14:19:56 2010 +0100" }, "message": "drm/i915: Remove unused dev_priv-\u003epanel_wants_dither\n\nThis is now private to the DVO connector, remove it from the main device\nprivate.\n\nSigned-off-by: Chris Wilson \u003cchris@chris-wilson.co.uk\u003e\n" }, { "commit": "780f0ca3e0cd3f0677d9149b7e14bf0878d1dbdc", "tree": "8fcc0cdf2af2e20f4d2ef30d9523824733ba3244", "parents": [ "3eee1794ac14f160338622ea57dcace7382ceb8f" ], "author": { "name": "Chris Wilson", "email": "chris@chris-wilson.co.uk", "time": "Thu Sep 23 17:45:39 2010 +0100" }, "committer": { "name": "Chris Wilson", "email": "chris@chris-wilson.co.uk", "time": "Fri Sep 24 14:19:55 2010 +0100" }, "message": "drm/i915/ringbuffer: Fix sign of ring space.\n\nAs we presume space is signed when computing and looking for wrap along,\nmake it so.\n\nReported-by: Owain G. Ainsworth \u003czerooa@googlemail.com\u003e\nSigned-off-by: Chris Wilson \u003cchris@chris-wilson.co.uk\u003e\n" }, { "commit": "3eee1794ac14f160338622ea57dcace7382ceb8f", "tree": "cd398df71d8b22940d523e5f51ae8d22f94cde50", "parents": [ "428d2e828c0a68206e5158a42451487601dc9194" ], "author": { "name": "Chris Wilson", "email": "chris@chris-wilson.co.uk", "time": "Thu Sep 23 16:45:52 2010 +0100" }, "committer": { "name": "Chris Wilson", "email": "chris@chris-wilson.co.uk", "time": "Fri Sep 24 14:19:54 2010 +0100" }, "message": "drm/i915: Remove idle timer debugging messages\n\nThese have served their purpose and are now just noise in the debug\nstream.\n\nSigned-off-by: Chris Wilson \u003cchris@chris-wilson.co.uk\u003e\n" }, { "commit": "428d2e828c0a68206e5158a42451487601dc9194", "tree": "a1990359723daa2edf585dbeed063a421f20269d", "parents": [ "29e1316ab129f2d3a9ea874e7c9a4cb936f43542" ], "author": { "name": "Chris Wilson", "email": "chris@chris-wilson.co.uk", "time": "Thu Sep 23 11:16:49 2010 +0100" }, "committer": { "name": "Chris Wilson", "email": "chris@chris-wilson.co.uk", "time": "Fri Sep 24 14:19:44 2010 +0100" }, "message": "drm/i915/lvds: Probe DDC on creation\n\nTry to validate the panel\u0027s connection by writing to address 0xA0.\n\nBugzilla: https://bugzilla.kernel.org/show_bug.cgi?id\u003d18072\nSigned-off-by: Chris Wilson \u003cchris@chris-wilson.co.uk\u003e\n" }, { "commit": "4a445f291ac3faa08f56eaeb6e44856b6b72b74c", "tree": "b66cc93311dc4c623113a87aa9b40730a21ac18e", "parents": [ "cbc60ca04b342a4e1f2a1086a7277c077f07dbed", "a850ea30374ebed32a0724742601861853fde869" ], "author": { "name": "Dave Airlie", "email": "airlied@redhat.com", "time": "Fri Sep 24 15:37:33 2010 +1000" }, "committer": { "name": "Dave Airlie", "email": "airlied@redhat.com", "time": "Fri Sep 24 15:37:33 2010 +1000" }, "message": "Merge remote branch \u0027origin/master\u0027 of /home/airlied/kernel//linux-2.6 into drm-core-next\n" }, { "commit": "a850ea30374ebed32a0724742601861853fde869", "tree": "436dda49aae61ac7c228a7fadb53fd0632666827", "parents": [ "56c9cfb13c9b6516017eea4e8cbe22ea02e07ee6" ], "author": { "name": "Naoya Horiguchi", "email": "n-horiguchi@ah.jp.nec.com", "time": "Fri Sep 10 13:23:06 2010 +0900" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Thu Sep 23 17:29:19 2010 -0700" }, "message": "hugetlb, rmap: add BUG_ON(!PageLocked) in hugetlb_add_anon_rmap()\n\nConfirming page lock is held in hugetlb_add_anon_rmap() may be useful\nto detect possible future problems.\n\nSigned-off-by: Naoya Horiguchi \u003cn-horiguchi@ah.jp.nec.com\u003e\nAcked-by: Rik van Riel \u003criel@redhat.com\u003e\nAcked-by: Andrea Arcangeli \u003caarcange@redhat.com\u003e\nSigned-off-by: Linus Torvalds \u003ctorvalds@linux-foundation.org\u003e\n" }, { "commit": "56c9cfb13c9b6516017eea4e8cbe22ea02e07ee6", "tree": "1b09c9350d8f48d81514f274a3a1933dc9f1a2ef", "parents": [ "cd67f0d2a9a6b5b9f79f4343dc8805757d9ebae2" ], "author": { "name": "Naoya Horiguchi", "email": "n-horiguchi@ah.jp.nec.com", "time": "Fri Sep 10 13:23:04 2010 +0900" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Thu Sep 23 17:29:18 2010 -0700" }, "message": "hugetlb, rmap: fix confusing page locking in hugetlb_cow()\n\nThe \"if (!trylock_page)\" block in the avoidcopy path of hugetlb_cow()\nlooks confusing and is buggy. Originally this trylock_page() was\nintended to make sure that old_page is locked even when old_page !\u003d\npagecache_page, because then only pagecache_page is locked.\n\nThis patch fixes it by moving page locking into hugetlb_fault().\n\nSigned-off-by: Naoya Horiguchi \u003cn-horiguchi@ah.jp.nec.com\u003e\nAcked-by: Rik van Riel \u003criel@redhat.com\u003e\nSigned-off-by: Linus Torvalds \u003ctorvalds@linux-foundation.org\u003e\n" }, { "commit": "cd67f0d2a9a6b5b9f79f4343dc8805757d9ebae2", "tree": "5e97527cfdb295d494e6c97d23b75ce59a25f664", "parents": [ "433abed6c6f76ca079a9564f2a1a51fd28ebe0ca" ], "author": { "name": "Naoya Horiguchi", "email": "n-horiguchi@ah.jp.nec.com", "time": "Fri Sep 10 13:23:04 2010 +0900" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Thu Sep 23 17:29:18 2010 -0700" }, "message": "hugetlb, rmap: use hugepage_add_new_anon_rmap() in hugetlb_cow()\n\nObviously, setting anon_vma for COWed hugepage should be done\nby hugepage_add_new_anon_rmap() to scan vmas faster.\nThis patch fixes it.\n\nSigned-off-by: Naoya Horiguchi \u003cn-horiguchi@ah.jp.nec.com\u003e\nAcked-by: Andrea Arcangeli \u003caarcange@redhat.com\u003e\nReviewed-by: Rik van Riel \u003criel@redhat.com\u003e\nSigned-off-by: Linus Torvalds \u003ctorvalds@linux-foundation.org\u003e\n" }, { "commit": "433abed6c6f76ca079a9564f2a1a51fd28ebe0ca", "tree": "d654c3331c1910fdae732c6576d1f023b0cfae7d", "parents": [ "bcf835e52e0974b2e2e056b190dd66372b28cfce" ], "author": { "name": "Naoya Horiguchi", "email": "n-horiguchi@ah.jp.nec.com", "time": "Fri Sep 10 13:23:03 2010 +0900" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Thu Sep 23 17:29:18 2010 -0700" }, "message": "hugetlb, rmap: always use anon_vma root pointer\n\nThis patch applies Andrea\u0027s fix given by the following patch into hugepage\nrmapping code:\n\n commit 288468c334e98aacbb7e2fb8bde6bc1adcd55e05\n Author: Andrea Arcangeli \u003caarcange@redhat.com\u003e\n Date: Mon Aug 9 17:19:09 2010 -0700\n\nThis patch uses anon_vma-\u003eroot and avoids unnecessary overwriting when\nanon_vma is already set up.\n\nSigned-off-by: Naoya Horiguchi \u003cn-horiguchi@ah.jp.nec.com\u003e\nAcked-by: Andrea Arcangeli \u003caarcange@redhat.com\u003e\nReviewed-by: Rik van Riel \u003criel@redhat.com\u003e\nSigned-off-by: Linus Torvalds \u003ctorvalds@linux-foundation.org\u003e\n" }, { "commit": "bcf835e52e0974b2e2e056b190dd66372b28cfce", "tree": "202758142f0681a4a325a6ebc43aeffb3110ebdf", "parents": [ "91e71c12c506e15028c252a5a097723f41c518dd", "ca242ac9960dc61530e25a2c190e4e13fd5f1ecb" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Thu Sep 23 17:13:17 2010 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Thu Sep 23 17:13:17 2010 -0700" }, "message": "Merge branch \u0027kvm-updates/2.6.36\u0027 of git://git.kernel.org/pub/scm/virt/kvm/kvm\n\n* \u0027kvm-updates/2.6.36\u0027 of git://git.kernel.org/pub/scm/virt/kvm/kvm:\n KVM: Fix reboot on Intel hosts\n KVM: fix irqfd assign/deassign race\n" }, { "commit": "91e71c12c506e15028c252a5a097723f41c518dd", "tree": "161db8e1e6bf8d964c98769bddaa5166027ce698", "parents": [ "ed3473b18f85b591c1e8afec831e9e06120142b7", "fc6e756894b703952fd277a1f98a5d93e7ba847a" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Thu Sep 23 13:30:13 2010 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Thu Sep 23 13:30:13 2010 -0700" }, "message": "Merge branch \u0027for_linus\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/mjg59/platform-drivers-x86\n\n* \u0027for_linus\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/mjg59/platform-drivers-x86:\n thinkpad-acpi: avoid keymap pitfall\n Change MSI LAPTOP driver maintainer to Lee, Chun-Yi\n" }, { "commit": "fc6e756894b703952fd277a1f98a5d93e7ba847a", "tree": "bf4853c75ebf45d863ce53b619ea265aa303e5b7", "parents": [ "58e226c6d44b250641e229b306030da5c84e4341" ], "author": { "name": "Henrique de Moraes Holschuh", "email": "hmh@hmh.eng.br", "time": "Fri Sep 17 21:53:41 2010 -0300" }, "committer": { "name": "Matthew Garrett", "email": "mjg@redhat.com", "time": "Thu Sep 23 15:42:04 2010 -0400" }, "message": "thinkpad-acpi: avoid keymap pitfall\n\nChange the code so that it will use the correct size for keymap entries.\nDo it in a way that makes it harder to screw it up in the future.\n\nReported-by: Jaime Velasco Juan \u003cjsagarribay@gmail.com\u003e\nSigned-off-by: Henrique de Moraes Holschuh \u003chmh@hmh.eng.br\u003e\nSigned-off-by: Matthew Garrett \u003cmjg@redhat.com\u003e\n" }, { "commit": "58e226c6d44b250641e229b306030da5c84e4341", "tree": "3aec9405fd0f5d00320369da7bc20b71e50cb3c6", "parents": [ "57aebd7739c8dbbf403876ee1e9673fafc83d856" ], "author": { "name": "Lee, Chun-Yi", "email": "joeyli.kernel@gmail.com", "time": "Fri Sep 10 08:04:19 2010 +0000" }, "committer": { "name": "Matthew Garrett", "email": "mjg@redhat.com", "time": "Thu Sep 23 15:42:00 2010 -0400" }, "message": "Change MSI LAPTOP driver maintainer to Lee, Chun-Yi\n\nChange MSI LAPTOP driver maintainer from Lennart Poettering to Lee, Chun-Yi.\n\nMSI is a Taiwan OEM company, Lee, Chun-Yi can more easy to contact with MSI\nand maintain msi-laptop driver.\nThank\u0027s for Lennart Poettering\u0027s contribute, Lee, Chun-Yi will base on his\narticle to continue maintain the msi-laptop driver.\n\nSigned-off-by: Lee, Chun-Yi \u003cjlee@novell.com\u003e\nSigned-off-by: Matthew Garrett \u003cmjg@redhat.com\u003e\n" }, { "commit": "ed3473b18f85b591c1e8afec831e9e06120142b7", "tree": "a75d7ae57029b5642165678143bf7a1d91eada4a", "parents": [ "a6ef9c8f1635ccd175be9eb5d36c376ffb8fbc51" ], "author": { "name": "Mark Salter", "email": "msalter@redhat.com", "time": "Thu Sep 23 18:04:33 2010 +0100" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Thu Sep 23 10:20:58 2010 -0700" }, "message": "MN10300: Arch doesn\u0027t support HAVE_ARCH_TRACEHOOK\n\nRemove specification of HAVE_ARCH_TRACEHOOK for MN10300 as the arch does not\nsupport it at this time.\n\nSigned-off-by: Mark Salter \u003cmsalter@redhat.com\u003e\nSigned-off-by: David Howells \u003cdhowells@redhat.com\u003e\nSigned-off-by: Linus Torvalds \u003ctorvalds@linux-foundation.org\u003e\n" }, { "commit": "a6ef9c8f1635ccd175be9eb5d36c376ffb8fbc51", "tree": "6d8f26dde3b29fd613adb250ad0b8c224ce6ee21", "parents": [ "fd429a0842c61b60e02a7e63430a609957821c67" ], "author": { "name": "Mark Salter", "email": "msalter@redhat.com", "time": "Thu Sep 23 18:04:28 2010 +0100" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Thu Sep 23 10:20:57 2010 -0700" }, "message": "MN10300: Fix SIGRTMAX\n\nSIGRTMAX should be _NSIG not _NSIG-1.\n\nSigned-off-by: Mark Salter \u003cmsalter@redhat.com\u003e\nSigned-off-by: David Howells \u003cdhowells@redhat.com\u003e\nSigned-off-by: Linus Torvalds \u003ctorvalds@linux-foundation.org\u003e\n" }, { "commit": "cf9a2f3afc75d41a61cbc91e725b9ce0746c400a", "tree": "cf8fe7cc483b5f301f4d691260a0f6fa6ece3f6e", "parents": [ "123d5c0197d8333c3f5cb9572a0c8299dc611233" ], "author": { "name": "Chris Wilson", "email": "chris@chris-wilson.co.uk", "time": "Thu Sep 23 16:17:33 2010 +0100" }, "committer": { "name": "Chris Wilson", "email": "chris@chris-wilson.co.uk", "time": "Thu Sep 23 17:13:51 2010 +0100" }, "message": "drm/i915/sdvo: Handle unsupported GET_SUPPORTED_ENHANCEMENTS gracefully\n\nIn the event that the external chipset doesn\u0027t implement the\nGET_SUPPORTED_ENHANCEMENTS commands, gracefully treat it as having no\nenhancments rather than bailing.\n\nReported-and-tested-by: Woody Suwalski \u003cterraluna977@gmail.com\u003e\nBugzilla: https://bugzilla.kernel.org/show_bug.cgi?id\u003d18342\nSigned-off-by: Chris Wilson \u003cchris@chris-wilson.co.uk\u003e\n" }, { "commit": "123d5c0197d8333c3f5cb9572a0c8299dc611233", "tree": "7a6fb7c4843574339f4be66c16a51f21a0d8b7b2", "parents": [ "9b74f7348f214b1f99819f0d0da4a1cbabb1e740" ], "author": { "name": "Chris Wilson", "email": "chris@chris-wilson.co.uk", "time": "Thu Sep 23 16:15:21 2010 +0100" }, "committer": { "name": "Chris Wilson", "email": "chris@chris-wilson.co.uk", "time": "Thu Sep 23 17:13:33 2010 +0100" }, "message": "drm/i915/sdvo: Cleanup connector on error path\n\nWe weren\u0027t unlinking the freed connector from the drm lists, and so\nhit some use-after-free if we failed to initialise the connector.\n\nReported-and-tested-by: Woody Suwalski \u003cterraluna977@gmail.com\u003e\nBugzilla: https://bugzilla.kernel.org/show_bug.cgi?id\u003d18342\nSigned-off-by: Chris Wilson \u003cchris@chris-wilson.co.uk\u003e\n" }, { "commit": "fd429a0842c61b60e02a7e63430a609957821c67", "tree": "41c0ee0cbb3b2c388723bf17edf1df66cb949e8c", "parents": [ "57aebd7739c8dbbf403876ee1e9673fafc83d856" ], "author": { "name": "Mark Salter", "email": "msalter@redhat.com", "time": "Thu Sep 23 16:40:22 2010 +0100" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Thu Sep 23 09:12:21 2010 -0700" }, "message": "MN10300: Fix endianess of ext2 bitops\n\nThe MN10300 arch ext2 bitops assume a big-endian kernel, but the MN10300\narch only runs in little-endian mode.\n\nReported-by: Akira Takeuchi \u003ctakeuchi.akr@jp.panasonic.com\u003e\nSigned-off-by: Mark Salter \u003cmsalter@redhat.com\u003e\nSigned-off-by: David Howells \u003cdhowells@redhat.com\u003e\nSigned-off-by: Linus Torvalds \u003ctorvalds@linux-foundation.org\u003e\n" }, { "commit": "57aebd7739c8dbbf403876ee1e9673fafc83d856", "tree": "3ed14ec9da036a05488fd4c08cc1cd5ca414b6e0", "parents": [ "561f8182dbf24b1be9207038aa5f82e34be4bad1", "46b30ea9bc3698bc1d1e6fd726c9601d46fa0a91" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Thu Sep 23 08:06:55 2010 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Thu Sep 23 08:06:55 2010 -0700" }, "message": "Merge branch \u0027for-linus\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/tj/percpu\n\n* \u0027for-linus\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/tj/percpu:\n percpu: fix pcpu_last_unit_cpu\n" }, { "commit": "ca242ac9960dc61530e25a2c190e4e13fd5f1ecb", "tree": "96ecac4191e1e1146002df587d0076e6e61e63d0", "parents": [ "6bbfb2653177a00f70e57e53625502d43804fed0" ], "author": { "name": "Avi Kivity", "email": "avi@redhat.com", "time": "Tue Sep 21 19:59:43 2010 +0200" }, "committer": { "name": "Marcelo Tosatti", "email": "mtosatti@redhat.com", "time": "Thu Sep 23 11:31:56 2010 -0300" }, "message": "KVM: Fix reboot on Intel hosts\n\nWhen we reboot, we disable vmx extensions or otherwise INIT gets blocked.\nIf a task on another cpu hits a vmx instruction, it will fault if vmx is\ndisabled. We trap that to avoid a nasty oops and spin until the reboot\ncompletes.\n\nProblem is, we sleep with interrupts disabled. This blocks smp_send_stop()\nfrom running, and the reboot process halts.\n\nFix by enabling interrupts before spinning.\n\nKVM-Stable-Tag.\nSigned-off-by: Avi Kivity \u003cavi@redhat.com\u003e\nSigned-off-by: Marcelo Tosatti \u003cmtosatti@redhat.com\u003e\n" }, { "commit": "6bbfb2653177a00f70e57e53625502d43804fed0", "tree": "b0196884ead501481a3ae3a27d45b41b43ec117d", "parents": [ "c79bd89282136a4516e842fa542d6abf902ddeac" ], "author": { "name": "Michael S. Tsirkin", "email": "mst@redhat.com", "time": "Sun Sep 19 19:02:31 2010 +0200" }, "committer": { "name": "Marcelo Tosatti", "email": "mtosatti@redhat.com", "time": "Thu Sep 23 11:31:51 2010 -0300" }, "message": "KVM: fix irqfd assign/deassign race\n\nI think I see the following (theoretical) race:\n\nDuring irqfd assign, we drop irqfds lock before we\nschedule inject work. Therefore, deassign running\non another CPU could cause shutdown and flush to run\nbefore inject, causing user after free in inject.\n\nA simple fix it to schedule inject under the lock.\n\nSigned-off-by: Michael S. Tsirkin \u003cmst@redhat.com\u003e\nAcked-by: Gregory Haskins \u003cghaskins@novell.com\u003e\nSigned-off-by: Marcelo Tosatti \u003cmtosatti@redhat.com\u003e\n" }, { "commit": "29e1316ab129f2d3a9ea874e7c9a4cb936f43542", "tree": "45130e31d563a1e79d3628aa37a3bad63c6bb355", "parents": [ "20f0cd55f68e0678909214c60b3595a22124bdb0" ], "author": { "name": "Chris Wilson", "email": "chris@chris-wilson.co.uk", "time": "Wed Sep 22 19:10:09 2010 +0100" }, "committer": { "name": "Chris Wilson", "email": "chris@chris-wilson.co.uk", "time": "Thu Sep 23 11:05:44 2010 +0100" }, "message": "drm/i915/tv: Sleep before checking for state changes.\n\nWe need to wait for the PLLs to settle prior to detecting the state\nchanges. The BIOS writers guide suggests waiting for the next vblank.\n\nReported-by: Carlos R. Mafra \u003ccrmafra2@gmail.com\u003e\nSigned-off-by: Chris Wilson \u003cchris@chris-wilson.co.uk\u003e\n" }, { "commit": "20f0cd55f68e0678909214c60b3595a22124bdb0", "tree": "c64fb737f3047896c387b7eb0de4936d0d500ebe", "parents": [ "6ec3d0c0e9c0c605696e91048eebaca7b0c36695" ], "author": { "name": "Chris Wilson", "email": "chris@chris-wilson.co.uk", "time": "Thu Sep 23 11:00:38 2010 +0100" }, "committer": { "name": "Chris Wilson", "email": "chris@chris-wilson.co.uk", "time": "Thu Sep 23 11:02:55 2010 +0100" }, "message": "drm/i915: Remove the broken flush_ring from page-flip\n\nThis is already performed with the pipelined flush, so by the time we\nschedule the flush in the page-flip, the ring is NULL and we OOPs\ninstead.\n\nReported-by: Daniel Vetter \u003cdaniel.vetter@ffwll.ch\u003e\nSigned-off-by: Chris Wilson \u003cchris@chris-wilson.co.uk\u003e\n" }, { "commit": "9b74f7348f214b1f99819f0d0da4a1cbabb1e740", "tree": "b6d92f2703d72ceca48b1309274198c174b53c3a", "parents": [ "db8c076b9206ea35b1f7299708d5510b17674db2" ], "author": { "name": "Chris Wilson", "email": "chris@chris-wilson.co.uk", "time": "Wed Sep 22 19:10:44 2010 +0100" }, "committer": { "name": "Chris Wilson", "email": "chris@chris-wilson.co.uk", "time": "Thu Sep 23 10:30:57 2010 +0100" }, "message": "drm/i915: Fix 945GM regression in e259befd\n\nA minor typo caused a single fence register to be incorrectly\nprogrammed, resulting in occassional tiling corruption.\n\nReported-and-tested-by: Hans de Bruin \u003cbruinjm@xs4all.nl\u003e\nBugzilla: https://bugzilla.kernel.org/show_bug.cgi?id\u003d18962\nSigned-off-by: Chris Wilson \u003cchris@chris-wilson.co.uk\u003e\nCc: stable@kernel.org\n" }, { "commit": "561f8182dbf24b1be9207038aa5f82e34be4bad1", "tree": "1d60bdba7568a5f5f4cad02578807c6c91203da2", "parents": [ "f501ed524b26ba1b739b7f7feb0a0e1496878769" ], "author": { "name": "Yinghai Lu", "email": "yinghai@kernel.org", "time": "Wed Sep 22 13:05:15 2010 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Wed Sep 22 17:22:40 2010 -0700" }, "message": "ipmi: fix hardcoded ipmi device exit path warning\n\nWhen modprobe.conf has\noptions ipmi_si type\u003d\"kcs\" ports\u003d0xCA2 regspacings\u003d\"4\"\n\nipmi_si can be loaded properly, but when try to unload it get:\n\nSep 20 15:00:27 xx abrt: Kerneloops: Reported 1 kernel oopses to Abrt\nSep 20 15:00:27 xx abrtd: Directory \u0027kerneloops-1285020027-1\u0027 creation detected\nSep 20 15:00:27 xx abrtd: New crash /var/spool/abrt/kerneloops-1285020027-1, processing\nSep 20 15:01:09 xx kernel: ------------[ cut here ]------------\nSep 20 15:01:09 xx kernel: WARNING: at drivers/base/driver.c:262 driver_unregister+0x8a/0xa0()\nSep 20 15:01:09 xx kernel: Hardware name: Sun Fire x4800\nSep 20 15:01:09 xx kernel: Unexpected driver unregister!\nSep 20 15:01:09 xx kernel: Modules linked in: ipmi_si(-) ipmi_msghandler ip6table_filter ip6_tables ebtable_nat ebtables ipt_MASQUERADE iptable_nat nf_nat bridge stp llc autofs4 sunrpc cpufreq_ondemand acpi_cpufreq freq_table mperf xt_physdev be2iscsi iscsi_boot_sysfs bnx2i cnic uio cxgb3i iw_cxgb3 cxgb3 mdio ib_iser rdma_cm ib_cm iw_cm ib_sa ib_mad ib_core ib_addr ipv6 iscsi_tcp libiscsi_tcp libiscsi scsi_transport_iscsi dm_mirror dm_region_hash dm_log dm_mod vhost_net macvtap macvlan tun kvm_intel kvm uinput sg ses enclosure ahci libahci pcspkr i2c_i801 i2c_core iTCO_wdt iTCO_vendor_support igb dca i7core_edac edac_core ext3 jbd mbcache sd_mod crc_t10dif megaraid_sas [last unloaded: ipmi_devintf]\nSep 20 15:01:09 xx kernel: Pid: 10625, comm: modprobe Tainted: G W 2.6.36-rc5-tip+ #6\nSep 20 15:01:09 xx kernel: Call Trace:\nSep 20 15:01:09 xx kernel: [\u003cffffffff810600df\u003e] warn_slowpath_common+0x7f/0xc0\nSep 20 15:01:09 xx kernel: [\u003cffffffff810601d6\u003e] warn_slowpath_fmt+0x46/0x50\nSep 20 15:01:09 xx kernel: [\u003cffffffff812ff60a\u003e] driver_unregister+0x8a/0xa0\nSep 20 15:01:09 xx kernel: [\u003cffffffff812ae112\u003e] pnp_unregister_driver+0x12/0x20\nSep 20 15:01:09 xx kernel: [\u003cffffffffa01d0327\u003e] cleanup_ipmi_si+0x3c/0xa7 [ipmi_si]\nSep 20 15:01:09 xx kernel: [\u003cffffffff81099a60\u003e] sys_delete_module+0x1a0/0x270\nSep 20 15:01:09 xx kernel: [\u003cffffffff814b7070\u003e] ? do_page_fault+0x150/0x320\nSep 20 15:01:09 xx kernel: [\u003cffffffff8100b072\u003e] system_call_fastpath+0x16/0x1b\nSep 20 15:01:09 xx kernel: ---[ end trace 0d1967161adcee0d ]---\n\nWe need to check if ipmi_pnp_driver is loaded before we try to unload it.\n\nSigned-off-by: Yinghai Lu \u003cyinghai@kernel.org\u003e\nCc: Corey Minyard \u003cminyard@acm.org\u003e\nSigned-off-by: Andrew Morton \u003cakpm@linux-foundation.org\u003e\nSigned-off-by: Linus Torvalds \u003ctorvalds@linux-foundation.org\u003e\n" }, { "commit": "f501ed524b26ba1b739b7f7feb0a0e1496878769", "tree": "e1ca7b22bfca154b3e798d6b007d0c220dc185be", "parents": [ "2aeadc30de45a72648f271603203ab392b80f607" ], "author": { "name": "Vladimir Zapolskiy", "email": "vzapolskiy@gmail.com", "time": "Wed Sep 22 13:05:13 2010 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Wed Sep 22 17:22:40 2010 -0700" }, "message": "rtc: s3c: balance state changes of wakeup flag\n\nThis change resolves a problem about unbalanced calls of\nenable_irq_wakeup() and disable_irq_wakeup() for alarm interrupt.\n\nBug reproduction:\n\nroot@eb600:~# echo 0 \u003e /sys/class/rtc/rtc0/wakealarm\n\nWARNING: at kernel/irq/manage.c:361 set_irq_wake+0x7c/0xe4()\n Unbalanced IRQ 46 wake disable\nModules linked in:\n[\u003cc0025708\u003e] (unwind_backtrace+0x0/0xd8) from [\u003cc003358c\u003e] (warn_slowpath_common+0x44/0x5c)\n[\u003cc003358c\u003e] (warn_slowpath_common+0x44/0x5c) from [\u003cc00335dc\u003e] (warn_slowpath_fmt+0x24/0x30)\n[\u003cc00335dc\u003e] (warn_slowpath_fmt+0x24/0x30) from [\u003cc0058c20\u003e] (set_irq_wake+0x7c/0xe4)\n[\u003cc0058c20\u003e] (set_irq_wake+0x7c/0xe4) from [\u003cc01b5e80\u003e] (s3c_rtc_setalarm+0xa8/0xb8)\n[\u003cc01b5e80\u003e] (s3c_rtc_setalarm+0xa8/0xb8) from [\u003cc01b47a0\u003e] (rtc_set_alarm+0x60/0x74)\n[\u003cc01b47a0\u003e] (rtc_set_alarm+0x60/0x74) from [\u003cc01b5a98\u003e] (rtc_sysfs_set_wakealarm+0xc8/0xd8)\n[\u003cc01b5a98\u003e] (rtc_sysfs_set_wakealarm+0xc8/0xd8) from [\u003cc01891ec\u003e] (dev_attr_store+0x20/0x24)\n[\u003cc01891ec\u003e] (dev_attr_store+0x20/0x24) from [\u003cc00be934\u003e] (sysfs_write_file+0x104/0x13c)\n[\u003cc00be934\u003e] (sysfs_write_file+0x104/0x13c) from [\u003cc0080e7c\u003e] (vfs_write+0xb0/0x158)\n[\u003cc0080e7c\u003e] (vfs_write+0xb0/0x158) from [\u003cc0080fcc\u003e] (sys_write+0x3c/0x68)\n[\u003cc0080fcc\u003e] (sys_write+0x3c/0x68) from [\u003cc0020ec0\u003e] (ret_fast_syscall+0x0/0x28)\n\nSigned-off-by: Vladimir Zapolskiy \u003cvzapolskiy@gmail.com\u003e\nCc: Alessandro Zummo \u003ca.zummo@towertech.it\u003e\nCc: Ben Dooks \u003cben@fluff.org.uk\u003e\nCc: Atul Dahiya \u003catul.dahiya@samsung.com\u003e\nCc: Taekgyun Ko \u003ctaeggyun.ko@samsung.com\u003e\nCc: Kukjin Kim \u003ckgene.kim@samsung.com\u003e\nCc: \u003cstable@kernel.org\u003e\nSigned-off-by: Andrew Morton \u003cakpm@linux-foundation.org\u003e\nSigned-off-by: Linus Torvalds \u003ctorvalds@linux-foundation.org\u003e\n" }, { "commit": "2aeadc30de45a72648f271603203ab392b80f607", "tree": "f3368916a4b1efdfa205ae0891733995a456957f", "parents": [ "a247c3a97a0216b18a46243eda26081f1928ec37" ], "author": { "name": "Andrea Arcangeli", "email": "aarcange@redhat.com", "time": "Wed Sep 22 13:05:12 2010 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Wed Sep 22 17:22:40 2010 -0700" }, "message": "mmap: call unlink_anon_vmas() in __split_vma() in case of error\n\nIf __split_vma fails because of an out of memory condition the\nanon_vma_chain isn\u0027t teardown and freed potentially leading to rmap walks\naccessing freed vma information plus there\u0027s a memleak.\n\nSigned-off-by: Andrea Arcangeli \u003caarcange@redhat.com\u003e\nAcked-by: Johannes Weiner \u003cjweiner@redhat.com\u003e\nAcked-by: Rik van Riel \u003criel@redhat.com\u003e\nAcked-by: Hugh Dickins \u003chughd@google.com\u003e\nCc: Marcelo Tosatti \u003cmtosatti@redhat.com\u003e\nCc: \u003cstable@kernel.org\u003e\nSigned-off-by: Andrew Morton \u003cakpm@linux-foundation.org\u003e\nSigned-off-by: Linus Torvalds \u003ctorvalds@linux-foundation.org\u003e\n" }, { "commit": "a247c3a97a0216b18a46243eda26081f1928ec37", "tree": "ecf6996b252e9cc818d170eba4b8eb25aac3d596", "parents": [ "df08cdc7ef606509debe7677c439be0ca48790e4" ], "author": { "name": "Andrea Arcangeli", "email": "aarcange@redhat.com", "time": "Wed Sep 22 13:05:12 2010 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Wed Sep 22 17:22:39 2010 -0700" }, "message": "rmap: fix walk during fork\n\nThe below bug in fork led to the rmap walk finding the parent huge-pmd\ntwice instead of just once, because the anon_vma_chain objects of the\nchild vma still point to the vma-\u003evm_mm of the parent.\n\nThe patch fixes it by making the rmap walk accurate during fork. It\u0027s not\na big deal normally but it worth being accurate considering the cost is\nthe same.\n\nSigned-off-by: Andrea Arcangeli \u003caarcange@redhat.com\u003e\nAcked-by: Johannes Weiner \u003cjweiner@redhat.com\u003e\nAcked-by: Rik van Riel \u003criel@redhat.com\u003e\nAcked-by: Hugh Dickins \u003chughd@google.com\u003e\nSigned-off-by: Andrew Morton \u003cakpm@linux-foundation.org\u003e\nSigned-off-by: Linus Torvalds \u003ctorvalds@linux-foundation.org\u003e\n" }, { "commit": "df08cdc7ef606509debe7677c439be0ca48790e4", "tree": "f97031deaba02e5c464871568604e908df7fe209", "parents": [ "e85bfd3aa7a34fa963bb268a676b41694e6dcf96" ], "author": { "name": "Andrew Morton", "email": "akpm@linux-foundation.org", "time": "Wed Sep 22 13:05:11 2010 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Wed Sep 22 17:22:39 2010 -0700" }, "message": "drivers/pci/intel-iommu.c: fix build with older gcc\u0027s\n\ndrivers/pci/intel-iommu.c: In function `__iommu_calculate_agaw\u0027:\ndrivers/pci/intel-iommu.c:437: sorry, unimplemented: inlining failed in call to \u0027width_to_agaw\u0027: function body not available\ndrivers/pci/intel-iommu.c:445: sorry, unimplemented: called from here\n\nMove the offending function (and its siblings) to top-of-file, remove the\nforward declaration.\n\nAddresses https://bugzilla.kernel.org/show_bug.cgi?id\u003d17441\n\nReported-by: Martin Mokrejs \u003cmmokrejs@ribosome.natur.cuni.cz\u003e\nCc: David Woodhouse \u003cdwmw2@infradead.org\u003e\nCc: Jesse Barnes \u003cjbarnes@virtuousgeek.org\u003e\nCc: \u003cstable@kernel.org\u003e\nSigned-off-by: Andrew Morton \u003cakpm@linux-foundation.org\u003e\nSigned-off-by: Linus Torvalds \u003ctorvalds@linux-foundation.org\u003e\n" }, { "commit": "e85bfd3aa7a34fa963bb268a676b41694e6dcf96", "tree": "6d92d25d390668879fe952e6b6068d774d0471b4", "parents": [ "fd02db9de73faebc51240619c7c7f99bee9f65c7" ], "author": { "name": "David Rientjes", "email": "rientjes@google.com", "time": "Wed Sep 22 13:05:10 2010 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Wed Sep 22 17:22:39 2010 -0700" }, "message": "oom: filter unkillable tasks from tasklist dump\n\n/proc/sys/vm/oom_dump_tasks is enabled by default, so it\u0027s necessary to\nlimit as much information as possible that it should emit.\n\nThe tasklist dump should be filtered to only those tasks that are eligible\nfor oom kill. This is already done for memcg ooms, but this patch extends\nit to both cpuset and mempolicy ooms as well as init.\n\nIn addition to suppressing irrelevant information, this also reduces\nconfusion since users currently don\u0027t know which tasks in the tasklist\naren\u0027t eligible for kill (such as those attached to cpusets or bound to\nmempolicies with a disjoint set of mems or nodes, respectively) since that\ninformation is not shown.\n\nSigned-off-by: David Rientjes \u003crientjes@google.com\u003e\nReviewed-by: KOSAKI Motohiro \u003ckosaki.motohiro@jp.fujitsu.com\u003e\nCc: KAMEZAWA Hiroyuki \u003ckamezawa.hiroyu@jp.fujitsu.com\u003e\nSigned-off-by: Andrew Morton \u003cakpm@linux-foundation.org\u003e\nSigned-off-by: Linus Torvalds \u003ctorvalds@linux-foundation.org\u003e\n" }, { "commit": "fd02db9de73faebc51240619c7c7f99bee9f65c7", "tree": "2781eada960ecdfbb407fd473b53011b30012fee", "parents": [ "cb1dcc0ff4b57873210100fc9d70defa81af43d4" ], "author": { "name": "Dan Rosenberg", "email": "drosenberg@vsecurity.com", "time": "Wed Sep 22 13:05:09 2010 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Wed Sep 22 17:22:39 2010 -0700" }, "message": "drivers/video/sis/sis_main.c: prevent reading uninitialized stack memory\n\nThe FBIOGET_VBLANK device ioctl allows unprivileged users to read 16 bytes\nof uninitialized stack memory, because the \"reserved\" member of the\nfb_vblank struct declared on the stack is not altered or zeroed before\nbeing copied back to the user. This patch takes care of it.\n\nSigned-off-by: Dan Rosenberg \u003cdan.j.rosenberg@gmail.com\u003e\nCc: Thomas Winischhofer \u003cthomas@winischhofer.net\u003e\nCc: \u003cstable@kernel.org\u003e\nSigned-off-by: Andrew Morton \u003cakpm@linux-foundation.org\u003e\nSigned-off-by: Linus Torvalds \u003ctorvalds@linux-foundation.org\u003e\n" }, { "commit": "cb1dcc0ff4b57873210100fc9d70defa81af43d4", "tree": "e3ac8e05ce761fa1c468f1bd4fc2538b11ba3edb", "parents": [ "1c2499ae87f828eabddf6483b0dfc11da1100c07" ], "author": { "name": "Richard Weinberger", "email": "richard@nod.at", "time": "Wed Sep 22 13:05:07 2010 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Wed Sep 22 17:22:39 2010 -0700" }, "message": "uml: fix compile warning\n\nThis fixes:\nincompatible pointer type: \u003d\u003e 89\n arch/um/kernel/exec.c: warning: passing argument 2 of \u0027execve1\u0027 from\nincompatible pointer type: \u003d\u003e 69, 85\n arch/um/kernel/exec.c: warning: passing argument 3 of \u0027execve1\u0027 from\nincompatible pointer type: \u003d\u003e 69, 85\n\nwhich was introduced by d7627467b7a8d (\"Make do_execve() take a const\nfilename pointer\")\n\nSigned-off-by: Richard Weinberger \u003crichard@nod.at\u003e\nCc: David Howells \u003cdhowells@redhat.com\u003e\nCc: Jeff Dike \u003cjdike@addtoit.com\u003e\nSigned-off-by: Andrew Morton \u003cakpm@linux-foundation.org\u003e\nSigned-off-by: Linus Torvalds \u003ctorvalds@linux-foundation.org\u003e\n" }, { "commit": "1c2499ae87f828eabddf6483b0dfc11da1100c07", "tree": "be394bdb6d8bd1732a2635eca62e5b2eca04c07a", "parents": [ "142092e577255e33a4ab74c6baad04c9fb887927" ], "author": { "name": "KOSAKI Motohiro", "email": "kosaki.motohiro@jp.fujitsu.com", "time": "Wed Sep 22 13:05:06 2010 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Wed Sep 22 17:22:39 2010 -0700" }, "message": "/proc/pid/smaps: fix dirty pages accounting\n\nCurrently, /proc/\u003cpid\u003e/smaps has wrong dirty pages accounting.\nShared_Dirty and Private_Dirty output only pte dirty pages and ignore\nPG_dirty page flag. It is difference against documentation, but also\ninconsistent against Referenced field. (Referenced checks both pte and\npage flags)\n\nThis patch fixes it.\n\nTest program:\n\n large-array.c\n ---------------------------------------------------\n #include \u003cstdio.h\u003e\n #include \u003cstdlib.h\u003e\n #include \u003cstring.h\u003e\n #include \u003cunistd.h\u003e\n\n char array[1*1024*1024*1024L];\n\n int main(void)\n {\n memset(array, 1, sizeof(array));\n pause();\n\n return 0;\n }\n ---------------------------------------------------\n\nTest case:\n 1. run ./large-array\n 2. cat /proc/`pidof large-array`/smaps\n 3. swapoff -a\n 4. cat /proc/`pidof large-array`/smaps again\n\nTest result:\n \u003cbefore patch\u003e\n\n00601000-40601000 rw-p 00000000 00:00 0\nSize: 1048576 kB\nRss: 1048576 kB\nPss: 1048576 kB\nShared_Clean: 0 kB\nShared_Dirty: 0 kB\nPrivate_Clean: 218992 kB \u003c-- showed pages as clean incorrectly\nPrivate_Dirty: 829584 kB\nReferenced: 388364 kB\nSwap: 0 kB\nKernelPageSize: 4 kB\nMMUPageSize: 4 kB\n\n \u003cafter patch\u003e\n\n00601000-40601000 rw-p 00000000 00:00 0\nSize: 1048576 kB\nRss: 1048576 kB\nPss: 1048576 kB\nShared_Clean: 0 kB\nShared_Dirty: 0 kB\nPrivate_Clean: 0 kB\nPrivate_Dirty: 1048576 kB \u003c-- fixed\nReferenced: 388480 kB\nSwap: 0 kB\nKernelPageSize: 4 kB\nMMUPageSize: 4 kB\n\nSigned-off-by: KOSAKI Motohiro \u003ckosaki.motohiro@jp.fujitsu.com\u003e\nAcked-by: Hugh Dickins \u003chughd@google.com\u003e\nCc: Matt Mackall \u003cmpm@selenic.com\u003e\nSigned-off-by: Andrew Morton \u003cakpm@linux-foundation.org\u003e\nSigned-off-by: Linus Torvalds \u003ctorvalds@linux-foundation.org\u003e\n" }, { "commit": "142092e577255e33a4ab74c6baad04c9fb887927", "tree": "3c662d36238262873014c41d2adac6815a0421fb", "parents": [ "a5757c2a474a15f87e5baa9a4caacc31cde2bae6" ], "author": { "name": "Jarek Poplawski", "email": "jarkao2@gmail.com", "time": "Wed Sep 22 13:05:05 2010 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Wed Sep 22 17:22:39 2010 -0700" }, "message": "fbcon: fix lockdep warning from fbcon_deinit()\n\nFix the lockdep warning:\n\n[ 13.657164] INFO: trying to register non-static key.\n[ 13.657169] the code is fine but needs lockdep annotation.\n[ 13.657171] turning off the locking correctness validator.\n[ 13.657177] Pid: 622, comm: modprobe Not tainted 2.6.36-rc3c #8\n[ 13.657180] Call Trace:\n[ 13.657194] [\u003cc13002c8\u003e] ? printk+0x18/0x20\n[ 13.657202] [\u003cc1056cf6\u003e] register_lock_class+0x336/0x350\n[ 13.657208] [\u003cc1058bf9\u003e] __lock_acquire+0x449/0x1180\n[ 13.657215] [\u003cc1059997\u003e] lock_acquire+0x67/0x80\n[ 13.657222] [\u003cc1042bf1\u003e] ? __cancel_work_timer+0x51/0x230\n[ 13.657227] [\u003cc1042c23\u003e] __cancel_work_timer+0x83/0x230\n[ 13.657231] [\u003cc1042bf1\u003e] ? __cancel_work_timer+0x51/0x230\n[ 13.657236] [\u003cc10582b2\u003e] ? mark_held_locks+0x62/0x80\n[ 13.657243] [\u003cc10b3a2f\u003e] ? kfree+0x7f/0xe0\n[ 13.657248] [\u003cc105853c\u003e] ? trace_hardirqs_on_caller+0x11c/0x160\n[ 13.657253] [\u003cc105858b\u003e] ? trace_hardirqs_on+0xb/0x10\n[ 13.657259] [\u003cc117f4cd\u003e] ? fbcon_deinit+0x16d/0x1e0\n[ 13.657263] [\u003cc117f4cd\u003e] ? fbcon_deinit+0x16d/0x1e0\n[ 13.657268] [\u003cc1042dea\u003e] cancel_work_sync+0xa/0x10\n[ 13.657272] [\u003cc117f444\u003e] fbcon_deinit+0xe4/0x1e0\n...\n\nThe warning is caused by trying to cancel an uninitialized work from\nfbcon_exit(). Fix it by adding a check for queue.func, similarly to other\nplaces in this code.\n\nSigned-off-by: Jarek Poplawski \u003cjarkao2@gmail.com\u003e\nSigned-off-by: Andrew Morton \u003cakpm@linux-foundation.org\u003e\nSigned-off-by: Linus Torvalds \u003ctorvalds@linux-foundation.org\u003e\n" }, { "commit": "a5757c2a474a15f87e5baa9a4caacc31cde2bae6", "tree": "84e0744f26d06af5dd1102f01bf44bc3f8eea36f", "parents": [ "85a00d9bbfb4704fbf368944b1cb9fed8f1598c5" ], "author": { "name": "Luke Macken", "email": "lmacken@redhat.com", "time": "Wed Sep 22 13:05:04 2010 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Wed Sep 22 17:22:39 2010 -0700" }, "message": "efifb: support the EFI framebuffer on more Apple hardware\n\nEnable the EFI framebuffer on 14 more Macs, including the iMac11,1\niMac10,1 iMac8,1 Macmini3,1 Macmini4,1 MacBook5,1 MacBook6,1 MacBook7,1\nMacBookPro2,2 MacBookPro5,2 MacBookPro5,3 MacBookPro6,1 MacBookPro6,2 and\nMacBookPro7,1\n\nInformation gathered from various user submissions.\n\n https://bugzilla.redhat.com/show_bug.cgi?id\u003d528232\n http://ubuntuforums.org/showthread.php?t\u003d1557326\n\n[akpm@linux-foundation.org: coding-style fixes]\nSigned-off-by: Luke Macken \u003clmacken@redhat.com\u003e\nSigned-off-by: Peter Jones \u003cpjones@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": "85a00d9bbfb4704fbf368944b1cb9fed8f1598c5", "tree": "b9d5f22610675f4d8bbdeba2ccdcb4c232140499", "parents": [ "a0c42bac79731276c9b2f28d54f9e658fcf843a2" ], "author": { "name": "Peter Jones", "email": "pjones@redhat.com", "time": "Wed Sep 22 13:05:04 2010 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Wed Sep 22 17:22:39 2010 -0700" }, "message": "efifb: check that the base address is plausible on pci systems\n\nSome Apple machines have identical DMI data but different memory\nconfigurations for the video. Given that, check that the address in our\ntable is actually within the range of a PCI BAR on a VGA device in the\nmachine.\n\nThis also fixes up the return value from set_system(), which has always\nbeen wrong, but never resulted in bad behavior since there\u0027s only ever\nbeen one matching entry in the dmi table.\n\nThe patch\n\n1) stops people\u0027s machines from crashing when we get their display wrong,\n which seems to be unfortunately inevitable,\n\n2) allows us to support identical dmi data with differing video memory\n configurations\n\nThis also adds me as the efifb maintainer, since I\u0027ve effectively been\nacting as such for quite some time.\n\nSigned-off-by: Peter Jones \u003cpjones@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": "a0c42bac79731276c9b2f28d54f9e658fcf843a2", "tree": "c138e92f301f6f10ca684c1d83126928452f0ffa", "parents": [ "d1908362ae0b97374eb8328fbb471576332f9fb1" ], "author": { "name": "Jan Kara", "email": "jack@suse.cz", "time": "Wed Sep 22 13:05:03 2010 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Wed Sep 22 17:22:39 2010 -0700" }, "message": "aio: do not return ERESTARTSYS as a result of AIO\n\nOCFS2 can return ERESTARTSYS from its write function when the process is\nsignalled while waiting for a cluster lock (and the filesystem is mounted\nwith intr mount option). Generally, it seems reasonable to allow\nfilesystems to return this error code from its IO functions. As we must\nnot leak ERESTARTSYS (and similar error codes) to userspace as a result of\nan AIO operation, we have to properly convert it to EINTR inside AIO code\n(restarting the syscall isn\u0027t really an option because other AIO could\nhave been already submitted by the same io_submit syscall).\n\nSigned-off-by: Jan Kara \u003cjack@suse.cz\u003e\nReviewed-by: Jeff Moyer \u003cjmoyer@redhat.com\u003e\nCc: Christoph Hellwig \u003chch@infradead.org\u003e\nCc: Zach Brown \u003czach.brown@oracle.com\u003e\nCc: \u003cstable@kernel.org\u003e\nSigned-off-by: Andrew Morton \u003cakpm@linux-foundation.org\u003e\nSigned-off-by: Linus Torvalds \u003ctorvalds@linux-foundation.org\u003e\n" }, { "commit": "d1908362ae0b97374eb8328fbb471576332f9fb1", "tree": "db8ba2a4de2e9ac61b8e94fc03a76ddbd24d321f", "parents": [ "eba93fcc34d6c4387ce8fbb53bb7b685f91f3343" ], "author": { "name": "Minchan Kim", "email": "minchan.kim@gmail.com", "time": "Wed Sep 22 13:05:01 2010 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Wed Sep 22 17:22:39 2010 -0700" }, "message": "vmscan: check all_unreclaimable in direct reclaim path\n\nM. Vefa Bicakci reported 2.6.35 kernel hang up when hibernation on his\n32bit 3GB mem machine.\n(https://bugzilla.kernel.org/show_bug.cgi?id\u003d16771). Also he bisected\nthe regression to\n\n commit bb21c7ce18eff8e6e7877ca1d06c6db719376e3c\n Author: KOSAKI Motohiro \u003ckosaki.motohiro@jp.fujitsu.com\u003e\n Date: Fri Jun 4 14:15:05 2010 -0700\n\n vmscan: fix do_try_to_free_pages() return value when priority\u003d\u003d0 reclaim failure\n\nAt first impression, this seemed very strange because the above commit\nonly chenged function return value and hibernate_preallocate_memory()\nignore return value of shrink_all_memory(). But it\u0027s related.\n\nNow, page allocation from hibernation code may enter infinite loop if the\nsystem has highmem. The reasons are that vmscan don\u0027t care enough OOM\ncase when oom_killer_disabled.\n\nThe problem sequence is following as.\n\n1. hibernation\n2. oom_disable\n3. alloc_pages\n4. do_try_to_free_pages\n if (scanning_global_lru(sc) \u0026\u0026 !all_unreclaimable)\n return 1;\n\nIf kswapd is not freozen, it would set zone-\u003eall_unreclaimable to 1 and\nthen shrink_zones maybe return true(ie, all_unreclaimable is true). So at\nlast, alloc_pages could go to _nopage_. If it is, it should have no\nproblem.\n\nThis patch adds all_unreclaimable check to protect in direct reclaim path,\ntoo. It can care of hibernation OOM case and help bailout\nall_unreclaimable case slightly.\n\nSigned-off-by: KOSAKI Motohiro \u003ckosaki.motohiro@jp.fujitsu.com\u003e\nSigned-off-by: Minchan Kim \u003cminchan.kim@gmail.com\u003e\nReported-by: M. Vefa Bicakci \u003cbicave@superonline.com\u003e\nReported-by: \u003ccaiqian@redhat.com\u003e\nReviewed-by: Johannes Weiner \u003channes@cmpxchg.org\u003e\nTested-by: \u003ccaiqian@redhat.com\u003e\nAcked-by: Rafael J. Wysocki \u003crjw@sisk.pl\u003e\nAcked-by: Rik van Riel \u003criel@redhat.com\u003e\nAcked-by: KAMEZAWA Hiroyuki \u003ckamezawa.hiroyu@jp.fujitsu.com\u003e\nCc: Balbir Singh \u003cbalbir@in.ibm.com\u003e\nCc: \u003cstable@kernel.org\u003e\nSigned-off-by: Andrew Morton \u003cakpm@linux-foundation.org\u003e\nSigned-off-by: Linus Torvalds \u003ctorvalds@linux-foundation.org\u003e\n" }, { "commit": "eba93fcc34d6c4387ce8fbb53bb7b685f91f3343", "tree": "20c38a19d44c8b8efe19555534481a9526ea2fb7", "parents": [ "f5665518c20c01e9045314872878f5788cb3fff2" ], "author": { "name": "Axel Lin", "email": "axel.lin@gmail.com", "time": "Wed Sep 22 13:04:59 2010 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Wed Sep 22 17:22:39 2010 -0700" }, "message": "drivers/rtc/rtc-ab3100.c: add missing platform_set_drvdata() in ab3100_rtc_probe()\n\nOtherwise, calling platform_get_drvdata() in ab3100_rtc_remove() returns\nNULL.\n\nSigned-off-by: Axel Lin \u003caxel.lin@gmail.com\u003e\nAcked-by:Wan ZongShun \u003cmcuos.com@gmail.com\u003e\nAcked-by: Linus Walleij \u003clinus.walleij@stericsson.com\u003e\nCc: Alessandro Zummo \u003ca.zummo@towertech.it\u003e\nSigned-off-by: Andrew Morton \u003cakpm@linux-foundation.org\u003e\nSigned-off-by: Linus Torvalds \u003ctorvalds@linux-foundation.org\u003e\n" }, { "commit": "f5665518c20c01e9045314872878f5788cb3fff2", "tree": "139f308e17cf8b361c03f04fb415c189a508748f", "parents": [ "d544b7a40ad3423676b8876aad64fc5f87296b2d" ], "author": { "name": "Hans-Christian Egtvedt", "email": "hans-christian.egtvedt@atmel.com", "time": "Wed Sep 22 13:04:58 2010 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Wed Sep 22 17:22:38 2010 -0700" }, "message": "MAINTAINERS: change AVR32 and AT32AP maintainer\n\nAlter the maintainer of the AVR32 architecture and the AVR32/AT32AP\nmachine support to me. Haavard is moving on to new challenges, and we\u0027ve\nfound it better to transfer the maintainer part to me. I will have good\ncontact with Haavard anyway.\n\nSigned-off-by: Hans-Christian Egtvedt \u003chans-christian.egtvedt@atmel.com\u003e\nAcked-by: Haavard Skinnemoen \u003chaavard.skinnemoen@atmel.com\u003e\nSigned-off-by: Andrew Morton \u003cakpm@linux-foundation.org\u003e\nSigned-off-by: Linus Torvalds \u003ctorvalds@linux-foundation.org\u003e\n" }, { "commit": "d544b7a40ad3423676b8876aad64fc5f87296b2d", "tree": "f08302b1ce132a71aa8702841846a94ef8e999f3", "parents": [ "710224fa2750cf449c02dd115548acebfdd2c86a" ], "author": { "name": "Dmitry Torokhov", "email": "dtor@vmware.com", "time": "Wed Sep 22 13:04:57 2010 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Wed Sep 22 17:22:38 2010 -0700" }, "message": "vmware balloon: rename module\n\nIn an effort to minimize customer confusion we want to unify naming\nconvention for VMware-provided kernel modules. This change renames the\nballoon driver from vmware_ballon to vmw_balloon.\n\nWe expect to follow this naming convention (vmw_\u003cmodule_name\u003e) for all\nmodules that are part of mainline kernel and/or being distributed by\nVMware, with the sole exception of vmxnet3 driver (since the name of\nmainline driver happens to match with the name used in VMware Tools).\n\nSigned-off-by: Dmitry Torokhov \u003cdtor@vmware.com\u003e\nAcked-by: Bhavesh Davda \u003cbhavesh@vmware.com\u003e\nSigned-off-by: Andrew Morton \u003cakpm@linux-foundation.org\u003e\nSigned-off-by: Linus Torvalds \u003ctorvalds@linux-foundation.org\u003e\n" }, { "commit": "710224fa2750cf449c02dd115548acebfdd2c86a", "tree": "3caa498384daec3b2e40adb4a89d7f854f2adb7c", "parents": [ "c227e69028473c7c7994a9b0a2cc0034f3f7e0fe" ], "author": { "name": "FUJITA Tomonori", "email": "fujita.tomonori@lab.ntt.co.jp", "time": "Wed Sep 22 13:04:55 2010 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Wed Sep 22 17:22:38 2010 -0700" }, "message": "arm: fix \"arm: fix pci_set_consistent_dma_mask for dmabounce devices\"\n\nThis fixes the regression caused by the commit 6fee48cd330c68\n(\"dma-mapping: arm: use generic pci_set_dma_mask and\npci_set_consistent_dma_mask\").\n\nARM needs to clip the dma coherent mask for dmabounce devices. This\nrestores the old trick.\n\nNote that strictly speaking, the DMA API doesn\u0027t allow architectures to do\nsuch but I\u0027m not sure it\u0027s worth adding the new API to set the dma mask\nthat allows architectures to clip it.\n\nReported-by: Krzysztof Halasa \u003ckhc@pm.waw.pl\u003e\nSigned-off-by: FUJITA Tomonori \u003cfujita.tomonori@lab.ntt.co.jp\u003e\nAcked-by: Russell King \u003crmk+kernel@arm.linux.org.uk\u003e\nSigned-off-by: Andrew Morton \u003cakpm@linux-foundation.org\u003e\nSigned-off-by: Linus Torvalds \u003ctorvalds@linux-foundation.org\u003e\n" }, { "commit": "c227e69028473c7c7994a9b0a2cc0034f3f7e0fe", "tree": "e11e51f5eec4c2c82a8ef7839de74407f470176c", "parents": [ "a9e31765e7d528858e1b0c202b823cf4df7577ca" ], "author": { "name": "Arnd Bergmann", "email": "arnd@arndb.de", "time": "Wed Sep 22 13:04:54 2010 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Wed Sep 22 17:22:38 2010 -0700" }, "message": "/proc/vmcore: fix seeking\n\nCommit 73296bc611 (\"procfs: Use generic_file_llseek in /proc/vmcore\")\nbroke seeking on /proc/vmcore. This changes it back to use default_llseek\nin order to restore the original behaviour.\n\nThe problem with generic_file_llseek is that it only allows seeks up to\ninode-\u003ei_sb-\u003es_maxbytes, which is zero on procfs and some other virtual\nfile systems. We should merge generic_file_llseek and default_llseek some\nday and clean this up in a proper way, but for 2.6.35/36, reverting vmcore\nis the safer solution.\n\nSigned-off-by: Arnd Bergmann \u003carnd@arndb.de\u003e\nCc: Frederic Weisbecker \u003cfweisbec@gmail.com\u003e\nReported-by: CAI Qian \u003ccaiqian@redhat.com\u003e\nTested-by: CAI Qian \u003ccaiqian@redhat.com\u003e\nCc: \u003cstable@kernel.org\u003e\nSigned-off-by: Andrew Morton \u003cakpm@linux-foundation.org\u003e\nSigned-off-by: Linus Torvalds \u003ctorvalds@linux-foundation.org\u003e\n" }, { "commit": "a9e31765e7d528858e1b0c202b823cf4df7577ca", "tree": "fa5da504a780ee8447d6aaf2c5701dcff3ed4f4f", "parents": [ "f19e8aa11afa24036c6273428da51949b5acf30c" ], "author": { "name": "Yinghai Lu", "email": "yinghai@kernel.org", "time": "Wed Sep 22 13:04:53 2010 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Wed Sep 22 17:22:38 2010 -0700" }, "message": "ipmi: fix acpi probe print\n\nAfter d9e1b6c45059ccf (\"ipmi: fix ACPI detection with regspacing\") we get\n\n[ 11.026326] ipmi_si: probing via ACPI\n[ 11.030019] ipmi_si 00:09: (null) regsize 1 spacing 1 irq 0\n[ 11.035594] ipmi_si: Adding ACPI-specified kcs state machine\n\non an old system with only one range for ipmi kcs range.\n\nTry to fix it by adding another res pointer.\n\nSigned-off-by: Yinghai Lu \u003cyinghai@kernel.org\u003e\nSigned-off-by: Corey Minyard \u003ccminyard@mvista.com\u003e\nSigned-off-by: Andrew Morton \u003cakpm@linux-foundation.org\u003e\nSigned-off-by: Linus Torvalds \u003ctorvalds@linux-foundation.org\u003e\n" }, { "commit": "f19e8aa11afa24036c6273428da51949b5acf30c", "tree": "e768541c3b83ffe488119f77ef178cdf97f9bece", "parents": [ "767b68e96993e29e3480d7ecdd9c4b84667c5762" ], "author": { "name": "David Rientjes", "email": "rientjes@google.com", "time": "Wed Sep 22 13:04:52 2010 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Wed Sep 22 17:22:38 2010 -0700" }, "message": "oom: always return a badness score of non-zero for eligible tasks\n\nA task\u0027s badness score is roughly a proportion of its rss and swap\ncompared to the system\u0027s capacity. The scale ranges from 0 to 1000 with\nthe highest score chosen for kill. Thus, this scale operates on a\nresolution of 0.1% of RAM + swap. Admin tasks are also given a 3% bonus,\nso the badness score of an admin task using 3% of memory, for example,\nwould still be 0.\n\nIt\u0027s possible that an exceptionally large number of tasks will combine to\nexhaust all resources but never have a single task that uses more than\n0.1% of RAM and swap (or 3.0% for admin tasks).\n\nThis patch ensures that the badness score of any eligible task is never 0\nso the machine doesn\u0027t unnecessarily panic because it cannot find a task\nto kill.\n\nSigned-off-by: David Rientjes \u003crientjes@google.com\u003e\nCc: Dave Hansen \u003cdave@linux.vnet.ibm.com\u003e\nCc: Nitin Gupta \u003cngupta@vflare.org\u003e\nCc: Pekka Enberg \u003cpenberg@cs.helsinki.fi\u003e\nCc: Minchan Kim \u003cminchan.kim@gmail.com\u003e\nCc: KAMEZAWA Hiroyuki \u003ckamezawa.hiroyu@jp.fujitsu.com\u003e\nCc: KOSAKI Motohiro \u003ckosaki.motohiro@jp.fujitsu.com\u003e\nSigned-off-by: Andrew Morton \u003cakpm@linux-foundation.org\u003e\nSigned-off-by: Linus Torvalds \u003ctorvalds@linux-foundation.org\u003e\n" } ], "next": "767b68e96993e29e3480d7ecdd9c4b84667c5762" }