)]}' { "log": [ { "commit": "eb544433c368ad95615af168bfb2fedfc5e9ddb1", "tree": "d5a7916b8f3fe569781915320f1dd53df9b548c7", "parents": [ "7fc8878c3398a71c39e23ae1d9d56ba1f9e8c97d" ], "author": { "name": "Alex Deucher", "email": "alexdeucher@gmail.com", "time": "Tue Jul 27 18:57:06 2010 -0400" }, "committer": { "name": "Dave Airlie", "email": "airlied@redhat.com", "time": "Mon Aug 02 10:06:55 2010 +1000" }, "message": "drm/radeon: group r6xx/r7xx sequential blit state\n\ngroup state that is emitted sequentially into fewer packets.\nThis saves a number of dwords.\n\nSigned-off-by: Alex Deucher \u003calexdeucher@gmail.com\u003e\nSigned-off-by: Dave Airlie \u003cairlied@redhat.com\u003e\n" }, { "commit": "7fc8878c3398a71c39e23ae1d9d56ba1f9e8c97d", "tree": "11176ad73c44be08e643949cef76927e3d657715", "parents": [ "8c119e9c3b85cb61c1b2bfd616061662367e9240" ], "author": { "name": "Alex Deucher", "email": "alexdeucher@gmail.com", "time": "Tue Jul 27 11:11:19 2010 -0400" }, "committer": { "name": "Dave Airlie", "email": "airlied@redhat.com", "time": "Mon Aug 02 10:06:44 2010 +1000" }, "message": "drm/radeon: remove duplicate state emit in r6xx/r7xx blit\n\nSigned-off-by: Alex Deucher \u003calexdeucher@gmail.com\u003e\nSigned-off-by: Dave Airlie \u003cairlied@redhat.com\u003e\n" }, { "commit": "8c119e9c3b85cb61c1b2bfd616061662367e9240", "tree": "1400bd359b917804c10bed6ec23a86fd2f13ab23", "parents": [ "812d046915f48236657f02c06d7dc47140e9ceda" ], "author": { "name": "Alex Deucher", "email": "alexdeucher@gmail.com", "time": "Mon Jul 26 12:39:00 2010 -0400" }, "committer": { "name": "Dave Airlie", "email": "airlied@redhat.com", "time": "Mon Aug 02 10:06:32 2010 +1000" }, "message": "drm/radeon: add comments to r6xx/r7xx blit state\n\nSigned-off-by: Alex Deucher \u003calexdeucher@gmail.com\u003e\nSigned-off-by: Dave Airlie \u003cairlied@redhat.com\u003e\n" }, { "commit": "812d046915f48236657f02c06d7dc47140e9ceda", "tree": "77a9c724a2316593fa22f7442d5c4a8d00c9af32", "parents": [ "833ee5c4ab36937a99e63935d7f06bc2c1f9343b" ], "author": { "name": "Alex Deucher", "email": "alexdeucher@gmail.com", "time": "Mon Jul 26 18:51:53 2010 -0400" }, "committer": { "name": "Dave Airlie", "email": "airlied@redhat.com", "time": "Mon Aug 02 10:06:18 2010 +1000" }, "message": "drm/radeon/kms/r7xx: add workaround for hw issue with HDP flush\n\nUse of HDP_*_COHERENCY_FLUSH_CNTL can cause a hang in certain\nsituations. Add workaround.\n\nSigned-off-by: Alex Deucher \u003calexdeucher@gmail.com\u003e\nCc: stable@kernel.org\nSigned-off-by: Dave Airlie \u003cairlied@redhat.com\u003e\n" }, { "commit": "833ee5c4ab36937a99e63935d7f06bc2c1f9343b", "tree": "3d5482a680bdcabd7e375f43053217fa3a6b685d", "parents": [ "d656ae53f64cb0f01dac8a02c4d31453d64ef97c" ], "author": { "name": "Alex Deucher", "email": "alexdeucher@gmail.com", "time": "Fri Jul 16 10:39:16 2010 -0400" }, "committer": { "name": "Dave Airlie", "email": "airlied@redhat.com", "time": "Mon Aug 02 10:06:01 2010 +1000" }, "message": "drm/radeon/kms: remove rs4xx gart limit\n\nWe used to limit the rs4xx gart aperture to 32 MB, but I suspect\nthat was due to not meeting the alignment requirements of the\naperture. This patch should only be applied after:\n\"drm/radeon/kms: fix gtt MC base alignment on rs4xx/rs690/rs740 asics\"\nhas been applied.\n\nThis patch should probably soak for a bit in d-r-t.\n\nSigned-off-by: Alex Deucher \u003calexdeucher@gmail.com\u003e\nSigned-off-by: Dave Airlie \u003cairlied@redhat.com\u003e\n" }, { "commit": "d656ae53f64cb0f01dac8a02c4d31453d64ef97c", "tree": "cf641d4e5828b8f7c430b42657237c5daf9571fd", "parents": [ "167ffc44caaee68ea60dadf6931a4d195a4ed1f0", "b37fa16e78d6f9790462b3181602a26b5af36260" ], "author": { "name": "Dave Airlie", "email": "airlied@redhat.com", "time": "Mon Aug 02 10:05:18 2010 +1000" }, "committer": { "name": "Dave Airlie", "email": "airlied@redhat.com", "time": "Mon Aug 02 10:05:24 2010 +1000" }, "message": "Merge tag \u0027v2.6.35-rc6\u0027 into drm-radeon-next\n\nNeed this to avoid conflicts with future radeon fixes\n" }, { "commit": "167ffc44caaee68ea60dadf6931a4d195a4ed1f0", "tree": "26f3450e0e7ebe2efa524c52bef6c002688190c8", "parents": [ "4c712e6c7ef19e7e8e1f38b27bb65290def39b40" ], "author": { "name": "Dan Carpenter", "email": "error27@gmail.com", "time": "Sat Jul 17 12:28:02 2010 +0200" }, "committer": { "name": "Dave Airlie", "email": "airlied@redhat.com", "time": "Mon Aug 02 10:00:10 2010 +1000" }, "message": "drm: radeon: fix sign bug\n\nThe \"error\" variable is unsigned so it\u0027s never less than zero. I\nchanged it to check if (freq \u003c current_freq) directly.\n\n\"best_error\" is also unsigned so \"best_error - 100\" could be a large\nnumber instead of a negative. Since \"error\" is unsigned it is never\nless than a negative and so the cases where \"best_error\" is less than or\nequal to 100 are false.\n\nSigned-off-by: Dan Carpenter \u003cerror27@gmail.com\u003e\nReviewed-by: Alex Deucher \u003calexdeucher@gmail.com\u003e\nSigned-off-by: Dave Airlie \u003cairlied@redhat.com\u003e\n" }, { "commit": "4c712e6c7ef19e7e8e1f38b27bb65290def39b40", "tree": "c2f5d3663f849f445ff1154762188904e0633c2d", "parents": [ "e376573f7267390f4e1bdc552564b6fb913bce76" ], "author": { "name": "Dave Airlie", "email": "airlied@redhat.com", "time": "Thu Jul 15 12:13:50 2010 +1000" }, "committer": { "name": "Dave Airlie", "email": "airlied@redhat.com", "time": "Mon Aug 02 10:00:09 2010 +1000" }, "message": "drm/radeon/kms: check/restore sanity before doing anything else with GPU.\n\nOn systems using kexec, the new kernel is booted straight from the old kernel, without any warning to the graphics driver. So the GPU is basically left as-is in a running state, however the CPU side is completly reset.\n\nWithout stating the saneness of anyone using kexec on live systems, we should at least try not to crash the GPU. This patch resets 3 registers to 0 that could cause bad things to happen to the running system.\n\nThis allows kexec to work on a Power6/RN50 system.\n\nSigned-off-by: Dave Airlie \u003cairlied@redhat.com\u003e\n" }, { "commit": "e376573f7267390f4e1bdc552564b6fb913bce76", "tree": "2ce33e85ac5ca32c03006dd81a2f6fec52b0227f", "parents": [ "351a52a2414d2b104269755c86b476863c248034" ], "author": { "name": "Michel Dänzer", "email": "daenzer@vmware.com", "time": "Thu Jul 08 12:43:28 2010 +1000" }, "committer": { "name": "Dave Airlie", "email": "airlied@redhat.com", "time": "Mon Aug 02 10:00:08 2010 +1000" }, "message": "drm/radeon: fall back to GTT if bo creation/validation in VRAM fails.\n\nThis fixes a problem where on low VRAM cards we\u0027d run out of space for validation.\n\n[airlied: Tested on my M7, Thinkpad T42, compiz works with no problems.]\n\nSigned-off-by: Michel Dänzer \u003cdaenzer@vmware.com\u003e\nCc: stable@kernel.org\nSigned-off-by: Dave Airlie \u003cairlied@redhat.com\u003e\n" }, { "commit": "351a52a2414d2b104269755c86b476863c248034", "tree": "71e25c5cceab9235e5bca4a8d521f73b3adf3fa6", "parents": [ "fe50ac78a6ec20db267b32e27a1d191128eaaa46" ], "author": { "name": "Alex Deucher", "email": "alexdeucher@gmail.com", "time": "Wed Jun 30 11:52:50 2010 -0400" }, "committer": { "name": "Dave Airlie", "email": "airlied@redhat.com", "time": "Mon Aug 02 10:00:07 2010 +1000" }, "message": "drm/radeon/kms: add ioport register access\n\nThis is required for the NB_MISC regs on rs780/rs880 which\nmeans HDMI/DVI/DP ports using PCIEPHY won\u0027t work without\nit. It might also help with s/r (asic init) issues on other\natombios cards.\n\nFixes:\nhttps://bugs.freedesktop.org/show_bug.cgi?id\u003d28774\nand similar issues reported by Alberto Milone.\n\n[airlied: Squash io fix patch]\n\nSigned-off-by: Alex Deucher \u003calexdeucher@gmail.com\u003e\nTested-by: Rafał Miłecki \u003czajec5@gmail.com\u003e\nSigned-off-by: Dave Airlie \u003cairlied@redhat.com\u003e\n" }, { "commit": "fe50ac78a6ec20db267b32e27a1d191128eaaa46", "tree": "3111d2e26613e691e3ab534dcd84d098be897925", "parents": [ "7eea7e9eea106a9c49cddf780f590dd8161481fa" ], "author": { "name": "Rafał Miłecki", "email": "zajec5@gmail.com", "time": "Sat Jun 19 12:24:57 2010 +0200" }, "committer": { "name": "Dave Airlie", "email": "airlied@redhat.com", "time": "Mon Aug 02 10:00:06 2010 +1000" }, "message": "drm/radeon/kms: enable HDMI audio on RS600/RS690/RS740\n\nWe will need method of selecting encoder that should receive HDMI block. For\nnow we assign HDMI block to first enabled encoder. Hopefully there are not many\nRS6x0 chips with two digital encoders.\n\n[airlied: add RS740 checks as per Alex suggestion.]\n\nSigned-off-by: Rafał Miłecki \u003czajec5@gmail.com\u003e\nSigned-off-by: Dave Airlie \u003cairlied@redhat.com\u003e\n" }, { "commit": "7eea7e9eea106a9c49cddf780f590dd8161481fa", "tree": "84a31f2fd452ee22ab0cdcbee1c5fb77896408cd", "parents": [ "e7aeeba6a8fb86ac52bcffa0b72942f784f2b37f" ], "author": { "name": "Rafał Miłecki", "email": "zajec5@gmail.com", "time": "Sat Jun 19 12:24:56 2010 +0200" }, "committer": { "name": "Dave Airlie", "email": "airlied@redhat.com", "time": "Mon Aug 02 10:00:06 2010 +1000" }, "message": "drm/radeon/kms: track audio engine state, do not use not setup timer\n\nThis is needed to enable audio support on devices using polling. In case user\ndecides to disable audio (module parameter) we still will try to use timer in\nr600_audio_enable_polling. This would lead to BUG in kernel/timer.c.\n\nSigned-off-by: Rafał Miłecki \u003czajec5@gmail.com\u003e\nSigned-off-by: Dave Airlie \u003cairlied@redhat.com\u003e\n" }, { "commit": "e7aeeba6a8fb86ac52bcffa0b72942f784f2b37f", "tree": "889d8196e31ec490beba8b801236d7734e8d36bb", "parents": [ "40e2a5c15d09e02a71711735564151c789f95032" ], "author": { "name": "Alex Deucher", "email": "alexdeucher@gmail.com", "time": "Fri Jun 04 13:10:12 2010 -0400" }, "committer": { "name": "Dave Airlie", "email": "airlied@redhat.com", "time": "Mon Aug 02 10:00:05 2010 +1000" }, "message": "drm/radeon/kms/r6xx+: add query for tile config (v2)\n\nUserspace needs this information to access tiled\nbuffers via the CPU.\n\nv2: rebased on evergreen accel changes\n\nSigned-off-by: Alex Deucher \u003calexdeucher@gmail.com\u003e\nSigned-off-by: Dave Airlie \u003cairlied@redhat.com\u003e\n" }, { "commit": "40e2a5c15d09e02a71711735564151c789f95032", "tree": "063600a6ea716a4dfde436bed8e34b3b99675ccb", "parents": [ "7f813377203a60be01a3354664edc5d3c746100d" ], "author": { "name": "Alex Deucher", "email": "alexdeucher@gmail.com", "time": "Fri Jun 04 18:41:42 2010 -0400" }, "committer": { "name": "Dave Airlie", "email": "airlied@redhat.com", "time": "Mon Aug 02 10:00:04 2010 +1000" }, "message": "drm/radeon/kms: fix CS alignment checking for tiling (v2)\n\nCovers depth, cb, and textures. Hopefully I got this right.\n\nv2: - fix bugs:\n https://bugs.freedesktop.org/show_bug.cgi?id\u003d28327\n https://bugs.freedesktop.org/show_bug.cgi?id\u003d28381\n - use ALIGNED(), IS_ALIGNED() macros\n\nSigned-off-by: Alex Deucher \u003calexdeucher@gmail.com\u003e\nSigned-off-by: Dave Airlie \u003cairlied@redhat.com\u003e\n" }, { "commit": "7f813377203a60be01a3354664edc5d3c746100d", "tree": "22261aa7bc82a6b2e6f183cbda66ff79e7277fe6", "parents": [ "97d663285322b3db05613d274b1eb3f9806f37ca" ], "author": { "name": "Alex Deucher", "email": "alexdeucher@gmail.com", "time": "Thu May 20 12:43:52 2010 -0400" }, "committer": { "name": "Dave Airlie", "email": "airlied@redhat.com", "time": "Mon Aug 02 10:00:03 2010 +1000" }, "message": "drm/radeon/kms: add tiling support to the cs checker for r6xx/r7xx\n\nCheck for relocs for DB_DEPTH_INFO, CB_COLOR*_INFO, and texture\nresources.\n\nSigned-off-by: Alex Deucher \u003calexdeucher@gmail.com\u003e\nSigned-off-by: Dave Airlie \u003cairlied@redhat.com\u003e\n" }, { "commit": "97d663285322b3db05613d274b1eb3f9806f37ca", "tree": "dc4b868f16d0f1933b7c80b54eec000f50f45e7f", "parents": [ "40c4ac1c1931eb48ca0cf5e9ec464d13c5921994" ], "author": { "name": "Alex Deucher", "email": "alexdeucher@gmail.com", "time": "Thu May 20 12:12:48 2010 -0400" }, "committer": { "name": "Dave Airlie", "email": "airlied@redhat.com", "time": "Mon Aug 02 10:00:02 2010 +1000" }, "message": "drm/radeon/kms: Add crtc tiling setup support for evergreen\n\nNeeded for scanning out of a tiled buffer.\n\nSigned-off-by: Alex Deucher \u003calexdeucher@gmail.com\u003e\nSigned-off-by: Dave Airlie \u003cairlied@redhat.com\u003e\n" }, { "commit": "40c4ac1c1931eb48ca0cf5e9ec464d13c5921994", "tree": "f83bf40236519c2eef1fbefb561575aa62845384", "parents": [ "21a8122ad38c60d73fe5dc51051414c3564d174a" ], "author": { "name": "Alex Deucher", "email": "alexdeucher@gmail.com", "time": "Thu May 20 12:04:59 2010 -0400" }, "committer": { "name": "Dave Airlie", "email": "airlied@redhat.com", "time": "Mon Aug 02 10:00:01 2010 +1000" }, "message": "drm/radeon/kms: Add crtc tiling setup support for r6xx/r7xx\n\nNeeded for scanning out of a tiled buffer.\n\nSigned-off-by: Alex Deucher \u003calexdeucher@gmail.com\u003e\nSigned-off-by: Dave Airlie \u003cairlied@redhat.com\u003e\n" }, { "commit": "21a8122ad38c60d73fe5dc51051414c3564d174a", "tree": "b20f2bb711e3230fdc3195042c901596de4677e2", "parents": [ "d7a2952f1adec32018a78ec0c2f504dd72f38e25" ], "author": { "name": "Alex Deucher", "email": "alexdeucher@gmail.com", "time": "Fri Jul 02 12:58:16 2010 -0400" }, "committer": { "name": "Dave Airlie", "email": "airlied@redhat.com", "time": "Mon Aug 02 10:00:00 2010 +1000" }, "message": "drm/radeon/kms: add support for internal thermal sensors (v3)\n\nrv6xx/rv7xx/evergreen families supported; older asics did\nnot have an internal thermal sensor.\n\nNote, not all oems use the internal thermal sensor, so it\u0027s\nonly exposed in cases where it is used.\n\nNote also, that most laptops use an oem specific ACPI solution for\nGPU thermal information rather than using the internal thermal\nsensor directly.\n\nv2: export millidegrees celsius, use hwmon device properly.\nv3: fix Kconfig\n\nSigned-off-by: Alex Deucher \u003calexdeucher@gmail.com\u003e\nSigned-off-by: Dave Airlie \u003cairlied@redhat.com\u003e\n" }, { "commit": "d7a2952f1adec32018a78ec0c2f504dd72f38e25", "tree": "76569f749fceb961bb1fe36d8bbcf0c1518689d2", "parents": [ "9bd7ef5f5a5ab6088029ad95a435f03e1314275d" ], "author": { "name": "Alberto Milone", "email": "alberto.milone@canonical.com", "time": "Tue Jul 06 11:40:24 2010 -0400" }, "committer": { "name": "Dave Airlie", "email": "airlied@redhat.com", "time": "Mon Aug 02 09:59:59 2010 +1000" }, "message": "drm/radeon: Add support for the ATIF ACPI method to the radeon driver\n\nBy calling the ATIF method in the radeon driver we can make sure\nthat hotkeys such as the video switch key emit ACPI events when\npressed.\n\nagd5f: fix warning\n\nSigned-off-by: Alberto Milone \u003calberto.milone@canonical.com\u003e\nSigned-off-by: Alex Deucher \u003calexdeucher@gmail.com\u003e\nSigned-off-by: Dave Airlie \u003cairlied@redhat.com\u003e\n" }, { "commit": "9bd7ef5f5a5ab6088029ad95a435f03e1314275d", "tree": "f10d82763da6ac37edcb49f848475539858378f8", "parents": [ "4ce9198ecf73739104b274c7c6377ef3659b3ca5" ], "author": { "name": "Alex Deucher", "email": "alexdeucher@gmail.com", "time": "Wed Jun 30 14:58:59 2010 -0400" }, "committer": { "name": "Dave Airlie", "email": "airlied@redhat.com", "time": "Mon Aug 02 09:59:58 2010 +1000" }, "message": "drm/radeon/kms/atom: bump atom loop timeout from 1 sec to 5 secs\n\nSome tables have delays that can cause the timeout to hit\neven when not intended.\n\nShould fix:\nhttps://bugs.freedesktop.org/show_bug.cgi?id\u003d27744\nand related bugs.\n\nSigned-off-by: Alex Deucher \u003calexdeucher@gmail.com\u003e\nSigned-off-by: Dave Airlie \u003cairlied@redhat.com\u003e\n" }, { "commit": "4ce9198ecf73739104b274c7c6377ef3659b3ca5", "tree": "aca62519a52541a8eb19d715d15390b0f4e1e67d", "parents": [ "37f9003bd355d9109769fff66f7f228aab42155b" ], "author": { "name": "Alex Deucher", "email": "alexdeucher@gmail.com", "time": "Wed Jun 30 12:13:55 2010 -0400" }, "committer": { "name": "Dave Airlie", "email": "airlied@redhat.com", "time": "Mon Aug 02 09:59:57 2010 +1000" }, "message": "drm/radeon/kms: minor driver cleanups\n\n- Make the logic in r100_pll_errata_after_index() match the other\nerrata functions\n- Use rdev-\u003efamily rather than rdev-\u003eflags \u0026 RADEON_FAMILY_MASK for kms\n- replace rn50 check using ids with ASIC_IS_RN50 convenience macro\n\nSigned-off-by: Alex Deucher \u003calexdeucher@gmail.com\u003e\nSigned-off-by: Dave Airlie \u003cairlied@redhat.com\u003e\n" }, { "commit": "27efd7e2e6d052e543425dba172d96f42704ef65", "tree": "b3c4bbb867b194750586cacff26c8455051ea259", "parents": [ "84d4db0e22965334ae8272f324d31fb4657465aa", "3619b8fead04ab9de643712e757ef6b5f79fd1ab" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Thu Jul 22 11:46:15 2010 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Thu Jul 22 11:46:15 2010 -0700" }, "message": "Merge branch \u0027for-linus\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/dtor/input\n\n* \u0027for-linus\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/dtor/input:\n Input: synaptics - relax capability ID checks on newer hardware\n Input: twl40300-keypad - fix handling of \"all ground\" rows\n Input: gamecon - reference correct pad in gc_psx_command()\n Input: gamecon - reference correct input device in NES mode\n Input: w90p910_keypad - change platfrom driver name to \u0027nuc900-kpi\u0027\n Input: i8042 - add Gigabyte Spring Peak to dmi_noloop_table\n Input: qt2160 - rename kconfig symbol name\n" }, { "commit": "84d4db0e22965334ae8272f324d31fb4657465aa", "tree": "b20a90bc599a275c898b87aa855904e93090d863", "parents": [ "38ea6e62d3e59f7e03c6c96301d1cedaab15ce3f", "52fa2bbc8ec46255039e2048d616bbd0852ee292" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Thu Jul 22 11:45:57 2010 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Thu Jul 22 11:45:57 2010 -0700" }, "message": "Merge branch \u0027drm-fixes\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/airlied/drm-2.6\n\n* \u0027drm-fixes\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/airlied/drm-2.6:\n drm/radeon/kms: add quirk to make HP DV5000 laptop resume\n drm/radeon/kms: fix RADEON_INFO_CRTC_FROM_ID info ioctl\n Fix ttm_page_alloc.c build breakage\n drm/radeon/kms: fix legacy LVDS dpms sequence\n drm/radeon/kms: drop taking lock around crtc lookup.\n" }, { "commit": "38ea6e62d3e59f7e03c6c96301d1cedaab15ce3f", "tree": "86bec12c7bb0d6bed4827988eca39e796bb2eae3", "parents": [ "2851785deb1b9c745a3fabc7e395c966878509b9", "7260042b2d0397e7a8735ca47cd7839a5bb1210b" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Thu Jul 22 11:45:23 2010 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Thu Jul 22 11:45:23 2010 -0700" }, "message": "Merge git://git.kernel.org/pub/scm/linux/kernel/git/herbert/crypto-2.6\n\n* git://git.kernel.org/pub/scm/linux/kernel/git/herbert/crypto-2.6:\n crypto: talitos - fix bug in sg_copy_end_to_buffer\n" }, { "commit": "e916beab22e00d95345bfa4f48981f2c88885f61", "tree": "8a50022d6ad51fe3d328f6987adf61a210fd3b08", "parents": [ "4c0c03ca54f72fdd5912516ad0a23ec5cf01bda7", "edd63cb6b91024332d6983fc51058ac1ef0c081e" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Thu Jul 22 11:44:26 2010 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Thu Jul 22 11:44:26 2010 -0700" }, "message": "Merge branch \u0027for_linus\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/jwessel/linux-2.6-kgdb\n\n* \u0027for_linus\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/jwessel/linux-2.6-kgdb:\n sysrq,kdb: Use __handle_sysrq() for kdb\u0027s sysrq function\n debug_core,kdb: fix kgdb_connected bit set in the wrong place\n Fix merge regression from external kdb to upstream kdb\n repair gdbstub to match the gdbserial protocol specification\n kdb: break out of kdb_ll() when command is terminated\n" }, { "commit": "52fa2bbc8ec46255039e2048d616bbd0852ee292", "tree": "2b12bd7c09aef28e31a5651a677b8bc26c3eb552", "parents": [ "0baf2d8fe43fdd81faa30e65ff71785c99c78520" ], "author": { "name": "Alex Deucher", "email": "alexdeucher@gmail.com", "time": "Wed Jul 21 23:54:35 2010 -0400" }, "committer": { "name": "Dave Airlie", "email": "airlied@redhat.com", "time": "Thu Jul 22 14:13:52 2010 +1000" }, "message": "drm/radeon/kms: add quirk to make HP DV5000 laptop resume\n\nFixes:\nhttps://bugs.freedesktop.org/show_bug.cgi?id\u003d29062\n\nReported-by: Andres Cimmarusti \u003cacimmarusti@gmail.com\u003e\nSigned-off-by: Alex Deucher \u003calexdeucher@gmail.com\u003e\nSigned-off-by: Dave Airlie \u003cairlied@redhat.com\u003e\n" }, { "commit": "3619b8fead04ab9de643712e757ef6b5f79fd1ab", "tree": "8706cddaa01085ea10645f905d1e874adc652cee", "parents": [ "3fea60261e73dbf4a51130d40cafcc8465b0f2c3" ], "author": { "name": "Dmitry Torokhov", "email": "dmitry.torokhov@gmail.com", "time": "Wed Jul 21 00:01:19 2010 -0700" }, "committer": { "name": "Dmitry Torokhov", "email": "dmitry.torokhov@gmail.com", "time": "Wed Jul 21 18:39:03 2010 -0700" }, "message": "Input: synaptics - relax capability ID checks on newer hardware\n\nOlder firmwares fixed the middle byte of the Synaptics capabilities\nquery to 0x47, but starting with firmware 7.5 the middle byte\nrepresents submodel ID, sometimes also called \"dash number\".\n\nReported-and-tested-by: Miroslav Šulc \u003cfordfrog@gmail.com\u003e\nSigned-off-by: Dmitry Torokhov \u003cdtor@mail.ru\u003e\n" }, { "commit": "edd63cb6b91024332d6983fc51058ac1ef0c081e", "tree": "2df04fc5dc35899aa7d4f4c52197f7b492c16c8b", "parents": [ "b0679c63db655fa12007558e267bc0eb1d486fdb" ], "author": { "name": "Jason Wessel", "email": "jason.wessel@windriver.com", "time": "Wed Jul 21 19:27:07 2010 -0500" }, "committer": { "name": "Jason Wessel", "email": "jason.wessel@windriver.com", "time": "Wed Jul 21 19:27:07 2010 -0500" }, "message": "sysrq,kdb: Use __handle_sysrq() for kdb\u0027s sysrq function\n\nThe kdb code should not toggle the sysrq state in case an end user\nwants to try and resume the normal kernel execution.\n\nSigned-off-by: Jason Wessel \u003cjason.wessel@windriver.com\u003e\nAcked-by: Dmitry Torokhov \u003cdmitry.torokhov@gmail.com\u003e\n" }, { "commit": "0baf2d8fe43fdd81faa30e65ff71785c99c78520", "tree": "3c174354e13c523c8e549e8ec0fcec7f4f7746c7", "parents": [ "d667865114d10723f4d22cc5b7bf2c743d1f2198" ], "author": { "name": "Alex Deucher", "email": "alexdeucher@gmail.com", "time": "Wed Jul 21 14:05:35 2010 -0400" }, "committer": { "name": "Dave Airlie", "email": "airlied@redhat.com", "time": "Thu Jul 22 10:03:55 2010 +1000" }, "message": "drm/radeon/kms: fix RADEON_INFO_CRTC_FROM_ID info ioctl\n\nReturn the crtc_id, not the counter value. They are not\nnecessarily the same.\n\nCc: Jerome Glisse \u003cglisse@freedesktop.org\u003e\nSigned-off-by: Alex Deucher \u003calexdeucher@gmail.com\u003e\nSigned-off-by: Dave Airlie \u003cairlied@redhat.com\u003e\n" }, { "commit": "d667865114d10723f4d22cc5b7bf2c743d1f2198", "tree": "77f01dd34f89420e428cd2da0a10d8a974df219d", "parents": [ "15cb02c0a0338ee724bf23e31c7c410ecbffeeba" ], "author": { "name": "Luck, Tony", "email": "tony.luck@intel.com", "time": "Wed Jul 21 10:15:39 2010 -0700" }, "committer": { "name": "Dave Airlie", "email": "airlied@redhat.com", "time": "Thu Jul 22 10:02:32 2010 +1000" }, "message": "Fix ttm_page_alloc.c build breakage\n\nThe commit 1e8655f87333def92bb8215b423adc65403b08a5\n drm/ttm: Fix build on architectures without AGP\n\nlooks at TTM_HAS_AGP before it has been set in ttm_bo_driver.h\n\nMove the conditional inclusion of \u003casm/agp.h\u003e *after* we have included\nttm_bo_driver.h\n\nSigned-of-by: Tony Luck \u003ctony.luck@intel.com\u003e\nSigned-off-by: Dave Airlie \u003cairlied@redhat.com\u003e\n" }, { "commit": "15cb02c0a0338ee724bf23e31c7c410ecbffeeba", "tree": "fe230291abe7478cf59237016167a2cf922a93c3", "parents": [ "29508eb66bfacdef324d2199eeaea31e0cdfaa29" ], "author": { "name": "Alex Deucher", "email": "alexdeucher@gmail.com", "time": "Wed Jul 21 19:37:21 2010 -0400" }, "committer": { "name": "Dave Airlie", "email": "airlied@redhat.com", "time": "Thu Jul 22 10:01:40 2010 +1000" }, "message": "drm/radeon/kms: fix legacy LVDS dpms sequence\n\nAdd delay after turning off the LVDS encoder.\n\nFixes:\nhttps://bugzilla.kernel.org/show_bug.cgi?id\u003d16389\n\nTested-by: Jan Kreuzer \u003ckontrollator@gmx.de\u003e\nSigned-off-by: Alex Deucher \u003calexdeucher@gmail.com\u003e\nCc: stable@kernel.org\nSigned-off-by: Dave Airlie \u003cairlied@redhat.com\u003e\n" }, { "commit": "29508eb66bfacdef324d2199eeaea31e0cdfaa29", "tree": "8f75757c0696ad9ac0c671cc47d49524fbbae428", "parents": [ "c42750b0261274107ae85c894c088e618a3e38b9" ], "author": { "name": "Dave Airlie", "email": "airlied@redhat.com", "time": "Thu Jul 22 09:57:13 2010 +1000" }, "committer": { "name": "Dave Airlie", "email": "airlied@redhat.com", "time": "Thu Jul 22 09:57:13 2010 +1000" }, "message": "drm/radeon/kms: drop taking lock around crtc lookup.\n\nWe only add/remove crtcs at driver load, you cannot remove when\nthe GPU is running a CS packet since the fd is open, when\nGPU hotplugging on radeons actually is needed all this locking\nneeds a review and I\u0027ve started re-working kms core locking to deal\nwith this better. But for now avoid long delays in CS processing when\nhotplug detect is happening in a different thread.\n\nthis fixes a regression introduced with hotplug detection.\n\nSigned-off-by: Dave Airlie \u003cairlied@redhat.com\u003e\n" }, { "commit": "cd5b8f8755a89a57fc8c408d284b8b613f090345", "tree": "815d171db7d102c78458103da9be4949fa31e816", "parents": [ "052a1cdbfabf2d122ee4eb5ce34ae1e1d72ded09", "418c527873049a9b866aa02948931d7baad7094a" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Wed Jul 21 09:31:15 2010 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Wed Jul 21 09:31:15 2010 -0700" }, "message": "Merge branch \u0027urgent\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/brodo/pcmcia-2.6\n\n* \u0027urgent\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/brodo/pcmcia-2.6:\n pcmcia: fix \u0027driver ... did not release config properly\u0027 warning\n" }, { "commit": "052a1cdbfabf2d122ee4eb5ce34ae1e1d72ded09", "tree": "d6a770ba38583ed4bb4525bd96e50461655d2758", "parents": [ "84b37df4198f8e68a731f1d7daac3465cbbea241", "567c7b0edec0200c5c6613f07c3d3b4034fdc836" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Wed Jul 21 09:30:59 2010 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Wed Jul 21 09:30:59 2010 -0700" }, "message": "Merge branch \u0027shrinker\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/dgc/xfsdev\n\n* \u0027shrinker\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/dgc/xfsdev:\n mm: add context argument to shrinker callback to remaining shrinkers\n" }, { "commit": "95977d0ef23ee37990ce8704dfd6c61eab02a548", "tree": "d3bb7133f8f51f8e48c0c74ee28c14deb45fedbe", "parents": [ "a4ce96ac356e7024a7724ade9d18ba1bdf3c5c06", "f8324e20f8289dffc646d64366332e05eaacab25" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Wed Jul 21 09:28:50 2010 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Wed Jul 21 09:28:50 2010 -0700" }, "message": "Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/sparc-2.6\n\n* git://git.kernel.org/pub/scm/linux/kernel/git/davem/sparc-2.6:\n math-emu: correct test for downshifting fraction in _FP_FROM_INT()\n perf: Add DWARF register lookup for sparc\n MAINTAINERS: Add SBUS driver path to sparc entry.\n drivers/sbus: Remove unnecessary casts of private_data\n sparc: remove homegrown L1_CACHE_ALIGN macro\n sparc64: fix the build error due to smp_kgdb_capture_client()\n sparc64: Fix maybe_change_configuration() PCR setting.\n arch/sparc/kernel: Eliminate what looks like a NULL pointer dereference\n sparc64: Update defconfig.\n sunsu: Fix use after free in su_remove().\n sunserial: Don\u0027t call add_preferred_console() when console\u003d is specified.\n sparc32: Kill none_mask, it\u0027s bogus.\n" }, { "commit": "a4ce96ac356e7024a7724ade9d18ba1bdf3c5c06", "tree": "e7699a6b2eb0f4f9e63c1bbeeb6f1471eec80dab", "parents": [ "f4b23cc2d5dc78ef5acbc529eb1219cc41eb5b96" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Wed Jul 21 09:25:42 2010 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Wed Jul 21 09:25:42 2010 -0700" }, "message": "Fix up trivial spelling errors (\u0027taht\u0027 -\u003e \u0027that\u0027)\n\nPointed out by Lucas who found the new one in a comment in\nsetup_percpu.c. And then I fixed the others that I grepped\nfor.\n\nReported-by: Lucas \u003ccanolucas@gmail.com\u003e\nSigned-off-by: Linus Torvalds \u003ctorvalds@linux-foundation.org\u003e\n" }, { "commit": "418c527873049a9b866aa02948931d7baad7094a", "tree": "cffd9ab1400064dd342856fe2bae6153eeb96259", "parents": [ "f4b23cc2d5dc78ef5acbc529eb1219cc41eb5b96" ], "author": { "name": "Patrick McHardy", "email": "kaber@trash.net", "time": "Tue Jul 20 15:21:42 2010 -0700" }, "committer": { "name": "Dominik Brodowski", "email": "linux@dominikbrodowski.net", "time": "Wed Jul 21 13:52:36 2010 +0200" }, "message": "pcmcia: fix \u0027driver ... did not release config properly\u0027 warning\n\nUp to 2.6.34 pcmcia_release_irq() reset p_dev-\u003e_irq to 0 after releasing\nthe irq. The IRQ is now released in pcmcia_disable_device(), however\np_dev-\u003e_irq is not reset, triggering a warning in pcmcia_device_remove().\n\nSigned-off-by: Patrick McHardy \u003ckaber@trash.net\u003e\nSigned-off-by: Andrew Morton \u003cakpm@linux-foundation.org\u003e\nSigned-off-by: Dominik Brodowski \u003clinux@dominikbrodowski.net\u003e\n" }, { "commit": "567c7b0edec0200c5c6613f07c3d3b4034fdc836", "tree": "ee9724f1b9b8bed762a57877c4940074a37ce6a4", "parents": [ "f4b23cc2d5dc78ef5acbc529eb1219cc41eb5b96" ], "author": { "name": "Dave Chinner", "email": "dchinner@redhat.com", "time": "Wed Jul 21 15:33:01 2010 +1000" }, "committer": { "name": "Dave Chinner", "email": "david@fromorbit.com", "time": "Wed Jul 21 15:33:01 2010 +1000" }, "message": "mm: add context argument to shrinker callback to remaining shrinkers\n\nAdd the shrinkers missed in the first conversion of the API in\ncommit 7f8275d0d660c146de6ee3017e1e2e594c49e820 (\"mm: add context argument to\nshrinker callback\").\n\nSigned-off-by: Dave Chinner \u003cdchinner@redhat.com\u003e\n" }, { "commit": "3fea60261e73dbf4a51130d40cafcc8465b0f2c3", "tree": "65a43fefef741f049b9bd237502200960a020f9e", "parents": [ "c25f7b763cc35a249232ce612a36a811b0e263f9" ], "author": { "name": "Dmitry Torokhov", "email": "dmitry.torokhov@gmail.com", "time": "Tue Jul 20 20:25:35 2010 -0700" }, "committer": { "name": "Dmitry Torokhov", "email": "dmitry.torokhov@gmail.com", "time": "Tue Jul 20 20:29:48 2010 -0700" }, "message": "Input: twl40300-keypad - fix handling of \"all ground\" rows\n\nThe Nokia RX51 board code (arch/arm/mach-omap2/board-rx51-peripherals.c)\ndefines a key map for the matrix keypad keyboard. The hardware seems to\nuse all of the 8 rows and 8 columns of the keypad, although not all\npossible locations are used.\n\nThe TWL4030 supports keypads with at most 8 rows and 8 columns. Most keys\nare defined with a row and column number between 0 and 7, except\n\n KEY(0xff, 2, KEY_F9),\n KEY(0xff, 4, KEY_F10),\n KEY(0xff, 5, KEY_F11),\n\nwhich represent keycodes that should be emitted when entire row is\nconnected to the ground. since the driver handles this case as if we\nhad an extra column in the key matrix. Unfortunately we do not allocate\nenough space and end up owerwriting some random memory.\n\nReported-and-tested-by: Laurent Pinchart \u003claurent.pinchart@ideasonboard.com\u003e\nCc: stable@kernel.org\nSigned-off-by: Dmitry Torokhov \u003cdtor@mail.ru\u003e\n" }, { "commit": "c25f7b763cc35a249232ce612a36a811b0e263f9", "tree": "b1993a5cefad38757f26a708223285f3e6174326", "parents": [ "7b5d3312fbfbb21d2fc7de94e0db66cfdf8b0055" ], "author": { "name": "Dmitry Torokhov", "email": "dmitry.torokhov@gmail.com", "time": "Tue Jul 20 20:25:35 2010 -0700" }, "committer": { "name": "Dmitry Torokhov", "email": "dmitry.torokhov@gmail.com", "time": "Tue Jul 20 20:29:32 2010 -0700" }, "message": "Input: gamecon - reference correct pad in gc_psx_command()\n\nOtherwise we won\u0027t see any events from the gamepad.\nAddresses https://bugzilla.kernel.org/show_bug.cgi?id\u003d16408\n\nReported-and-tested-by: Eugene Yudin \u003ceugene.yudin@gmail.com\u003e\nCc: stable@kernel.org\nSigned-off-by: Dmitry Torokhov \u003cdtor@mail.ru\u003e\n" }, { "commit": "7b5d3312fbfbb21d2fc7de94e0db66cfdf8b0055", "tree": "29f2c92dea84554ab0cd73f57df2a4ca5bad476f", "parents": [ "1afaab90e8c0317170a53967064a934a77a59c16" ], "author": { "name": "Dmitry Torokhov", "email": "dmitry.torokhov@gmail.com", "time": "Tue Jul 20 20:25:35 2010 -0700" }, "committer": { "name": "Dmitry Torokhov", "email": "dmitry.torokhov@gmail.com", "time": "Tue Jul 20 20:29:11 2010 -0700" }, "message": "Input: gamecon - reference correct input device in NES mode\n\nWe moved input devices from \u0027struct gc\u0027 to individial pads (struct\ngc-pad), but gc_nes_process_packet() was still trying to use old\nones and crashing.\n\nCc: stable@kernel.org\nSigned-off-by: Dmitry Torokhov \u003cdtor@mail.ru\u003e\n" }, { "commit": "f4b23cc2d5dc78ef5acbc529eb1219cc41eb5b96", "tree": "cadf0fd7e2bcb2d2d2402fcddbda3ec9b53b2c0c", "parents": [ "e0959371b4aaddb9b986019d5cfef93f9801d0ff", "c42750b0261274107ae85c894c088e618a3e38b9" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Tue Jul 20 18:29:25 2010 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Tue Jul 20 18:29:25 2010 -0700" }, "message": "Merge branch \u0027drm-fixes\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/airlied/drm-2.6\n\n* \u0027drm-fixes\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/airlied/drm-2.6:\n drm/r600: fix possible NULL pointer derefernce\n drm/radeon/kms: add quirk for ASUS HD 3600 board\n include/linux/vgaarb.h: add missing part of include guard\n drm/nouveau: Fix crashes during fbcon init on single head cards.\n drm/nouveau: fix pcirom vbios shadow breakage from acpi rom patch\n drm/radeon/kms: fix shared ddc harder\n drm/i915: enable low power render writes on GEN3 hardware.\n drm/i915: Define MI_ARB_STATE bits\n vmwgfx: return -EFAULT if copy_to_user fails\n fb: handle allocation failure in alloc_apertures()\n drm: radeon: check kzalloc() result\n drm/ttm: Fix build on architectures without AGP\n drm/radeon/kms: fix gtt MC base alignment on rs4xx/rs690/rs740 asics\n drm/radeon/kms: fix possible mis-detection of sideport on rs690/rs740\n drm/radeon/kms: fix legacy tv-out pal mode\n" }, { "commit": "37f9003bd355d9109769fff66f7f228aab42155b", "tree": "f25cfac28c99937596a5a6fcdcaebe076a589c71", "parents": [ "90c1efdd121c84ee73e9960667229a662f2315a3" ], "author": { "name": "Alex Deucher", "email": "alexdeucher@gmail.com", "time": "Fri Jun 11 17:58:38 2010 -0400" }, "committer": { "name": "Dave Airlie", "email": "airlied@redhat.com", "time": "Wed Jul 21 11:27:21 2010 +1000" }, "message": "drm/radeon/kms/atom: add crtc disable function\n\nDisables the crts as per dpms and also disables the ppll\nassociated with the crtc. This should save additional power.\n\nSigned-off-by: Alex Deucher \u003calexdeucher@gmail.com\u003e\nSigned-off-by: Dave Airlie \u003cairlied@redhat.com\u003e\n" }, { "commit": "90c1efdd121c84ee73e9960667229a662f2315a3", "tree": "cbab078c8610185ccfb24a5c4b0efcefd3ff48ad", "parents": [ "92897b5c669f5e819ff2596fe6228ca2e4904981" ], "author": { "name": "Chris Wilson", "email": "chris@chris-wilson.co.uk", "time": "Sat Jul 17 20:23:26 2010 +0100" }, "committer": { "name": "Dave Airlie", "email": "airlied@redhat.com", "time": "Wed Jul 21 11:26:07 2010 +1000" }, "message": "drm: Return EBUSY if the framebuffer is unbound when flipping.\n\nIt looks like there is a race condition between unbinding a framebuffer\non a hotplug event and user space trying to flip:\n\nBUG: unable to handle kernel NULL pointer dereference at 0000000000000058\nIP: [\u003cffffffffa008c7d3\u003e] intel_crtc_page_flip+0xc9/0x39c [i915]\nPGD 114724067 PUD 1145bd067 PMD 0\nOops: 0000 [#1] SMP\nPid: 10954, comm: X Not tainted 2.6.35-rc5_stable_20100714+ #1\nP5Q-EM/P5Q-EM\nRIP: 0010:[\u003cffffffffa008c7d3\u003e] [\u003cffffffffa008c7d3\u003e]\nintel_crtc_page_flip+0xc9/0x39c [i915]\nRSP: 0018:ffff880114927cc8 EFLAGS: 00010282\nRAX: 0000000000000000 RBX: ffff88012df48320 RCX: ffff88010c945600\nRDX: ffff880001a109c8 RSI: ffff88010c945840 RDI: ffff88012df48320\nRBP: ffff880114927d18 R08: ffff88012df48280 R09: ffff88012df48320\nR10: 0000000003c2e0b0 R11: 0000000000003246 R12: ffff88010c945840\nR13: ffff88012df48000 R14: 0000000000000060 R15: ffff88012dbb8000\nFS: 00007f9e6078e830(0000) GS:ffff880001a00000(0000)\nknlGS:0000000000000000\nCS: 0010 DS: 0000 ES: 0000 CR0: 000000008005003b\nCR2: 0000000000000058 CR3: 00000001177a8000 CR4: 00000000000406f0\nDR0: 0000000000000000 DR1: 0000000000000000 DR2: 0000000000000000\nDR3: 0000000000000000 DR6: 00000000ffff0ff0 DR7: 0000000000000400\nProcess X (pid: 10954, threadinfo ffff880114926000, task\nffff88012a4a1690)\nStack:\n ffff88010c945600 ffff880115b176c0 ffff88012db10000 0000000000000246\n\u003c0\u003e fffffff40006101c ffff88010c945600 00000000ffffffea ffff88010c945600\n\u003c0\u003e ffff88012df48320 ffff88011b4b6780 ffff880114927d78 ffffffffa003bd0e\nCall Trace:\n [\u003cffffffffa003bd0e\u003e] drm_mode_page_flip_ioctl+0x1bc/0x214 [drm]\n [\u003cffffffffa00311fc\u003e] drm_ioctl+0x25e/0x35e [drm]\n [\u003cffffffffa003bb52\u003e] ? drm_mode_page_flip_ioctl+0x0/0x214 [drm]\n [\u003cffffffff810f1c3c\u003e] vfs_ioctl+0x2a/0x9e\n [\u003cffffffff810f227e\u003e] do_vfs_ioctl+0x531/0x565\n [\u003cffffffff810f2307\u003e] sys_ioctl+0x55/0x77\n [\u003cffffffff810e56d6\u003e] ? sys_read+0x47/0x6f\n [\u003cffffffff81002a2b\u003e] system_call_fastpath+0x16/0x1b\nCode: 45 d4 f4 ff ff ff 0f 84 e0 02 00 00 48 8b 4d b0 49 8d 9d 20 03 00 00 48\n89 df 49 89 4c 24 38 49 8b 07 49 89 44 24 20 49 8b 47 20 \u003c48\u003e 8b 40 58 49 c7 04\n24 00 00 00 00 49 c7 44 24 18 a9 a5 08 a0\nRIP [\u003cffffffffa008c7d3\u003e] intel_crtc_page_flip+0xc9/0x39c [i915]\n RSP \u003cffff880114927cc8\u003e\nCR2: 0000000000000058\n\nReferences:\n\n Bug 28811 - [page-flipping] GPU hang when modeset after unplugging\n another monitor (under compiz)\n https://bugs.freedesktop.org/show_bug.cgi?id\u003d28811\n\nSigned-off-by: Chris Wilson \u003cchris@chris-wilson.co.uk\u003e\nReviewed-by: Jesse Barnes \u003cjbarnes@virtuousgeek.org\u003e\nSigned-off-by: Dave Airlie \u003cairlied@redhat.com\u003e\n" }, { "commit": "92897b5c669f5e819ff2596fe6228ca2e4904981", "tree": "7bd7f559624915873635d1255f473ff972860194", "parents": [ "9440106b460ddfb7c0ff98beb6a6741f1f67b92b" ], "author": { "name": "Ben Skeggs", "email": "bskeggs@redhat.com", "time": "Fri Jul 16 15:09:17 2010 +1000" }, "committer": { "name": "Dave Airlie", "email": "airlied@redhat.com", "time": "Wed Jul 21 11:19:45 2010 +1000" }, "message": "drm: add \"auto\" dithering method\n\nThere\u0027s no convenient/reliable way for drivers to both obey the dithering\nmode property, and to be able to attempt to provide a good default in all\ncases.\n\nThis commit adds an \"auto\" method to the property which drivers can default\nto if they wish, whilst still allowing the user to override the choice as\nthey do now.\n\nSigned-off-by: Ben Skeggs \u003cbskeggs@redhat.com\u003e\nSigned-off-by: Dave Airlie \u003cairlied@redhat.com\u003e\n" }, { "commit": "c42750b0261274107ae85c894c088e618a3e38b9", "tree": "30c3b5ddd9a05d07edbf95498ac44b668e2277d4", "parents": [ "e153b70b89770968a704eda0b55707c6066b2d44" ], "author": { "name": "Alex Deucher", "email": "alexdeucher@gmail.com", "time": "Wed Jul 21 10:29:32 2010 +1000" }, "committer": { "name": "Dave Airlie", "email": "airlied@redhat.com", "time": "Wed Jul 21 10:29:32 2010 +1000" }, "message": "drm/r600: fix possible NULL pointer derefernce\n\nReported-by: Alexander Y. Fomichev \u003cgit.user@gmail.com\u003e\nSigned-off-by: Alex Deucher \u003calexdeucher@gmail.com\u003e\nSigned-off-by: Dave Airlie \u003cairlied@redhat.com\u003e\n" }, { "commit": "e153b70b89770968a704eda0b55707c6066b2d44", "tree": "ff4ad5cc28242562479833c1aa48a900e6b92a19", "parents": [ "a6a1a095ec8ace2912fc280d371eee8ff5da5736" ], "author": { "name": "Alex Deucher", "email": "alexdeucher@gmail.com", "time": "Tue Jul 20 18:07:22 2010 -0400" }, "committer": { "name": "Dave Airlie", "email": "airlied@redhat.com", "time": "Wed Jul 21 09:51:20 2010 +1000" }, "message": "drm/radeon/kms: add quirk for ASUS HD 3600 board\n\nConnector is actually DVI rather than HDMI.\n\nReported-by: trapDoor \u003ctrapdoor6@gmail.com\u003e\nSigned-off-by: Alex Deucher \u003calexdeucher@gmail.com\u003e\nCc: stable@kernel.org\nSigned-off-by: Dave Airlie \u003cairlied@redhat.com\u003e\n" }, { "commit": "516bd664153d76f5c814633cee6500e2ff8e861b", "tree": "f67a1c70b013961849d3491ef22596cd0b0d9af9", "parents": [ "844b9a8707f1fcf0482e0c52f44a555e799ccda6", "573201f36fd9c7c6d5218cdcd9948cee700b277d" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Tue Jul 20 16:26:42 2010 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Tue Jul 20 16:26:42 2010 -0700" }, "message": "Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-2.6\n\n* git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-2.6: (24 commits)\n bridge: Partially disable netpoll support\n tcp: fix crash in tcp_xmit_retransmit_queue\n IPv6: fix CoA check in RH2 input handler (mip6_rthdr_input())\n ibmveth: lost IRQ while closing/opening device leads to service loss\n rt2x00: Fix lockdep warning in rt2x00lib_probe_dev()\n vhost: avoid pr_err on condition guest can trigger\n ipmr: Don\u0027t leak memory if fib lookup fails.\n vhost-net: avoid flush under lock\n net: fix problem in reading sock TX queue\n net/core: neighbour update Oops\n net: skb_tx_hash() fix relative to skb_orphan_try()\n rfs: call sock_rps_record_flow() in tcp_splice_read()\n xfrm: do not assume that template resolving always returns xfrms\n hostap_pci: set dev-\u003ebase_addr during probe\n axnet_cs: use spin_lock_irqsave in ax_interrupt\n dsa: Fix Kconfig dependencies.\n act_nat: not all of the ICMP packets need an IP header payload\n r8169: incorrect identifier for a 8168dp\n Phonet: fix skb leak in pipe endpoint accept()\n Bluetooth: Update sec_level/auth_type for already existing connections\n ...\n" }, { "commit": "9d51a6b2487724e8713cd2794cf09ffeee5f6932", "tree": "acd827ad096722944daa54b694342876abbcff79", "parents": [ "d45840d9f04be4d8c0288066f37bca3a448f7471" ], "author": { "name": "Marek Szyprowski", "email": "m.szyprowski@samsung.com", "time": "Tue Jul 20 13:24:33 2010 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Tue Jul 20 16:25:41 2010 -0700" }, "message": "sdhci-s3c: add missing remove function\n\nSystem will crash sooner or later once the memory with the code of the\ns3c-sdhci.ko module is reused for something else. I really have no idea\nhow the lack of remove function went unnoticed into the mainline code.\n\nSigned-off-by: Marek Szyprowski \u003cm.szyprowski@samsung.com\u003e\nSigned-off-by: Kyungmin Park \u003ckyungmin.park@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": "d45840d9f04be4d8c0288066f37bca3a448f7471", "tree": "42243d935b254fde2157005ca00ccdfb95046c7d", "parents": [ "b8ab9f82025adea77864115da73e70026fa4f540" ], "author": { "name": "Andres Salomon", "email": "dilinger@queued.net", "time": "Tue Jul 20 13:24:32 2010 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Tue Jul 20 16:25:41 2010 -0700" }, "message": "Andres has moved\n\nMy Collabora address is no longer enabled - update the MODULE_AUTHOR\nfields of drivers to my current email address.\n\nSigned-off-by: Andres Salomon \u003cdilinger@queued.net\u003e\nSigned-off-by: Andrew Morton \u003cakpm@linux-foundation.org\u003e\nSigned-off-by: Linus Torvalds \u003ctorvalds@linux-foundation.org\u003e\n" }, { "commit": "5528e229f0f709e4f3d61dab73e553eea10758a9", "tree": "973838112e9086824aa25de7fb70ad2e7e5a07b0", "parents": [ "1cd8521e7d77def75fdb1cb35ecd135385e4be4f" ], "author": { "name": "Anton Vorontsov", "email": "avorontsov@mvista.com", "time": "Tue Jul 20 13:24:28 2010 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Tue Jul 20 16:25:40 2010 -0700" }, "message": "edac: mpc85xx: add support for MPC8569 EDAC controllers\n\nSimply add a proper ID into the device table.\n\nSigned-off-by: Anton Vorontsov \u003cavorontsov@mvista.com\u003e\nCc: Doug Thompson \u003cdougthompson@xmission.com\u003e\nCc: Peter Tyser \u003cptyser@xes-inc.com\u003e\nCc: Dave Jiang \u003cdjiang@mvista.com\u003e\nCc: Kumar Gala \u003cgalak@kernel.crashing.org\u003e\nSigned-off-by: Andrew Morton \u003cakpm@linux-foundation.org\u003e\nSigned-off-by: Linus Torvalds \u003ctorvalds@linux-foundation.org\u003e\n" }, { "commit": "1cd8521e7d77def75fdb1cb35ecd135385e4be4f", "tree": "323ee14651f0a1de88f015baa8769a693c75d307", "parents": [ "a6aa62a0909b9ccb1f8b0d2653920ba071037972" ], "author": { "name": "Anton Vorontsov", "email": "avorontsov@mvista.com", "time": "Tue Jul 20 13:24:27 2010 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Tue Jul 20 16:25:40 2010 -0700" }, "message": "edac: mpc85xx: fix MPC85xx dependency\n\nSince commit 5753c082f66eca5be81f6bda85c1718c5eea6ada (\"powerpc/85xx:\nKconfig cleanup\"), there is no MPC85xx Kconfig symbol anymore, so the\ndriver became non-selectable.\n\nThis patch fixes the issue by switching to PPC_85xx symbol.\n\nSigned-off-by: Anton Vorontsov \u003cavorontsov@mvista.com\u003e\nCc: Doug Thompson \u003cdougthompson@xmission.com\u003e\nCc: Peter Tyser \u003cptyser@xes-inc.com\u003e\nCc: Dave Jiang \u003cdjiang@mvista.com\u003e\nCc: Kumar Gala \u003cgalak@kernel.crashing.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": "7173aeff025a7fed3fa903e362bf773e6258dd47", "tree": "2db070e62b7a4a7560fa5fa28df5d194d79ead3d", "parents": [ "14d7ec11d165fe11c2bce5b412773af70b7c8e1b" ], "author": { "name": "Francisco Jerez", "email": "currojerez@riseup.net", "time": "Sat Jul 10 17:37:00 2010 +0200" }, "committer": { "name": "Dave Airlie", "email": "airlied@redhat.com", "time": "Wed Jul 21 08:40:05 2010 +1000" }, "message": "drm/nouveau: Fix crashes during fbcon init on single head cards.\n\nthis fixes a regression since the fbcon rework.\n\nSigned-off-by: Francisco Jerez \u003ccurrojerez@riseup.net\u003e\nSigned-off-by: Ben Skeggs \u003cbskeggs@redhat.com\u003e\nSigned-off-by: Dave Airlie \u003cairlied@redhat.com\u003e\n" }, { "commit": "14d7ec11d165fe11c2bce5b412773af70b7c8e1b", "tree": "b2b26bc5a26956e2cb75c1a91e30124babfed873", "parents": [ "42f14c4b454946650cf0bf66e0b631d02e328f61" ], "author": { "name": "Ben Skeggs", "email": "bskeggs@redhat.com", "time": "Mon Jul 12 13:15:44 2010 +1000" }, "committer": { "name": "Dave Airlie", "email": "airlied@redhat.com", "time": "Wed Jul 21 08:39:48 2010 +1000" }, "message": "drm/nouveau: fix pcirom vbios shadow breakage from acpi rom patch\n\nOn nv50 it became impossible to attempt a PCI ROM shadow of the VBIOS,\nwhich will break some setups.\n\nThis patch also removes the different ordering of shadow methods for\npre-nv50 chipsets. The reason for the different ordering was paranoia,\nbut it should hopefully be OK to try shadowing PRAMIN first.\n\nSigned-off-by: Ben Skeggs \u003cbskeggs@redhat.com\u003e\nSigned-off-by: Dave Airlie \u003cairlied@redhat.com\u003e\n" }, { "commit": "42f14c4b454946650cf0bf66e0b631d02e328f61", "tree": "0f51eeb9dd3df2ebb19c4aa985fc1762c3d30b6d", "parents": [ "944001201ca0196bcdb088129e5866a9f379d08c" ], "author": { "name": "Alex Deucher", "email": "alexdeucher@gmail.com", "time": "Tue Jul 20 11:27:54 2010 -0400" }, "committer": { "name": "Dave Airlie", "email": "airlied@redhat.com", "time": "Wed Jul 21 08:37:25 2010 +1000" }, "message": "drm/radeon/kms: fix shared ddc harder\n\nThis fixes a regression caused by b2ea4aa67bfd084834edd070e0a4a47857d6db59\ndue to the way shared ddc with multiple digital connectors was handled.\n\nYou generally have two cases where DDC lines are shared:\n- HDMI + VGA\n- HDMI + DVI-D\n\nHDMI + VGA is easy to deal with because you can check the EDID for the\nto see if the attached monitor is digital. A shared DDC line with two\ndigital connectors is more complex. You can\u0027t use the hdmi bits in the\nEDID since they may not be there with DVI\u003c-\u003eHDMI adapters. In this case\nall we can do is check the HPD pins to see which is connected as we have\nno way of knowing using the EDID.\n\nReported-by: trapdoor6@gmail.com\nSigned-off-by: Alex Deucher \u003calexdeucher@gmail.com\u003e\nCc: stable@kernel.org\nSigned-off-by: Dave Airlie \u003cairlied@redhat.com\u003e\n" }, { "commit": "19f0f0af097ba3138ae2780b471180512763a78f", "tree": "239c0dd5b728cd9c52cbf01777083382b20d95de", "parents": [ "620d0be88188cd3dc79db3f5eab1420d6f97c70c", "2d31757c87a741823f77daaa07eeb8d56be63943" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Tue Jul 20 08:22:15 2010 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Tue Jul 20 08:22:15 2010 -0700" }, "message": "Merge git://git.infradead.org/users/cbou/battery-2.6.35\n\n* git://git.infradead.org/users/cbou/battery-2.6.35:\n ds2782_battery: Fix ds2782_get_capacity return value\n" }, { "commit": "944001201ca0196bcdb088129e5866a9f379d08c", "tree": "eb8b2b2a9b00f469c283c5714c6d642db8aaa46b", "parents": [ "45503ded966c98e604c9667c0b458d40666b9ef3" ], "author": { "name": "Dave Airlie", "email": "airlied@redhat.com", "time": "Tue Jul 20 13:15:31 2010 +1000" }, "committer": { "name": "Dave Airlie", "email": "airlied@redhat.com", "time": "Tue Jul 20 15:24:18 2010 +1000" }, "message": "drm/i915: enable low power render writes on GEN3 hardware.\n\nA lot of 945GMs have had stability issues for a long time, this manifested as X hangs, blitter engine hangs, and lots of crashes.\n\none such report is at:\nhttps://bugs.freedesktop.org/show_bug.cgi?id\u003d20560\n\nalong with numerous distro bugzillas.\n\nThis only took a week of digging and hair ripping to figure out.\n\nTracked down and tested on a 945GM Lenovo T60,\npreviously running\nx11perf -copypixwin500\nor\nx11perf -copywinpix500\nrepeatedly would cause the GPU to wedge within 4 or 5 tries, with random busy bits set.\n\nAfter this patch no hangs were observed.\n\ncc: stable@kernel.org\nSigned-off-by: Dave Airlie \u003cairlied@redhat.com\u003e\n" }, { "commit": "45503ded966c98e604c9667c0b458d40666b9ef3", "tree": "c42c6c1dd9b947e9a5b43b64b87b5c6689722506", "parents": [ "4ede00c96632bcf8a21dd69ac0248f4c40b4cd0e" ], "author": { "name": "Keith Packard", "email": "keithp@keithp.com", "time": "Mon Jul 19 21:12:35 2010 -0700" }, "committer": { "name": "Dave Airlie", "email": "airlied@redhat.com", "time": "Tue Jul 20 15:24:12 2010 +1000" }, "message": "drm/i915: Define MI_ARB_STATE bits\n\nThe i915 memory arbiter has a register full of configuration\nbits which are currently not defined in the driver header file.\n\nSigned-off-by: Keith Packard \u003ckeithp@keithp.com\u003e\ncc: stable@kernel.org\nSigned-off-by: Dave Airlie \u003cairlied@redhat.com\u003e\n" }, { "commit": "4ede00c96632bcf8a21dd69ac0248f4c40b4cd0e", "tree": "be8837d8c3229ed40819aa3eb7f6dd027de6123c", "parents": [ "772a2f9b488f4d27c314da5eeabde750b9ead41b" ], "author": { "name": "Dan Carpenter", "email": "error27@gmail.com", "time": "Sat Jul 10 16:30:04 2010 +0200" }, "committer": { "name": "Dave Airlie", "email": "airlied@redhat.com", "time": "Tue Jul 20 15:24:11 2010 +1000" }, "message": "vmwgfx: return -EFAULT if copy_to_user fails\n\ncopy_to_user() returns the number of bytes remaining to be copied, but\nwe want to return a negative error code. This gets copied to user\nspace.\n\nSigned-off-by: Dan Carpenter \u003cerror27@gmail.com\u003e\nSigned-off-by: Dave Airlie \u003cairlied@redhat.com\u003e\n" }, { "commit": "bbb642f9c9a43dbe45ffe14935397a2a34100263", "tree": "c50ea5a7f71d404abf11780e7b5669449462f918", "parents": [ "1e8655f87333def92bb8215b423adc65403b08a5" ], "author": { "name": "Kulikov Vasiliy", "email": "segooon@gmail.com", "time": "Fri Jul 16 20:13:33 2010 +0400" }, "committer": { "name": "Dave Airlie", "email": "airlied@redhat.com", "time": "Tue Jul 20 15:24:08 2010 +1000" }, "message": "drm: radeon: check kzalloc() result\n\nIf kzalloc() fails exit with -ENOMEM.\n\nSigned-off-by: Kulikov Vasiliy \u003csegooon@gmail.com\u003e\nSigned-off-by: Dave Airlie \u003cairlied@redhat.com\u003e\n" }, { "commit": "1e8655f87333def92bb8215b423adc65403b08a5", "tree": "c746916b7ef9c78b4cef92a7daac61e2c0af7b73", "parents": [ "8d369bb196f1f9111cb7ab839d4f420378fa7b30" ], "author": { "name": "Ben Hutchings", "email": "ben@decadent.org.uk", "time": "Sun Jul 18 21:51:42 2010 +0100" }, "committer": { "name": "Dave Airlie", "email": "airlied@redhat.com", "time": "Tue Jul 20 15:24:06 2010 +1000" }, "message": "drm/ttm: Fix build on architectures without AGP\n\nMake inclusion of \u003casm/agp.h\u003e conditional on TTM_HAS_AGP. The use\nof the functions declared in it is already conditional.\n\nReported-by: Geert Stappers \u003cstappers@stappers.nl\u003e\nSigned-off-by: Ben Hutchings \u003cben@decadent.org.uk\u003e\nTested-by: Geert Stappers \u003cstappers@stappers.nl\u003e\nSigned-off-by: Dave Airlie \u003cairlied@redhat.com\u003e\n" }, { "commit": "1afaab90e8c0317170a53967064a934a77a59c16", "tree": "55aef915061f1e001042f75ffb3f4fb3f5cb53e0", "parents": [ "3e1bbc8d5018a05c0793c8a32b777a1396eb4414" ], "author": { "name": "Wan ZongShun", "email": "mcuos.com@gmail.com", "time": "Sun Jul 18 22:23:19 2010 -0700" }, "committer": { "name": "Dmitry Torokhov", "email": "dmitry.torokhov@gmail.com", "time": "Mon Jul 19 21:42:56 2010 -0700" }, "message": "Input: w90p910_keypad - change platfrom driver name to \u0027nuc900-kpi\u0027\n\nThe name of platfrom device was changed and we need to make driver\u0027s\nname match in order for it to bind to the device.\n\nSigned-off-by: Wan ZongShun \u003cmcuos.com@gmail.com\u003e\nSigned-off-by: Dmitry Torokhov \u003cdtor@mail.ru\u003e\n" }, { "commit": "3e1bbc8d5018a05c0793c8a32b777a1396eb4414", "tree": "1c8a87b8faa1c1828abd416789ee2a9be5c11204", "parents": [ "d90d8d5e52a61695483bdb827086a673936e8616" ], "author": { "name": "Kamal Mostafa", "email": "kamal@canonical.com", "time": "Mon Jul 19 11:00:52 2010 -0700" }, "committer": { "name": "Dmitry Torokhov", "email": "dmitry.torokhov@gmail.com", "time": "Mon Jul 19 21:41:52 2010 -0700" }, "message": "Input: i8042 - add Gigabyte Spring Peak to dmi_noloop_table\n\nGigabyte \"Spring Peak\" notebook indicates wrong chassis-type, tripping up\ni8042 and breaking the touchpad. Add this model to i8042_dmi_noloop_table[]\nto resolve.\n\nBugLink: https://bugs.launchpad.net/bugs/580664\n\nSigned-off-by: Kamal Mostafa \u003ckamal@canonical.com\u003e\nCc: stable@kernel.org\nSigned-off-by: Dmitry Torokhov \u003cdtor@mail.ru\u003e\n" }, { "commit": "2decd5a7cea2c1dae6418fe778857d43680a91aa", "tree": "2ff5a57ef9db7a5fc000d323910b13ece778ab5b", "parents": [ "b4fd4f890bca2291a12bb0807027db40f929a82d", "878c495644be28cc881e7ee792f00fd879a1ebf9" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Mon Jul 19 13:18:05 2010 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Mon Jul 19 13:18:05 2010 -0700" }, "message": "Merge branch \u0027for-linus\u0027 of git://git390.marist.edu/pub/scm/linux-2.6\n\n* \u0027for-linus\u0027 of git://git390.marist.edu/pub/scm/linux-2.6:\n [S390] cio: fix potential overflow in chpid descriptor\n [S390] add missing device put\n [S390] dasd: use correct label location for diag fba disks\n" }, { "commit": "b4fd4f890bca2291a12bb0807027db40f929a82d", "tree": "12d55f40767af5841778b858e3b1085d18bb130c", "parents": [ "a9f7f2e74ae0e6a801a2433dc8e9124d73da0cb4" ], "author": { "name": "Sreedhara DS", "email": "sreedhara.ds@intel.com", "time": "Mon Jul 19 09:37:42 2010 +0100" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Mon Jul 19 13:17:37 2010 -0700" }, "message": "intel_scu_ipc: Oops/crash fixes\n\n- fix reversing of command/sub arguments\n- fix a crash if the i2c interface is called before the device is found\n\nSigned-off-by: Sreedhara DS \u003csreedhara.ds@intel.com\u003e\nSigned-off-by: Alan Cox \u003calan@linux.intel.com\u003e\nSigned-off-by: Linus Torvalds \u003ctorvalds@linux-foundation.org\u003e\n" }, { "commit": "b508998f665ee6d6a15eae11be258c3e94c33562", "tree": "4233f82d716e97a874a206f6337959334286d448", "parents": [ "d9a9dc66eb8a8fd85c8546247e7e1d6023d0eb0f", "9acd56d3f2a05191ee369cbdd8c37dd547aa19b8" ], "author": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Mon Jul 19 12:38:51 2010 -0700" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Mon Jul 19 12:38:51 2010 -0700" }, "message": "Merge branch \u0027master\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless-2.6\n" }, { "commit": "878c495644be28cc881e7ee792f00fd879a1ebf9", "tree": "61f9ea2be8e821424d2643c8a26b720fd2a5a3bf", "parents": [ "0abccf77402af44855da739b439d01cfb65b4bfd" ], "author": { "name": "Sebastian Ott", "email": "sebott@linux.vnet.ibm.com", "time": "Mon Jul 19 09:22:37 2010 +0200" }, "committer": { "name": "Martin Schwidefsky", "email": "sky@mschwide.boeblingen.de.ibm.com", "time": "Mon Jul 19 09:22:50 2010 +0200" }, "message": "[S390] cio: fix potential overflow in chpid descriptor\n\nThe length filed in the chsc response block (if valid)\nhas a value of n*(sizeof(chp_desc))+8 (for the response\nblock header). When we memcopied from the response block\nto the actual descriptor we copied 8 bytes too much.\nThe bug was not revealed since the descriptor is embedded\nin struct channel_path.\nSince we only write one descriptor at a time ignore the\nlength value and use sizeof(*desc).\n\nSigned-off-by: Sebastian Ott \u003csebott@linux.vnet.ibm.com\u003e\nSigned-off-by: Martin Schwidefsky \u003cschwidefsky@de.ibm.com\u003e\n" }, { "commit": "0abccf77402af44855da739b439d01cfb65b4bfd", "tree": "125232a749ad17ae39db7ce6c52205233f51e240", "parents": [ "cffab6bc5511cd6f67a60bf16b62de4267b68c4c" ], "author": { "name": "Stefan Haberland", "email": "stefan.haberland@de.ibm.com", "time": "Mon Jul 19 09:22:36 2010 +0200" }, "committer": { "name": "Martin Schwidefsky", "email": "sky@mschwide.boeblingen.de.ibm.com", "time": "Mon Jul 19 09:22:50 2010 +0200" }, "message": "[S390] add missing device put\n\nThe dasd_alias_show function does not return a device reference\nin case the device is an alias.\n\nSigned-off-by: Stefan Haberland \u003cstefan.haberland@de.ibm.com\u003e\nSigned-off-by: Martin Schwidefsky \u003cschwidefsky@de.ibm.com\u003e\n" }, { "commit": "7260042b2d0397e7a8735ca47cd7839a5bb1210b", "tree": "da92181f60f67f1e82378e59edfd13def6a51fe7", "parents": [ "2716fbf63ee39eadc1aa9b3841b20f75b99a9bc3" ], "author": { "name": "Lee Nipper", "email": "lee.nipper@gmail.com", "time": "Mon Jul 19 14:11:24 2010 +0800" }, "committer": { "name": "Herbert Xu", "email": "herbert@gondor.apana.org.au", "time": "Mon Jul 19 14:11:24 2010 +0800" }, "message": "crypto: talitos - fix bug in sg_copy_end_to_buffer\n\nIn function sg_copy_end_to_buffer, too much data\nis copied when a segment in the scatterlist\nhas .length greater than the requested copy length.\n\nThis patch adds the limit checks to fix this bug of over copying,\nwhich affected only the ahash algorithms.\n\nSigned-off-by: Lee Nipper \u003clee.nipper@gmail.com\u003e\nAcked-by: Kim Phillips \u003ckim.phillips@freescale.com\u003e\nSigned-off-by: Herbert Xu \u003cherbert@gondor.apana.org.au\u003e\n" }, { "commit": "7f8275d0d660c146de6ee3017e1e2e594c49e820", "tree": "884db927118b44102750b5168ee36ef4b8b5cb4e", "parents": [ "d0c6f6258478e1dba532bf7c28e2cd6e1047d3a4" ], "author": { "name": "Dave Chinner", "email": "dchinner@redhat.com", "time": "Mon Jul 19 14:56:17 2010 +1000" }, "committer": { "name": "Dave Chinner", "email": "david@fromorbit.com", "time": "Mon Jul 19 14:56:17 2010 +1000" }, "message": "mm: add context argument to shrinker callback\n\nThe current shrinker implementation requires the registered callback\nto have global state to work from. This makes it difficult to shrink\ncaches that are not global (e.g. per-filesystem caches). Pass the shrinker\nstructure to the callback so that users can embed the shrinker structure\nin the context the shrinker needs to operate on and get back to it in the\ncallback via container_of().\n\nSigned-off-by: Dave Chinner \u003cdchinner@redhat.com\u003e\nReviewed-by: Christoph Hellwig \u003chch@lst.de\u003e\n" }, { "commit": "2044f2282d7558c765270d78e19dbdcf6190ca71", "tree": "03b2c4d211fa8e7e2ef8c489d28a16442f030d57", "parents": [ "bea9a6d239cb2aa2ced4dcb0a05e1827ce61fa3d", "58c84eda07560a6b75b03e8d3b26d6eddfc14011" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Sun Jul 18 15:05:22 2010 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Sun Jul 18 15:05:22 2010 -0700" }, "message": "Merge branch \u0027for-linus\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/jbarnes/pci-2.6\n\n* \u0027for-linus\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/jbarnes/pci-2.6:\n PCI: fall back to original BIOS BAR addresses\n" }, { "commit": "cd9f040df6ce46573760a507cb88192d05d27d86", "tree": "096de3bb2202a14269ff8d36d0c932ee50619808", "parents": [ "f469461df6ff822f71b8737bda86eea20f16ff93" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Sun Jul 18 09:44:37 2010 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Sun Jul 18 09:44:37 2010 -0700" }, "message": "drm/i915: add \u0027reclaimable\u0027 to i915 self-reclaimable page allocations\n\nThe hibernate issues that got fixed in commit 985b823b9192 (\"drm/i915:\nfix hibernation since i915 self-reclaim fixes\") turn out to have been\nincomplete. Vefa Bicakci tested lots of hibernate cycles, and without\nthe __GFP_RECLAIMABLE flag the system eventually fails to resume.\n\nWith the flag added, Vefa can apparently hibernate forever (or until he\ngets bored running his automated scripts, whichever comes first).\n\nThe reclaimable flag was there originally, and was one of the flags that\nwere dropped (unintentionally) by commit 4bdadb978569 (\"drm/i915:\nSelectively enable self-reclaim\") that introduced all these problems,\nbut I didn\u0027t want to just blindly add back all the flags in commit\n985b823b9192, and it looked like __GFP_RECLAIM wasn\u0027t necessary. It\nclearly was.\n\nI still suspect that there is some subtle reason we\u0027re missing that\ncauses the problems, but __GFP_RECLAIMABLE is certainly not wrong to use\nin this context, and is what the code historically used. And we have no\nidea what the causes the corruption without it.\n\nReported-and-tested-by: M. Vefa Bicakci \u003cbicave@superonline.com\u003e\nCc: Dave Airlie \u003cairlied@gmail.com\u003e\nCc: Chris Wilson \u003cchris@chris-wilson.co.uk\u003e\nCc: KOSAKI Motohiro \u003ckosaki.motohiro@jp.fujitsu.com\u003e\nCc: Hugh Dickins \u003chugh.dickins@tiscali.co.uk\u003e\nCc: stable@kernel.org\nSigned-off-by: Linus Torvalds \u003ctorvalds@linux-foundation.org\u003e\n" }, { "commit": "d90d8d5e52a61695483bdb827086a673936e8616", "tree": "a0d06163b339f35bc974bbaf8ae596b1dc479cd0", "parents": [ "5b39187fad6faefae5ce1a1e997651d4e382b135" ], "author": { "name": "Christoph Fritz", "email": "chf.fritz@googlemail.com", "time": "Sat Jul 17 14:29:06 2010 -0700" }, "committer": { "name": "Dmitry Torokhov", "email": "dmitry.torokhov@gmail.com", "time": "Sat Jul 17 14:30:28 2010 -0700" }, "message": "Input: qt2160 - rename kconfig symbol name\n\ndrivers/input/keyboard/Kconfig defines QT2160 while the corresponding\nMakefile expects CONFIG_KEYBOARD_QT2160 as all other keyboard drivers\ndo. To keep this Makefile consistent rename the config-token from\nCONFIG_QT2160 to CONFIG_KEYBOARD_QT2160.\n\nThe various defconfig files are left alone.\n\nReported-by: Robert P. J. Day \u003crpjday@crashcourse.ca\u003e\nSigned-off-by: Christoph Fritz \u003cchf.fritz@googlemail.com\u003e\nSigned-off-by: Dmitry Torokhov \u003cdtor@mail.ru\u003e\n" }, { "commit": "ee2e6114de3bdb1c34f3910b690f990483e981ab", "tree": "a6b4de8355b31824103e24dc81bc0515c08d99b0", "parents": [ "0f6142fa96a4ce799ccaa4cdb38fc4a715eb9d35" ], "author": { "name": "Robert Jennings", "email": "rcj@linux.vnet.ibm.com", "time": "Fri Jul 16 04:57:25 2010 +0000" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Fri Jul 16 13:03:23 2010 -0700" }, "message": "ibmveth: lost IRQ while closing/opening device leads to service loss\n\nThe order of freeing the IRQ and freeing the device in firmware\nin ibmveth_close can cause the adapter to become unusable after a\nsubsequent ibmveth_open. Only a reboot of the OS will make the\nnetwork device usable again. This is seen when cycling the adapter\nup and down while there is network activity.\n\nThere is a window where an IRQ will be left unserviced (H_EOI will not\nbe called). The solution is to make a VIO_IRQ_DISABLE h_call, free the\ndevice with firmware, and then call free_irq.\n\nSigned-off-by: Robert Jennings \u003crcj@linux.vnet.ibm.com\u003e\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "0f6142fa96a4ce799ccaa4cdb38fc4a715eb9d35", "tree": "1bdd2d99caa46a0545bc0b2d3987fa5986e6dcb9", "parents": [ "e40dbc51fbcc3281bb52ecf0f5bec693d36e2aea", "95c0ec6a97ae82d39a6e13fc01aa76861a4a76d0" ], "author": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Fri Jul 16 12:41:44 2010 -0700" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Fri Jul 16 12:41:44 2010 -0700" }, "message": "Merge branch \u0027vhost-net\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/mst/vhost\n" }, { "commit": "58c84eda07560a6b75b03e8d3b26d6eddfc14011", "tree": "0104345d24d5fb79842ffd563ea69fdf2906931d", "parents": [ "2f7989efd4398d92b8adffce2e07dd043a0895fe" ], "author": { "name": "Bjorn Helgaas", "email": "bjorn.helgaas@hp.com", "time": "Thu Jul 15 09:41:42 2010 -0600" }, "committer": { "name": "Jesse Barnes", "email": "jbarnes@virtuousgeek.org", "time": "Fri Jul 16 11:39:48 2010 -0700" }, "message": "PCI: fall back to original BIOS BAR addresses\n\nIf we fail to assign resources to a PCI BAR, this patch makes us try the\noriginal address from BIOS rather than leaving it disabled.\n\nLinux tries to make sure all PCI device BARs are inside the upstream\nPCI host bridge or P2P bridge apertures, reassigning BARs if necessary.\nWindows does similar reassignment.\n\nBefore this patch, if we could not move a BAR into an aperture, we left\nthe resource unassigned, i.e., at address zero. Windows leaves such BARs\nat the original BIOS addresses, and this patch makes Linux do the same.\n\nThis is a bit ugly because we disable the resource long before we try to\nreassign it, so we have to keep track of the BIOS BAR address somewhere.\nFor lack of a better place, I put it in the struct pci_dev.\n\nI think it would be cleaner to attempt the assignment immediately when the\nclaim fails, so we could easily remember the original address. But we\ncurrently claim motherboard resources in the middle, after attempting to\nclaim PCI resources and before assigning new PCI resources, and changing\nthat is a fairly big job.\n\nAddresses https://bugzilla.kernel.org/show_bug.cgi?id\u003d16263\n\nReported-by: Andrew \u003cnitr0@seti.kr.ua\u003e\nTested-by: Andrew \u003cnitr0@seti.kr.ua\u003e\nSigned-off-by: Bjorn Helgaas \u003cbjorn.helgaas@hp.com\u003e\nSigned-off-by: Jesse Barnes \u003cjbarnes@virtuousgeek.org\u003e\n" }, { "commit": "9acd56d3f2a05191ee369cbdd8c37dd547aa19b8", "tree": "8be52da7dc7d8e70e4d3fd9302986c2f51ba1cfa", "parents": [ "0f4da2d77e1bf424ac36424081afc22cbfc3ff2b" ], "author": { "name": "Stephen Boyd", "email": "bebarino@gmail.com", "time": "Fri Jul 16 09:50:10 2010 -0700" }, "committer": { "name": "John W. Linville", "email": "linville@tuxdriver.com", "time": "Fri Jul 16 13:57:59 2010 -0400" }, "message": "rt2x00: Fix lockdep warning in rt2x00lib_probe_dev()\n\nThe rt2x00dev-\u003eintf_work workqueue is never initialized when a driver is\nprobed for a non-existent device (in this case rt2500usb). On such a\npath we call rt2x00lib_remove_dev() to free any resources initialized\nduring the probe before we use INIT_WORK to initialize the workqueue.\nThis causes lockdep to get confused since the lock used in the workqueue\nhasn\u0027t been initialized yet but is now being acquired during\ncancel_work_sync() called by rt2x00lib_remove_dev().\n\nFix this by initializing the workqueue first before we attempt to probe\nthe device. This should make lockdep happy and avoid breaking any\nassumptions about how the library cleans up after a probe fails.\n\nphy0 -\u003e rt2x00lib_probe_dev: Error - Failed to allocate device.\nINFO: trying to register non-static key.\nthe code is fine but needs lockdep annotation.\nturning off the locking correctness validator.\nPid: 2027, comm: modprobe Not tainted 2.6.35-rc5+ #60\nCall Trace:\n [\u003cffffffff8105fe59\u003e] register_lock_class+0x152/0x31f\n [\u003cffffffff81344a00\u003e] ? usb_control_msg+0xd5/0x111\n [\u003cffffffff81061bde\u003e] __lock_acquire+0xce/0xcf4\n [\u003cffffffff8105f6fd\u003e] ? trace_hardirqs_off+0xd/0xf\n [\u003cffffffff81492aef\u003e] ? _raw_spin_unlock_irqrestore+0x33/0x41\n [\u003cffffffff810628d5\u003e] lock_acquire+0xd1/0xf7\n [\u003cffffffff8104f037\u003e] ? __cancel_work_timer+0x99/0x17e\n [\u003cffffffff8104f06e\u003e] __cancel_work_timer+0xd0/0x17e\n [\u003cffffffff8104f037\u003e] ? __cancel_work_timer+0x99/0x17e\n [\u003cffffffff8104f136\u003e] cancel_work_sync+0xb/0xd\n [\u003cffffffffa0096675\u003e] rt2x00lib_remove_dev+0x25/0xb0 [rt2x00lib]\n [\u003cffffffffa0096bf7\u003e] rt2x00lib_probe_dev+0x380/0x3ed [rt2x00lib]\n [\u003cffffffff811d78a7\u003e] ? __raw_spin_lock_init+0x31/0x52\n [\u003cffffffffa00bbd2c\u003e] ? T.676+0xe/0x10 [rt2x00usb]\n [\u003cffffffffa00bbe4f\u003e] rt2x00usb_probe+0x121/0x15e [rt2x00usb]\n [\u003cffffffff813468bd\u003e] usb_probe_interface+0x151/0x19e\n [\u003cffffffff812ea08e\u003e] driver_probe_device+0xa7/0x136\n [\u003cffffffff812ea167\u003e] __driver_attach+0x4a/0x66\n [\u003cffffffff812ea11d\u003e] ? __driver_attach+0x0/0x66\n [\u003cffffffff812e96ca\u003e] bus_for_each_dev+0x54/0x89\n [\u003cffffffff812e9efd\u003e] driver_attach+0x19/0x1b\n [\u003cffffffff812e9b64\u003e] bus_add_driver+0xb4/0x204\n [\u003cffffffff812ea41b\u003e] driver_register+0x98/0x109\n [\u003cffffffff813465dd\u003e] usb_register_driver+0xb2/0x173\n [\u003cffffffffa00ca000\u003e] ? rt2500usb_init+0x0/0x20 [rt2500usb]\n [\u003cffffffffa00ca01e\u003e] rt2500usb_init+0x1e/0x20 [rt2500usb]\n [\u003cffffffff81000203\u003e] do_one_initcall+0x6d/0x17a\n [\u003cffffffff8106cae8\u003e] sys_init_module+0x9c/0x1e0\n [\u003cffffffff8100296b\u003e] system_call_fastpath+0x16/0x1b\n\nSigned-off-by: Stephen Boyd \u003cbebarino@gmail.com\u003e\nSigned-off-by: John W. Linville \u003clinville@tuxdriver.com\u003e\n" }, { "commit": "cc10b6ffd39ef982f86de68d95e5811df82cf819", "tree": "cb6f24f40d0211513321b5230b87efc022aeed1f", "parents": [ "042bd1ff6cf255e71689db913786dbb6bb79542d", "5b39187fad6faefae5ce1a1e997651d4e382b135" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Fri Jul 16 08:22:40 2010 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Fri Jul 16 08:22:40 2010 -0700" }, "message": "Merge branch \u0027for-linus\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/dtor/input\n\n* \u0027for-linus\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/dtor/input:\n Input: w90p910_ts - fix call to setup_timer()\n Input: synaptics - fix wrong dimensions check\n Input: i8042 - mark stubs in i8042.h \"static inline\"\n" }, { "commit": "95c0ec6a97ae82d39a6e13fc01aa76861a4a76d0", "tree": "a581adc7aa2fdd2330790adb3e76b93b112c3ef4", "parents": [ "1680e9063ea28099a1efa8ca11cee069cc7a9bc3" ], "author": { "name": "Michael S. Tsirkin", "email": "mst@redhat.com", "time": "Thu Jun 24 17:10:25 2010 +0300" }, "committer": { "name": "Michael S. Tsirkin", "email": "mst@redhat.com", "time": "Fri Jul 16 12:18:17 2010 +0300" }, "message": "vhost: avoid pr_err on condition guest can trigger\n\nGuest can trigger packet truncation by posting\na very short buffer and disabling buffer merging.\nConvert pr_err to pr_debug to avoid log from filling\nup when this happens.\n\nSigned-off-by: Michael S. Tsirkin \u003cmst@redhat.com\u003e\n" }, { "commit": "5b39187fad6faefae5ce1a1e997651d4e382b135", "tree": "0a6095cfc219b932afead2bb4597aaf811e25367", "parents": [ "bbddd199995ff55f1bb0336cadff4ee3d02b5a2c" ], "author": { "name": "Wan ZongShun", "email": "mcuos.com@gmail.com", "time": "Thu Jul 15 23:28:57 2010 -0700" }, "committer": { "name": "Dmitry Torokhov", "email": "dmitry.torokhov@gmail.com", "time": "Thu Jul 15 23:51:03 2010 -0700" }, "message": "Input: w90p910_ts - fix call to setup_timer()\n\nNo need to take address, w90p910_ts is already a pointer.\n\nSigned-off-by: Wan ZongShun \u003cmcuos.com@gmail.com\u003e\nSigned-off-by: Dmitry Torokhov \u003cdtor@mail.ru\u003e\n" }, { "commit": "8d369bb196f1f9111cb7ab839d4f420378fa7b30", "tree": "50fab6e264572f10b5635581789532d3962d54c9", "parents": [ "5099fa7f23d3711538cbe9fe072b4ce1ba814035" ], "author": { "name": "Alex Deucher", "email": "alexdeucher@gmail.com", "time": "Thu Jul 15 10:51:10 2010 -0400" }, "committer": { "name": "Dave Airlie", "email": "airlied@redhat.com", "time": "Fri Jul 16 11:27:01 2010 +1000" }, "message": "drm/radeon/kms: fix gtt MC base alignment on rs4xx/rs690/rs740 asics\n\nThe asics in question have the following requirements with regard to\ntheir gart setups:\n\n1. The GART aperture size has to be in the form of 2^X bytes, where X is from 25 to 31\n2. The GART aperture MC base has to be aligned to a boundary equal to the size of the\naperture.\n3. The GART page table has to be aligned to the boundary equal to the size of the table.\n4. The GART page table size is: table_entry_size * (aperture_size / page_size)\n5. The GART page table has to be allocated in non-paged, non-cached, contiguous system\nmemory.\n\nThis patch takes care 2. The rest should already be handled properly.\n\nThis fixes a regression noticed by: Torsten Kaiser \u003cjust.for.lkml@googlemail.com\u003e\n\nTested-by: Torsten Kaiser \u003cjust.for.lkml@googlemail.com\u003e\nSigned-off-by: Alex Deucher \u003calexdeucher@gmail.com\u003e\nSigned-off-by: Dave Airlie \u003cairlied@redhat.com\u003e\n" }, { "commit": "9440106b460ddfb7c0ff98beb6a6741f1f67b92b", "tree": "f5d203d28ae2cf157ce9a0d268146b37672ccf4f", "parents": [ "86a1b9d1f175e9e9d022c7674d6ba1ede48ee15f" ], "author": { "name": "Jerome Glisse", "email": "jglisse@redhat.com", "time": "Thu Jul 15 15:43:25 2010 -0400" }, "committer": { "name": "Dave Airlie", "email": "airlied@redhat.com", "time": "Fri Jul 16 11:25:02 2010 +1000" }, "message": "drm: unify crtc,connector,encoder,fb debug printing\n\nUnify debug printing so it easier to track what\u0027s happening\nwhile debugging.\n\nSigned-off-by: Jerome Glisse \u003cjglisse@redhat.com\u003e\nSigned-off-by: Dave Airlie \u003cairlied@redhat.com\u003e\n" }, { "commit": "1680e9063ea28099a1efa8ca11cee069cc7a9bc3", "tree": "92fda29b75a081151d6e460f7ae8ec874517b6e5", "parents": [ "7b3384fc30633738ae4eaf8e1bc6ce70470ced80" ], "author": { "name": "Michael S. Tsirkin", "email": "mst@redhat.com", "time": "Thu Jul 15 15:19:12 2010 +0300" }, "committer": { "name": "Michael S. Tsirkin", "email": "mst@redhat.com", "time": "Thu Jul 15 15:26:12 2010 +0300" }, "message": "vhost-net: avoid flush under lock\n\nWe flush under vq mutex when changing backends.\nThis creates a deadlock as workqueue being flushed\nneeds this lock as well.\n\nhttps://bugzilla.redhat.com/show_bug.cgi?id\u003d612421\n\nDrop the vq mutex before flush: we have the device mutex\nwhich is sufficient to prevent another ioctl from touching\nthe vq.\n\nSigned-off-by: Michael S. Tsirkin \u003cmst@redhat.com\u003e\n" }, { "commit": "ea4c1a7e14051e2ba81fc7dc02e3d55bfb2d7548", "tree": "ed80eaf6245d8d1509662dc42e7184391b91e7d1", "parents": [ "bcefc8d0d3a0cba9078f519d69f138b93ad30e39", "77154a2026ee5cb2ce05a7d370c16e4c123028e5" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Wed Jul 14 17:27:29 2010 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Wed Jul 14 17:27:29 2010 -0700" }, "message": "Merge branch \u0027merge\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/benh/powerpc\n\n* \u0027merge\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/benh/powerpc:\n powerpc/fsl-booke: Fix address issue when using relocatable kernels\n powerpc/cpm1: Mark micropatch code/data static and __init\n powerpc/cpm1: Fix build with various CONFIG_*_UCODE_PATCH combinations\n powerpc/cpm: Reintroduce global spi_pram struct (fixes build issue)\n" }, { "commit": "0f4da2d77e1bf424ac36424081afc22cbfc3ff2b", "tree": "04e40fdb0513f18642c8d20499d207ff1b297b81", "parents": [ "f8036965ccec4d786d8bf09bf57b793542cb3dce" ], "author": { "name": "John W. Linville", "email": "linville@tuxdriver.com", "time": "Tue Jul 13 14:06:32 2010 -0400" }, "committer": { "name": "John W. Linville", "email": "linville@tuxdriver.com", "time": "Wed Jul 14 13:49:46 2010 -0400" }, "message": "hostap_pci: set dev-\u003ebase_addr during probe\n\n\"hostap: Protect against initialization interrupt\" (which reinstated\n\"wireless: hostap, fix oops due to early probing interrupt\")\nreintroduced Bug 16111. This is because hostap_pci wasn\u0027t setting\ndev-\u003ebase_addr, which is now checked in prism2_interrupt. As a result,\ninitialization was failing for PCI-based hostap devices. This corrects\nthat oversight.\n\nSigned-off-by: John W. Linville \u003clinville@tuxdriver.com\u003e\n" }, { "commit": "bbddd199995ff55f1bb0336cadff4ee3d02b5a2c", "tree": "ffc2f282465bd67ed58fa8f5451eef54b7650a14", "parents": [ "c59690fa484c04ab96fe932241b569a09755a4d2" ], "author": { "name": "Takashi Iwai", "email": "tiwai@suse.de", "time": "Wed Jul 14 09:32:46 2010 -0700" }, "committer": { "name": "Dmitry Torokhov", "email": "dmitry.torokhov@gmail.com", "time": "Wed Jul 14 09:33:56 2010 -0700" }, "message": "Input: synaptics - fix wrong dimensions check\n\nThe commit 83ba9ea8a04b72dfee2515428c15e7414ba4fc61 ommitted the return\nline for the old synaptics model accidentally. This resulted in a wrong\ncheck, namely, the dimensions are checked for the old devices that don\u0027t\nsupport the query properly.\n\nThis patch adds the return line back.\n\nSigned-off-by: Takashi Iwai \u003ctiwai@suse.de\u003e\nSigned-off-by: Dmitry Torokhov \u003cdtor@mail.ru\u003e\n" }, { "commit": "bcefc8d0d3a0cba9078f519d69f138b93ad30e39", "tree": "45079de6cba248d2ea0f420cddda20f29f386aea", "parents": [ "177dd7e1ebac9420636f155e8d429bc4f809c724", "5cdfa1c3bbabb809ef3134f741a63e13373a8cad" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Tue Jul 13 17:31:11 2010 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Tue Jul 13 17:31:11 2010 -0700" }, "message": "Merge branch \u0027x86-fixes-for-linus\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip\n\n* \u0027x86-fixes-for-linus\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip:\n input: i8042 - add runtime check in x86\u0027s i8042_platform_init\n Revert \"Input: fixup X86_MRST selects\"\n Revert \"Input: do not force selecting i8042 on Moorestown\"\n x86, mrst: Add i8042_detect API for Moorestwon platform\n x86: Add i8042 pre-detection hook to x86_platform_ops\n x86, platform: Export x86_platform to modules\n" }, { "commit": "5099fa7f23d3711538cbe9fe072b4ce1ba814035", "tree": "5c87fe0cf8fc9ec50289f2705a3934a040b58b46", "parents": [ "ff3f011cd859072b5d6e64c0b968cff9bfdc0b37" ], "author": { "name": "Alex Deucher", "email": "alexdeucher@gmail.com", "time": "Mon Jul 12 17:33:50 2010 -0400" }, "committer": { "name": "Dave Airlie", "email": "airlied@redhat.com", "time": "Wed Jul 14 09:08:36 2010 +1000" }, "message": "drm/radeon/kms: fix possible mis-detection of sideport on rs690/rs740\n\nCheck ulBootUpMemoryClock on AMD IGPs.\n\nFix regression noticed by Torsten Kaiser \u003cjust.for.lkml@googlemail.com\u003e\n\nSigned-off-by: Alex Deucher \u003calexdeucher@gmail.com\u003e\nCc: stable@kernel.org\nSigned-off-by: Dave Airlie \u003cairlied@redhat.com\u003e\n" }, { "commit": "33cfe65a786cf3d048688b932f41df937282a7bb", "tree": "2ef48f4b6fdc47c2119661d92f6a41698acabf3e", "parents": [ "f5fa3cb9b790db1c401f4b506d7fcc503771af0d" ], "author": { "name": "Joe Perches", "email": "joe@perches.com", "time": "Mon Jul 12 21:16:04 2010 -0700" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Mon Jul 12 21:16:04 2010 -0700" }, "message": "drivers/sbus: Remove unnecessary casts of private_data\n\nSigned-off-by: Joe Perches \u003cjoe@perches.com\u003e\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "ab83a38958ae7e419f18fabe9b2954a6087bfe0d", "tree": "8d12915d385d55c9cef5c0a878eb9ff6da5a8934", "parents": [ "336a283b9cbe47748ccd68fd8c5158f67cee644b" ], "author": { "name": "Ken Kawasaki", "email": "ken_kawasaki@spring.nifty.jp", "time": "Sat Jul 10 01:18:13 2010 +0000" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Mon Jul 12 20:13:02 2010 -0700" }, "message": "axnet_cs: use spin_lock_irqsave in ax_interrupt\n\nUse spin_lock_irqsave instead of spin_lock in ax_interrupt because\nthe interrupt handler can also be invoked from ei_watchdog.\n\nSigned-off-by: Ken Kawasaki \u003cken_kawasaki@spring.nifty.jp\u003e\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "ff3f011cd859072b5d6e64c0b968cff9bfdc0b37", "tree": "34a77c701187b64ce01a41ef201745ada5c4b86b", "parents": [ "1c5474a65bf15a4cb162dfff86d6d0b5a08a740c" ], "author": { "name": "Alex Deucher", "email": "alexdeucher@gmail.com", "time": "Sat Mar 06 09:43:41 2010 -0500" }, "committer": { "name": "Dave Airlie", "email": "airlied@redhat.com", "time": "Tue Jul 13 11:02:49 2010 +1000" }, "message": "drm/radeon/kms: fix legacy tv-out pal mode\n\nfixes fdo bug 26915\n\nSigned-off-by: Alex Deucher \u003calexdeucher@gmail.com\u003e\nSigned-off-by: Dave Airlie \u003cairlied@redhat.com\u003e\n" }, { "commit": "86a1b9d1f175e9e9d022c7674d6ba1ede48ee15f", "tree": "55d6024d3e84bbabb0544c1bb60189e76c0d8dbb", "parents": [ "f5f05c8a578395a22c190b11eea8e858965abbf7" ], "author": { "name": "Ben Skeggs", "email": "bskeggs@redhat.com", "time": "Thu Jul 01 16:49:57 2010 +1000" }, "committer": { "name": "Dave Airlie", "email": "airlied@redhat.com", "time": "Tue Jul 13 09:20:02 2010 +1000" }, "message": "drm: disable encoder rather than dpms off in drm_crtc_prepare_encoders()\n\nOriginal behaviour will be preserved for drivers that don\u0027t implement\ndisable() hooks for an encoder.\n\nSigned-off-by: Ben Skeggs \u003cbskeggs@redhat.com\u003e\nReviewed-by: Alex Deucher \u003calexdeucher@gmail.com\u003e\nSigned-off-by: Dave Airlie \u003cairlied@redhat.com\u003e\n" }, { "commit": "c4363d6acd8d2ec9156f6469c742351e5d122489", "tree": "4adeb202ec1eb1ca08749e7073c82f7bdb5960ab", "parents": [ "17c99297212a2d1b1779a08caf4b0d83a85545df", "f8036965ccec4d786d8bf09bf57b793542cb3dce" ], "author": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Mon Jul 12 15:17:29 2010 -0700" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Mon Jul 12 15:17:29 2010 -0700" }, "message": "Merge branch \u0027master\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless-2.6\n" }, { "commit": "9f71963702764243d0835b07660ae505b66ca09f", "tree": "cb6b4d3ea8c796fe00d309601c7279aded078906", "parents": [ "293ffa8faa21bbc5e77d3f779d95c4146ee8f709", "5d9955f8a978c1992a0f9966d22c43471214d43b" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Mon Jul 12 14:44:19 2010 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Mon Jul 12 14:44:19 2010 -0700" }, "message": "Merge branch \u0027v4l_for_2.6.35\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/mchehab/linux-2.6\n\n* \u0027v4l_for_2.6.35\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/mchehab/linux-2.6:\n V4L/DVB: uvc: Fix multiple symbols definitions with UVC gadget and host drivers\n V4L/DVB: v4l: mem2mem_testdev: fix g_fmt NULL pointer dereference\n V4L/DVB: uvcvideo: Power line frequency control doesn\u0027t support GET_MIN/MAX/RES\n V4L/DVB: ivtv: Add delay to ensure the decoder always restarts with a blank screen\n V4L/DVB: Documentation: Add the Philips FQ1236 MK5 to video4linux/CARDLIST.tuner\n V4L/DVB: tveeprom: Add an entry for tuner code 168: a TCL M30WTP-4N-E tuner\n V4L/DVB: tuner: Add a definition for the Philips FQ1236 MK5 NTSC tuner\n V4L/DVB: OMAP_VOUT: fix: Module params were not working through bootargs\n V4L/DVB: OMAP_VOUT: fix: Replaced dma-sg with dma-contig\n V4L/DVB: OMAP_VOUT:Build FIX: Rebased against latest DSS2 changes\n" }, { "commit": "293ffa8faa21bbc5e77d3f779d95c4146ee8f709", "tree": "e3783df5039b7a7bfa02d1d61d4afa95c6c6c810", "parents": [ "70aff0ce210f58afa3ed47102532f20834da31b3", "29129a98e6fc892d63bf7b8efcb458a258fe1683" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Mon Jul 12 14:42:21 2010 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Mon Jul 12 14:42:21 2010 -0700" }, "message": "Merge branch \u0027for-linus\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/hid\n\n* \u0027for-linus\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/hid:\n HID: Send Report ID when numbered reports are sent over the control endpoint.\n HID: Enable HID_QUIRK_MULTI_INPUT for Retro Adaptor\n HID: add support for CH Eclipse yoke\n HID: eliminate a double lock in debug code\n HID: ntrig: add support for new firwmare versions\n HID: check for HID_QUIRK_IGNORE during probing\n HID: roccat: fix modules interdependencies\n" }, { "commit": "17c99297212a2d1b1779a08caf4b0d83a85545df", "tree": "496026bacfea9163c0733eb93b7230ce1a73005a", "parents": [ "635f081541edef7644073f9be50ee5bf7c57ce63" ], "author": { "name": "Francois Romieu", "email": "romieu@fr.zoreil.com", "time": "Sun Jul 11 17:10:09 2010 -0700" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Sun Jul 11 17:10:09 2010 -0700" }, "message": "r8169: incorrect identifier for a 8168dp\n\nMerge error.\n\nSee CFG_METHOD_8 (0x3c800000 + 0x00300000) since version 8.002.00\nof Realtek\u0027s driver.\n\nSigned-off-by: Francois Romieu \u003cromieu@fr.zoreil.com\u003e\nCc: Hayes \u003chayeswang@realtek.com\u003e\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "29129a98e6fc892d63bf7b8efcb458a258fe1683", "tree": "846461a57bf8ae779a681d2af6fdd6886bf5c299", "parents": [ "1f45e3249cd4720ab72c3bea82c27162a2d8b577" ], "author": { "name": "Alan Ott", "email": "alan@signal11.us", "time": "Wed Jun 30 09:50:36 2010 -0400" }, "committer": { "name": "Jiri Kosina", "email": "jkosina@suse.cz", "time": "Sun Jul 11 23:13:15 2010 +0200" }, "message": "HID: Send Report ID when numbered reports are sent over the control endpoint.\n\nThe Report ID wasn\u0027t sent as part of the payload for reports which were sent\nover the control endpoint. This is required by section 8.1 of the HID spec.\n\nSigned-off-by: Alan Ott \u003calan@signal11.us\u003e\nSigned-off-by: Jiri Kosina \u003cjkosina@suse.cz\u003e\n" }, { "commit": "5d9955f8a978c1992a0f9966d22c43471214d43b", "tree": "a207631118ed9ae8f7757adabda576ee5923ae97", "parents": [ "b6ae906b04113cb73c1ffe9c42fbcdcb074d9f07" ], "author": { "name": "Laurent Pinchart", "email": "laurent.pinchart@ideasonboard.com", "time": "Sat Jul 10 16:13:05 2010 -0300" }, "committer": { "name": "Mauro Carvalho Chehab", "email": "mchehab@redhat.com", "time": "Sun Jul 11 17:45:10 2010 -0300" }, "message": "V4L/DVB: uvc: Fix multiple symbols definitions with UVC gadget and host drivers\n\nThe UVC gadget driver borrowed code from the UVC host driver without\nchanging the symbol names. This results in a namespace clash with\nmultiple definitions of several symbols when compiling both drivers in\nthe kernel.\n\nMake all generic UVC functions and variables static in the UVC gadget\ndriver, as the symbols are not referenced outside of the gadget driver.\nRename the uvc_trace_param global variable to uvc_gadget_trace_param.\n\nSigned-off-by: Laurent Pinchart \u003claurent.pinchart@ideasonboard.com\u003e\nSigned-off-by: Mauro Carvalho Chehab \u003cmchehab@redhat.com\u003e\n" }, { "commit": "589643be6693c46fbc54bae77745f336c8ed4bcc", "tree": "03c855e34cc86d5e0dc914321698a1d2dfc11f04", "parents": [ "80519bc77b52729ca49b278b67d58715e38b85e9", "faabd47f7e3a36574abcdff0b3506abb092bbe24" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Sun Jul 11 13:35:34 2010 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Sun Jul 11 13:35:34 2010 -0700" }, "message": "Merge branch \u0027hwmon-for-linus\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/jdelvare/staging\n\n* \u0027hwmon-for-linus\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/jdelvare/staging:\n hwmon: Fix autoloading of fschmd on recent Fujitsu machines\n hwmon: (coretemp) Properly label the sensors\n hwmon: (coretemp) Skip duplicate CPU entries\n hwmon: (it87) Fix in7 on IT8720F\n hwmon: (k8temp) Fix temperature reporting for ASB1 processor revisions\n" }, { "commit": "80519bc77b52729ca49b278b67d58715e38b85e9", "tree": "9c6dca32abb277f23a8eb99bfc39997cef42c6c7", "parents": [ "ecd4b48a163b55d7eb4132617100b90d0d2768ec", "102b59c6d6d30fb6560177fd1ae8a34c4c163897" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Sun Jul 11 13:32:55 2010 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Sun Jul 11 13:32:55 2010 -0700" }, "message": "Merge branch \u0027i2c-for-linus\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/jdelvare/staging\n\n* \u0027i2c-for-linus\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/jdelvare/staging:\n i2c/mips: Fix error return codes from Sibyte i2c bus driver\n i2c: Fix probability check\n" } ], "next": "1f45e3249cd4720ab72c3bea82c27162a2d8b577" }