)]}' { "log": [ { "commit": "877fdacf8291d7627f339885b5ae52c2f6061734", "tree": "2bfa23d723deeeb95298f69a83ab44f70dcac96c", "parents": [ "156dadc180a1bd3a25d644ee6c361afc465ccd0e" ], "author": { "name": "Zhenyu Wang", "email": "zhenyuw@linux.intel.com", "time": "Thu Aug 19 09:46:13 2010 +0800" }, "committer": { "name": "Eric Anholt", "email": "eric@anholt.net", "time": "Sat Aug 21 23:24:50 2010 -0700" }, "message": "agp/intel: set 40-bit dma mask on Sandybridge\n\nSigned-off-by: Zhenyu Wang \u003czhenyuw@linux.intel.com\u003e\nSigned-off-by: Eric Anholt \u003ceric@anholt.net\u003e\n" }, { "commit": "156dadc180a1bd3a25d644ee6c361afc465ccd0e", "tree": "2a4e58c0d79d44bddf626c55abe9080432d6f010", "parents": [ "90eb77baaea35c591bd324b31e9eac032bd603c9" ], "author": { "name": "Chris Wilson", "email": "chris@chris-wilson.co.uk", "time": "Sun Aug 15 10:52:34 2010 +0100" }, "committer": { "name": "Eric Anholt", "email": "eric@anholt.net", "time": "Sat Aug 21 23:21:13 2010 -0700" }, "message": "drm/i915: Remove the conflicting BUG_ON()\n\nWe now attempt to free \"active\" objects following a GPU hang as either\nthe GPU will be reset or the hang is permenant. In either case, the GPU\nwrites will not be flushed to main memory and it should be safe to\nreturn that memory back to the system.\n\nThe BUG_ON(active) is thus overkill and can erroneously fire after a\nEIO.\n\nSigned-off-by: Chris Wilson \u003cchris@chris-wilson.co.uk\u003e\nSigned-off-by: Eric Anholt \u003ceric@anholt.net\u003e\n" }, { "commit": "90eb77baaea35c591bd324b31e9eac032bd603c9", "tree": "8dc290a72482fa6cbd4e9695fdb12839ca05433e", "parents": [ "72bcb2690927f04c0479cd0d83825f09f3bf4d4f" ], "author": { "name": "Chris Wilson", "email": "chris@chris-wilson.co.uk", "time": "Sat Aug 14 14:41:23 2010 +0100" }, "committer": { "name": "Eric Anholt", "email": "eric@anholt.net", "time": "Sat Aug 21 23:20:21 2010 -0700" }, "message": "drm/i915/suspend: s/IS_IRONLAKE/HAS_PCH_SPLIT/\n\nFor the shared paths on the next generation chipsets.\n\nSigned-off-by: Chris Wilson \u003cchris@chris-wilson.co.uk\u003e\nSigned-off-by: Eric Anholt \u003ceric@anholt.net\u003e\n" }, { "commit": "72bcb2690927f04c0479cd0d83825f09f3bf4d4f", "tree": "19a53b4d114b896aa03af8da7aa5b11e3546965c", "parents": [ "d5dd96cb280993a6096b42ab082f9cfd9c7ae0bd" ], "author": { "name": "Chris Wilson", "email": "chris@chris-wilson.co.uk", "time": "Sat Aug 14 14:41:22 2010 +0100" }, "committer": { "name": "Eric Anholt", "email": "eric@anholt.net", "time": "Sat Aug 21 23:20:17 2010 -0700" }, "message": "drm/i915/suspend: Flush register writes before busy-waiting.\n\nSigned-off-by: Chris Wilson \u003cchris@chris-wilson.co.uk\u003e\nSigned-off-by: Eric Anholt \u003ceric@anholt.net\u003e\n" }, { "commit": "d5dd96cb280993a6096b42ab082f9cfd9c7ae0bd", "tree": "4cf724533f51284cc00f9a7623c5ef59c6526496", "parents": [ "9d0498a2bf7455159b317f19531a3e5db2ecc9c4" ], "author": { "name": "Dave Airlie", "email": "airlied@redhat.com", "time": "Wed Aug 04 15:52:19 2010 +1000" }, "committer": { "name": "Eric Anholt", "email": "eric@anholt.net", "time": "Sat Aug 21 23:07:04 2010 -0700" }, "message": "i915: disable DAC on Ironlake also when doing CRT load detection.\n\nLike on Sandybridge, disabling the DAC here when doing CRT load detect\navoids forever hangs waiting on the hardware.\n\ntest procedure on HP 2740p:\nboot with no VGA plugged in, start X,\nplug in VGA monitor (1280x1024)\nchvt 3\nmachine hangs waiting forever.\n\nSigned-off-by: Dave Airlie \u003cairlied@redhat.com\u003e\nSigned-off-by: Eric Anholt \u003ceric@anholt.net\u003e\n" }, { "commit": "9d0498a2bf7455159b317f19531a3e5db2ecc9c4", "tree": "41f2a8b1013d2ee12852d8885b9952120f3d6ebb", "parents": [ "d240f20f545fa4ed78ce48d1eb62ab529f2b1467" ], "author": { "name": "Jesse Barnes", "email": "jbarnes@virtuousgeek.org", "time": "Wed Aug 18 13:20:54 2010 -0700" }, "committer": { "name": "Eric Anholt", "email": "eric@anholt.net", "time": "Sat Aug 21 22:59:23 2010 -0700" }, "message": "drm/i915: wait for actual vblank, not just 20ms\n\nWaiting for a hard coded 20ms isn\u0027t always enough to make sure a vblank\nperiod has actually occurred, so add code to make sure we really have\npassed through a vblank period (or that the pipe is off when disabling).\n\nThis prevents problems with mode setting and link training, and seems to\nfix a bug like https://bugs.freedesktop.org/show_bug.cgi?id\u003d29278, but\non an HP 8440p instead. Hopefully also fixes\nhttps://bugs.freedesktop.org/show_bug.cgi?id\u003d29141.\n\nSigned-off-by: Jesse Barnes \u003cjbarnes@virtuousgeek.org\u003e\nSigned-off-by: Eric Anholt \u003ceric@anholt.net\u003e\n" }, { "commit": "d240f20f545fa4ed78ce48d1eb62ab529f2b1467", "tree": "77f410b91940ae2e42cd2b328d538a71bdcbb991", "parents": [ "9cce37f4855a30cc7c364edf18522282782f7ddc" ], "author": { "name": "Jesse Barnes", "email": "jbarnes@virtuousgeek.org", "time": "Fri Aug 13 15:43:26 2010 -0700" }, "committer": { "name": "Jesse Barnes", "email": "jbarnes@virtuousgeek.org", "time": "Wed Aug 18 13:21:50 2010 -0700" }, "message": "drm/i915: make sure eDP PLL is enabled at the right time\n\nWe need to make sure the eDP PLL is enabled before the pipes or planes,\nso do it as part of the DP prepare mode set function.\n\nSigned-off-by: Jesse Barnes \u003cjbarnes@virtuousgeek.org\u003e\n" }, { "commit": "9cce37f4855a30cc7c364edf18522282782f7ddc", "tree": "62727f7142a8b4942895cb9f3cadd7b13b984d6d", "parents": [ "7643a7fa16edf180d593f705f4fa5930c40e8d2d" ], "author": { "name": "Jesse Barnes", "email": "jbarnes@virtuousgeek.org", "time": "Fri Aug 13 15:11:26 2010 -0700" }, "committer": { "name": "Jesse Barnes", "email": "jbarnes@virtuousgeek.org", "time": "Wed Aug 18 13:21:45 2010 -0700" }, "message": "drm/i915: fix VGA plane disable for Ironlake+\n\nWe need to use I/O port instructions to access VGA registers on\nIronlake+, and it doesn\u0027t hurt on other platforms, so switch the VGA\nplane disable function over to using them. Move it to init time as well\nwhile we\u0027re at it, no need to repeatedly disable the VGA plane with\nevery mode set and DPMS event.\n\nSigned-off-by: Jesse Barnes \u003cjbarnes@virtuousgeek.org\u003e\n" }, { "commit": "7643a7fa16edf180d593f705f4fa5930c40e8d2d", "tree": "d1ba775fb61c8344532e77ad51d099068c17c975", "parents": [ "37c6c9b0e941fbb7f37a93d36abaf5fcafea87a8" ], "author": { "name": "Jesse Barnes", "email": "jbarnes@virtuousgeek.org", "time": "Wed Aug 11 10:06:44 2010 -0700" }, "committer": { "name": "Jesse Barnes", "email": "jbarnes@virtuousgeek.org", "time": "Wed Aug 18 13:00:21 2010 -0700" }, "message": "drm/i915: eDP mode set sequence corrections\n\nWe should disable the panel first when shutting down an eDP link. And\nwhen turning one on, the panel needs to be enabled before link training\nor eDP I/O won\u0027t be enabled.\n\nSigned-off-by: Jesse Barnes \u003cjbarnes@virtuousgeek.org\u003e\n" }, { "commit": "37c6c9b0e941fbb7f37a93d36abaf5fcafea87a8", "tree": "e79d565e39575a526cb6714ce1287e8a1fb203f7", "parents": [ "ce17178094f368d9e3f39b2cb4303da5ed633dd4" ], "author": { "name": "Jesse Barnes", "email": "jbarnes@virtuousgeek.org", "time": "Wed Aug 11 10:04:43 2010 -0700" }, "committer": { "name": "Jesse Barnes", "email": "jbarnes@virtuousgeek.org", "time": "Wed Aug 18 12:57:21 2010 -0700" }, "message": "drm/i915: add panel reset workaround\n\nIronlake requires that we clear the reset panel bit during power\nsequences and restore it afterwards. Uncondtionally add code to do that\nsince it should be harmless on SNB+.\n\nSigned-off-by: Jesse Barnes \u003cjbarnes@virtuousgeek.org\u003e\n" }, { "commit": "ce17178094f368d9e3f39b2cb4303da5ed633dd4", "tree": "81b0745ea43d217cea9527ed4f67f12de2ac1b52", "parents": [ "8545423a912cf500009cbadfae57f706cf2b28e8" ], "author": { "name": "Zou Nan hai", "email": "nanhai.zou@intel.com", "time": "Fri Jun 25 13:40:22 2010 +0800" }, "committer": { "name": "Eric Anholt", "email": "eric@anholt.net", "time": "Mon Aug 09 14:13:39 2010 -0700" }, "message": "drm/i915: Enable RC6 on Ironlake.\n\nRC6 allows the GPU to enter a lower power state when the GPU is idle.\n\nSigned-off-by: Zou Nan hai \u003cnanhai.zou@intel.com\u003e\n[anholt: Fixed the !renderctx error path to actually not enable RC6.]\nSigned-off-by: Eric Anholt \u003ceric@anholt.net\u003e\n" }, { "commit": "8545423a912cf500009cbadfae57f706cf2b28e8", "tree": "a1b3adb16dbc824ef9b09f2ec2ec1198a4e11d51", "parents": [ "aa40d6bbb9cf88f3fb296a57e046a52e9a68ab72" ], "author": { "name": "Chris Wilson", "email": "chris@chris-wilson.co.uk", "time": "Sun Aug 08 14:28:23 2010 +0100" }, "committer": { "name": "Eric Anholt", "email": "eric@anholt.net", "time": "Mon Aug 09 14:11:28 2010 -0700" }, "message": "drm/i915/sdvo: Only set is_lvds if we have a valid fixed mode.\n\nIf we have failed to ascertain the fixed mode for the LVDS panel, then\ntrust the pixel clock ranges reported for the connection when determing\nvalid modes. This makes intel_sdvo_mode_valid() consistent with\nintel_lvds_mode_valid() which is also a no-op is there is no fixed mode\ndefined. (Since the mode is both validated by SDVO and LVDS, why are\nchecking against an LVDS fixed mode in SDVO...)\n\nBy only defining is_lvds to be true when we actually have an LVDS output\nwith a fixed mode, we avoid various potential NULL deferences where the\nassumption is made that all LVDS outputs have a fixed mode.\n\nReferences:\n\n Bug 29449 - [Q35] failure to read EDID/vbios for LVDS, no mode \u003d\u003e no output\n https://bugs.freedesktop.org/show_bug.cgi?id\u003d29449\n\nThe primary failure in this bug is not finding the EDID and determining\nthe correct fixed panel mode. However, this patch should fix the\nsecondary issue of not enabling any of the standard modes for the panel\neither.\n\nSigned-off-by: Chris Wilson \u003cchris@chris-wilson.co.uk\u003e\nSigned-off-by: Eric Anholt \u003ceric@anholt.net\u003e\n" }, { "commit": "aa40d6bbb9cf88f3fb296a57e046a52e9a68ab72", "tree": "1e3509cc6d080309414ff430374b5b21e1902d20", "parents": [ "1cafd34731cd14e5a72edaf0f41717c8126cfce9" ], "author": { "name": "Zou Nan hai", "email": "nanhai.zou@intel.com", "time": "Fri Jun 25 13:40:23 2010 +0800" }, "committer": { "name": "Eric Anholt", "email": "eric@anholt.net", "time": "Mon Aug 09 11:34:12 2010 -0700" }, "message": "drm/i915: Set up a render context on Ironlake\n\nRC6 power state requires a logical render context in place for saving\nrender context.\n\nSigned-off-by: Zou Nan hai \u003cnanhai.zou@intel.com\u003e\nSigned-off-by: Eric Anholt \u003ceric@anholt.net\u003e\n" }, { "commit": "1cafd34731cd14e5a72edaf0f41717c8126cfce9", "tree": "1219b47cb285aeae7cbbf1baa7bdd7918b9c4fde", "parents": [ "e78d73b16bcde921c9cf458d2e4de8e4fc2518f3" ], "author": { "name": "Zou Nan hai", "email": "nanhai.zou@intel.com", "time": "Fri Jun 25 13:40:24 2010 +0800" }, "committer": { "name": "Eric Anholt", "email": "eric@anholt.net", "time": "Mon Aug 09 11:28:03 2010 -0700" }, "message": "drm/i915 invalidate indirect state pointers at end of ring exec\n\nThis is required by the spec, and without this some 3D programs will\nhang after resume from RC6 we enable that.\n\nSigned-off-by: Zou Nan hai \u003cnanhai.zou@intel.com\u003e\nSigned-off-by: Eric Anholt \u003ceric@anholt.net\u003e\n" }, { "commit": "e78d73b16bcde921c9cf458d2e4de8e4fc2518f3", "tree": "ce189a9f57f1ef6dc9d3368bd20ac6d566605ad7", "parents": [ "6eeefaf3c86b8937db8ad930c48bfb592fc5e32e" ], "author": { "name": "Chris Wilson", "email": "chris@chris-wilson.co.uk", "time": "Sat Aug 07 14:18:47 2010 +0100" }, "committer": { "name": "Eric Anholt", "email": "eric@anholt.net", "time": "Mon Aug 09 11:24:36 2010 -0700" }, "message": "drm/i915: Wake-up wait_request() from elapsed hang-check (v2)\n\nIf our watchdog fires and we see that the GPU is idle, but that we\nare still waiting on an interrupt, forcibly wake-up the waiter.\n\ni915_do_wait_request() should not be racy, yet there are persistent\nreports that 945GM hangs whilst the GPU is idle. This implies that the\nhardware is not quite as coherent as the documentation claims - a write\nfollowed by a flush is supposed to be coherent in main memory before the\nflush is retired and the irq is emitted. This seems to be a sensible and\nelegant guard to force the wait to timeout.\n\nv2: Daniel Vetter pointed out that a warning would be useful to explain\nwhy the machine appeared to stall.\n\nSigned-off-by: Chris Wilson \u003cchris@chris-wilson.co.uk\u003e\nSigned-off-by: Eric Anholt \u003ceric@anholt.net\u003e\n" }, { "commit": "6eeefaf3c86b8937db8ad930c48bfb592fc5e32e", "tree": "c73c07925f9bc2d23d62271e95fe083a764a3640", "parents": [ "560b85bb750c3c539641993dd508b61260c9e874" ], "author": { "name": "Chris Wilson", "email": "chris@chris-wilson.co.uk", "time": "Sat Aug 07 11:01:39 2010 +0100" }, "committer": { "name": "Eric Anholt", "email": "eric@anholt.net", "time": "Mon Aug 09 11:24:36 2010 -0700" }, "message": "drm/i915: Apply i830 errata for cursor alignment\n\ni830 requires 32bpp cursors to be aligned to 16KB, so we have to expose\nthe alignment parameter to i915_gem_attach_phys_object().\n\nSigned-off-by: Chris Wilson \u003cchris@chris-wilson.co.uk\u003e\nSigned-off-by: Eric Anholt \u003ceric@anholt.net\u003e\n" }, { "commit": "560b85bb750c3c539641993dd508b61260c9e874", "tree": "c38da64b64e8ce03865514bf16cc03d3dcd61d93", "parents": [ "c27ba48e629d2a845f26489fcddc9912673711e7" ], "author": { "name": "Chris Wilson", "email": "chris@chris-wilson.co.uk", "time": "Sat Aug 07 11:01:38 2010 +0100" }, "committer": { "name": "Eric Anholt", "email": "eric@anholt.net", "time": "Mon Aug 09 11:24:36 2010 -0700" }, "message": "drm/i915: Only update i845/i865 CURBASE when disabled (v2)\n\nThe i845 and i865 have a peculiarlity in that CURBASE is not the trigger\nfor the vsync update of the cursor registers but instead the\nmodification of that register is prohibited whilst the cursor is\nenabled. Reorder the write sequence for CURPOS, CURCNTR and CURBASE on\ni845 to i865 to match.\n\nv2: Remove the checks for i845/i865 from within i9xx_cursor_update()\n\nSigned-off-by: Chris Wilson \u003cchris@chris-wilson.co.uk\u003e\nSigned-off-by: Eric Anholt \u003ceric@anholt.net\u003e\n" }, { "commit": "c27ba48e629d2a845f26489fcddc9912673711e7", "tree": "af93d8615001414a403a19aca867307b9b2cf41c", "parents": [ "5ddb954b9ee50824977d2931e0ff58b3050b337d" ], "author": { "name": "Chris Wilson", "email": "chris@chris-wilson.co.uk", "time": "Sat Aug 07 11:01:37 2010 +0100" }, "committer": { "name": "Eric Anholt", "email": "eric@anholt.net", "time": "Mon Aug 09 11:24:35 2010 -0700" }, "message": "drm/i915: FBC is updated within set_base() so remove second call in mode_set()\n\nThe FBC is dependent upon a few details of the framebuffer so it is\nrequired to be updated within set_base(), so remove the redundant call\nfrom mode_set().\n\nSigned-off-by: Chris Wilson \u003cchris@chris-wilson.co.uk\u003e\nSigned-off-by: Eric Anholt \u003ceric@anholt.net\u003e\n" }, { "commit": "5ddb954b9ee50824977d2931e0ff58b3050b337d", "tree": "11812f1a8d79c2a6dedf9091250810f600e74683", "parents": [ "913d8d110078788c14812dce8bb62c37946821d2" ], "author": { "name": "Chris Wilson", "email": "chris@chris-wilson.co.uk", "time": "Sat Aug 07 11:01:36 2010 +0100" }, "committer": { "name": "Eric Anholt", "email": "eric@anholt.net", "time": "Mon Aug 09 11:24:35 2010 -0700" }, "message": "drm/i915/edp: Flush the write before waiting for PLLs\n\nSigned-off-by: Chris Wilson \u003cchris@chris-wilson.co.uk\u003e\nSigned-off-by: Eric Anholt \u003ceric@anholt.net\u003e\n" }, { "commit": "913d8d110078788c14812dce8bb62c37946821d2", "tree": "982a622078194b438bf75d0ee4c77cf1e4f0260e", "parents": [ "dd785e35cb3c430c2290d351e67715864f7e5db5" ], "author": { "name": "Chris Wilson", "email": "chris@chris-wilson.co.uk", "time": "Sat Aug 07 11:01:35 2010 +0100" }, "committer": { "name": "Eric Anholt", "email": "eric@anholt.net", "time": "Mon Aug 09 11:24:35 2010 -0700" }, "message": "drm/i915: Ensure that while(INREG()) are bounded (v2)\n\nAdd a new macro, wait_for, to simplify the act of waiting on a register\nto change state. wait_for() takes three arguments, the condition to\ninspect on every loop, the maximum amount of time to wait and whether to\nyield the cpu for a length of time after each check.\n\nv2: Upgrade failure messages to DRM_ERROR on the suggestion of\nEric Anholt. We do not expect to hit these conditions as they reflect\nprogramming errors, so if we do we want to be notified.\n\nSigned-off-by: Chris Wilson \u003cchris@chris-wilson.co.uk\u003e\nSigned-off-by: Eric Anholt \u003ceric@anholt.net\u003e\n" }, { "commit": "dd785e35cb3c430c2290d351e67715864f7e5db5", "tree": "45b4b4e1b360e49afe53f171109453b89ee92649", "parents": [ "debcaddcbd92387137b87f2c1c640571753915e0" ], "author": { "name": "Chris Wilson", "email": "chris@chris-wilson.co.uk", "time": "Sat Aug 07 11:01:34 2010 +0100" }, "committer": { "name": "Eric Anholt", "email": "eric@anholt.net", "time": "Mon Aug 09 11:24:35 2010 -0700" }, "message": "drm/i915/ringbuffer: Set ring-\u003egem_buffer \u003d NULL on init unwind\n\nThe cleanup path for early abort failed to nullify the gem_buffer. The\nlikely consequence of this is zero, since a failure here should mean\naborting the module load.\n\nSigned-off-by: Chris Wilson \u003cchris@chris-wilson.co.uk\u003e\nSigned-off-by: Eric Anholt \u003ceric@anholt.net\u003e\n" }, { "commit": "debcaddcbd92387137b87f2c1c640571753915e0", "tree": "c03c02892abe03129d09ea91b1c3e63493a80a3c", "parents": [ "862daefcc9a1eb9ff3e4c3d8076c31535f710cf9" ], "author": { "name": "Chris Wilson", "email": "chris@chris-wilson.co.uk", "time": "Sat Aug 07 11:01:33 2010 +0100" }, "committer": { "name": "Eric Anholt", "email": "eric@anholt.net", "time": "Mon Aug 09 11:24:35 2010 -0700" }, "message": "drm/i915: Update watermarks for Ironlake after dpms changes\n\nPreviously, we only remembered to update the watermarks for i9xx, and\nincorrectly assumed that the crtc-\u003eenabled flag was valid at that point\nin the dpms cycle.\n\nNote that on my x201s this makes a SR bug on pipe 1 much easier to hit.\n(Since before this patch when disabling pipe 0, we either didn\u0027t update\nthe watermarks at all, or when we did we still thought we had two pipes\nenabled and so disabled SR.)\n\nReferences:\n\n Bug 28969 - [Arrandale] Screen flickers, suspect Self-Refresh\n https://bugs.freedesktop.org/show_bug.cgi?id\u003d28969\n\nSigned-off-by: Chris Wilson \u003cchris@chris-wilson.co.uk\u003e\nSigned-off-by: Eric Anholt \u003ceric@anholt.net\u003e\n" }, { "commit": "862daefcc9a1eb9ff3e4c3d8076c31535f710cf9", "tree": "daf14cd55ea6a90be57b74e0312c5743d933b16a", "parents": [ "868dc58fbfda73493d62eae353b6b13649550e10" ], "author": { "name": "Chris Wilson", "email": "chris@chris-wilson.co.uk", "time": "Sat Aug 07 11:01:32 2010 +0100" }, "committer": { "name": "Eric Anholt", "email": "eric@anholt.net", "time": "Mon Aug 09 11:24:34 2010 -0700" }, "message": "drm/i915/opregion: Use ASLE response codes defined in 0.1\n\nWithin i915_opregion.c there are two blocks of semantically identical\nASLE response codes defined. Only one of those matches the ACPI IGD\nOpRegion Specification 0.1, use those.\n\nSigned-off-by: Chris Wilson \u003cchris@chris-wilson.co.uk\u003e\nAcked-by: Matthew Garrett \u003cmjg59@srcf.ucam.org\u003e\nSigned-off-by: Eric Anholt \u003ceric@anholt.net\u003e\n" }, { "commit": "868dc58fbfda73493d62eae353b6b13649550e10", "tree": "ce93f40083c5a1b570baa36f8e51db9cfd38c2ac", "parents": [ "ae9fed6b601821d70928797c56da0e2008ef840d" ], "author": { "name": "Chris Wilson", "email": "chris@chris-wilson.co.uk", "time": "Sat Aug 07 11:01:31 2010 +0100" }, "committer": { "name": "Eric Anholt", "email": "eric@anholt.net", "time": "Mon Aug 09 11:24:34 2010 -0700" }, "message": "drm/i915/display: Add pipe/plane information to dpms debugging\n\nSigned-off-by: Chris Wilson \u003cchris@chris-wilson.co.uk\u003e\nSigned-off-by: Eric Anholt \u003ceric@anholt.net\u003e\n" }, { "commit": "ae9fed6b601821d70928797c56da0e2008ef840d", "tree": "36342293eab3bb747e52a5d1ac4157b963400afb", "parents": [ "20a0945951705246278f43641bb13611c030e112" ], "author": { "name": "Chris Wilson", "email": "chris@chris-wilson.co.uk", "time": "Sat Aug 07 11:01:30 2010 +0100" }, "committer": { "name": "Eric Anholt", "email": "eric@anholt.net", "time": "Mon Aug 09 11:24:34 2010 -0700" }, "message": "drm/i915: Truncate the shmem backing pages on purge\n\nshmfs doesn\u0027t actually implement i_ops-\u003etruncate() so we were not\nimmedatiately releasing the backing pages when shrinking the gfx cache\nunder OOM. Instead use a combination of truncate_inode_pages() and\ni_ops-\u003etruncate_range() as is used by shmem_delete_inode().\n\nSigned-off-by: Chris Wilson \u003cchris@chris-wilson.co.uk\u003e\nSigned-off-by: Eric Anholt \u003ceric@anholt.net\u003e\n" }, { "commit": "20a0945951705246278f43641bb13611c030e112", "tree": "89c998fd588361566b3a6ff60c1111dab165c7f9", "parents": [ "1d8e1c75ffa84400758aef9cc59298920b8801f9" ], "author": { "name": "Chris Wilson", "email": "chris@chris-wilson.co.uk", "time": "Sat Aug 07 11:01:29 2010 +0100" }, "committer": { "name": "Eric Anholt", "email": "eric@anholt.net", "time": "Mon Aug 09 11:24:34 2010 -0700" }, "message": "drm/i915: Write to display base last.\n\nWriting to the DSPBASE register triggers the double-buffered update to\nall the control registers, so always write it last in the update\nsequence.\n\nSigned-off-by: Chris Wilson \u003cchris@chris-wilson.co.uk\u003e\nSigned-off-by: Eric Anholt \u003ceric@anholt.net\u003e\n" }, { "commit": "1d8e1c75ffa84400758aef9cc59298920b8801f9", "tree": "c1faa4ad7c8754330edd959d0726b19376cf4f9c", "parents": [ "2e88e40bed136a7b7cb1c77d8dc6bd181d0d2732" ], "author": { "name": "Chris Wilson", "email": "chris@chris-wilson.co.uk", "time": "Sat Aug 07 11:01:28 2010 +0100" }, "committer": { "name": "Eric Anholt", "email": "eric@anholt.net", "time": "Mon Aug 09 11:24:34 2010 -0700" }, "message": "drm/i915: Enable aspect/centering panel fitting for Ironlake.\n\nv2: Hook in DP paths to keep FULLSCREEN panel fitting on eDP.\n\nSigned-off-by: Chris Wilson \u003cchris@chris-wilson.co.uk\u003e\nReviewed-by: Zhenyu Wang \u003czhenyuw@linux.intel.com\u003e\nSigned-off-by: Eric Anholt \u003ceric@anholt.net\u003e\n" }, { "commit": "2e88e40bed136a7b7cb1c77d8dc6bd181d0d2732", "tree": "ff806f10a1018eef4cfb1bc0349ae9291c34c665", "parents": [ "e56660ddfb48ccc6777f31cb235db218e0cf5b83" ], "author": { "name": "Chris Wilson", "email": "chris@chris-wilson.co.uk", "time": "Sat Aug 07 11:01:27 2010 +0100" }, "committer": { "name": "Eric Anholt", "email": "eric@anholt.net", "time": "Mon Aug 09 11:24:33 2010 -0700" }, "message": "drm/i915/sdvo: Markup a few constant strings.\n\nSigned-off-by: Chris Wilson \u003cchris@chris-wilson.co.uk\u003e\nSigned-off-by: Eric Anholt \u003ceric@anholt.net\u003e\n" }, { "commit": "e56660ddfb48ccc6777f31cb235db218e0cf5b83", "tree": "c04a7c145327a557b7b8b8b9762b1ed657a4e17e", "parents": [ "7d1c4804ae98cdee572d7d10d8a5deaa2e686285" ], "author": { "name": "Chris Wilson", "email": "chris@chris-wilson.co.uk", "time": "Sat Aug 07 11:01:26 2010 +0100" }, "committer": { "name": "Eric Anholt", "email": "eric@anholt.net", "time": "Mon Aug 09 11:24:33 2010 -0700" }, "message": "drm/i915: Record error batch buffers using iomem\n\nDirectly read the GTT mapping for the contents of the batch buffers\nrather than relying on possibly stale CPU caches. Also for completeness\nscan the flushing/inactive lists for the current buffers - we are\ncollecting error state after all.\n\nSigned-off-by: Chris Wilson \u003cchris@chris-wilson.co.uk\u003e\nSigned-off-by: Eric Anholt \u003ceric@anholt.net\u003e\n" }, { "commit": "7d1c4804ae98cdee572d7d10d8a5deaa2e686285", "tree": "c87257e17ac1b052931fab77019503bac2176c27", "parents": [ "cd377ea93f34cbd6ec49c868b66a5a7ab184775c" ], "author": { "name": "Chris Wilson", "email": "chris@chris-wilson.co.uk", "time": "Sat Aug 07 21:45:03 2010 +0100" }, "committer": { "name": "Eric Anholt", "email": "eric@anholt.net", "time": "Mon Aug 09 11:24:33 2010 -0700" }, "message": "drm/i915: Maintain LRU order of inactive objects upon access by CPU (v2)\n\nIn order to reduce the penalty of fallbacks under memory pressure and to\navoid a potential immediate ping-pong of evicting a mmaped buffer, we\nmove the object to the tail of the inactive list when a page is freshly\nfaulted or the object is moved into the CPU domain.\n\nWe choose not to protect the CPU objects from casual eviction,\npreferring to keep the GPU active for as long as possible.\n\nv2: Daniel Vetter found a bug where I forgot that pinned objects are\nkept off the inactive list.\n\nSigned-off-by: Chris Wilson \u003cchris@chris-wilson.co.uk\u003e\nSigned-off-by: Eric Anholt \u003ceric@anholt.net\u003e\n" }, { "commit": "cd377ea93f34cbd6ec49c868b66a5a7ab184775c", "tree": "2a9a09f5b41ca61150a924925269141b75112244", "parents": [ "b47eb4a2b302f33adaed2a27d2b3bfc74fe35ac5" ], "author": { "name": "Chris Wilson", "email": "chris@chris-wilson.co.uk", "time": "Sat Aug 07 11:01:24 2010 +0100" }, "committer": { "name": "Eric Anholt", "email": "eric@anholt.net", "time": "Mon Aug 09 11:24:32 2010 -0700" }, "message": "drm/i915: Implement fair lru eviction across both rings. (v2)\n\nBased in a large part upon Daniel Vetter\u0027s implementation and adapted\nfor handling multiple rings in a single pass.\n\nThis should lead to better gtt usage and fixes the page-fault-of-doom\ntriggered. The fairness is provided by scanning through the GTT space\namalgamating space in rendering order. As soon as we have a contiguous\nspace in the GTT large enough for the new object (and its alignment),\nevict any object which lies within that space. This should keep more\nobjects resident in the GTT.\n\nDoing throughput testing on a PineView machine with cairo-perf-trace\nindicates that there is very little difference with the new LRU scan,\nperhaps a small improvement... Except oddly for the poppler trace.\n\nReference:\n\n Bug 15911 - Intermittent X crash (freeze)\n https://bugzilla.kernel.org/show_bug.cgi?id\u003d15911\n\n Bug 20152 - cannot view JPG in firefox when running UXA\n https://bugs.freedesktop.org/show_bug.cgi?id\u003d20152\n\n Bug 24369 - Hang when scrolling firefox page with window in front\n https://bugs.freedesktop.org/show_bug.cgi?id\u003d24369\n\n Bug 28478 - Intermittent graphics lockups due to overflow/loop\n https://bugs.freedesktop.org/show_bug.cgi?id\u003d28478\n\nv2: Attempt to clarify the logic and order of eviction through the use\nof comments and macros.\n\nSigned-off-by: Chris Wilson \u003cchris@chris-wilson.co.uk\u003e\nReviewed-by: Daniel Vetter \u003cdaniel@ffwll.ch\u003e\nSigned-off-by: Eric Anholt \u003ceric@anholt.net\u003e\n" }, { "commit": "b47eb4a2b302f33adaed2a27d2b3bfc74fe35ac5", "tree": "cf99ac4cf8f54ec8f0a9c99fd821af041c32087a", "parents": [ "6f392d548658a17600da7faaf8a5df25ee5f01f6" ], "author": { "name": "Chris Wilson", "email": "chris@chris-wilson.co.uk", "time": "Sat Aug 07 11:01:23 2010 +0100" }, "committer": { "name": "Eric Anholt", "email": "eric@anholt.net", "time": "Mon Aug 09 11:24:32 2010 -0700" }, "message": "drm/i915: Move the eviction logic to its own file.\n\nThe eviction code is the gnarly underbelly of memory management, and is\nclearer if kept separated from the normal domain management in GEM.\n\nSigned-off-by: Chris Wilson \u003cchris@chris-wilson.co.uk\u003e\nSigned-off-by: Eric Anholt \u003ceric@anholt.net\u003e\n" }, { "commit": "6f392d548658a17600da7faaf8a5df25ee5f01f6", "tree": "f71098d2faa94ca6525862a0ea50e831abcba75a", "parents": [ "0108a3edd5c2e3b150a550d565b6aa1a67c0edbe" ], "author": { "name": "Chris Wilson", "email": "chris@chris-wilson.co.uk", "time": "Sat Aug 07 11:01:22 2010 +0100" }, "committer": { "name": "Eric Anholt", "email": "eric@anholt.net", "time": "Mon Aug 09 11:24:32 2010 -0700" }, "message": "drm/i915: Use a common seqno for all rings.\n\nThis will be used by the eviction logic to maintain fairness between the\nrings.\n\nSigned-off-by: Chris Wilson \u003cchris@chris-wilson.co.uk\u003e\nSigned-off-by: Eric Anholt \u003ceric@anholt.net\u003e\n" }, { "commit": "0108a3edd5c2e3b150a550d565b6aa1a67c0edbe", "tree": "95694d7fdef710345c43dd0d2364eee1377e87d2", "parents": [ "bf1a10923920f56da23a118de2511a72af341d61" ], "author": { "name": "Daniel Vetter", "email": "daniel.vetter@ffwll.ch", "time": "Sat Aug 07 11:01:21 2010 +0100" }, "committer": { "name": "Eric Anholt", "email": "eric@anholt.net", "time": "Mon Aug 09 11:24:32 2010 -0700" }, "message": "drm/i915: prepare for fair lru eviction\n\nThis does two little changes:\n\n- Add an alignment parameter for evict_something. It\u0027s not really great to\n whack a carefully sized hole into the gtt with the wrong alignment.\n Especially since the fallback path is a full evict.\n\n- With the inactive scan stuff we need to evict more that one object, so\n move the unbind call into the helper function that scans for the object\n to be evicted, too. And adjust its name.\n\nNo functional changes in this patch, just preparation.\n\nSigned-Off-by: Daniel Vetter \u003cdaniel.vetter@ffwll.ch\u003e\nSigned-off-by: Chris Wilson \u003cchris@chris-wilson.co.uk\u003e\nSigned-off-by: Eric Anholt \u003ceric@anholt.net\u003e\n" }, { "commit": "bf1a10923920f56da23a118de2511a72af341d61", "tree": "32d01acfdc89a6e29c436b16b79ef319decc5a45", "parents": [ "6ef3d4278034982c13df87c4a51e0445f762d316" ], "author": { "name": "Chris Wilson", "email": "chris@chris-wilson.co.uk", "time": "Sat Aug 07 11:01:20 2010 +0100" }, "committer": { "name": "Eric Anholt", "email": "eric@anholt.net", "time": "Mon Aug 09 11:24:32 2010 -0700" }, "message": "drm/i915: Append the object onto the inactive list on binding.\n\nIn order to properly track bound objects, they need to exist on one of\nthe inactive/active lists or be pinned. As this is a requirement, do the\nwork inside i915_gem_bind_to_gtt() rather than dotted around the\ncallsites.\n\nSigned-off-by: Chris Wilson \u003cchris@chris-wilson.co.uk\u003e\nSigned-off-by: Eric Anholt \u003ceric@anholt.net\u003e\n" }, { "commit": "6ef3d4278034982c13df87c4a51e0445f762d316", "tree": "bb67e30d7898a1024d68b5bce4e526b40a2807fd", "parents": [ "dbd7ac9661ba321fe9c1f1b7cb5f4471a6e59570" ], "author": { "name": "Chris Wilson", "email": "chris@chris-wilson.co.uk", "time": "Wed Aug 04 20:26:07 2010 +0100" }, "committer": { "name": "Eric Anholt", "email": "eric@anholt.net", "time": "Mon Aug 09 11:24:31 2010 -0700" }, "message": "drm/i915: Capture the overlay status upon a GPU hang.\n\nv2: Add the interrupt status and address.\n\nSigned-off-by: Chris Wilson \u003cchris@chris-wilson.co.uk\u003e\nReviewed-by: Daniel Vetter \u003cdaniel.vetter@ffwll.ch\u003e\nSigned-off-by: Eric Anholt \u003ceric@anholt.net\u003e\n" }, { "commit": "dbd7ac9661ba321fe9c1f1b7cb5f4471a6e59570", "tree": "4debc70872b448e8cfc609593e6aae448afd254c", "parents": [ "e898cd221db65273bfc102fa20e4e228e0b8c7e1" ], "author": { "name": "Chris Wilson", "email": "chris@chris-wilson.co.uk", "time": "Wed Aug 04 15:18:15 2010 +0100" }, "committer": { "name": "Eric Anholt", "email": "eric@anholt.net", "time": "Mon Aug 09 11:24:31 2010 -0700" }, "message": "drm/i915: Use an uncommon name for the local dev_priv in macros\n\nUsing dev_priv__ avoids sparse complaining about shadowed variables in\nthe *LP_RING() macros.\n\nSigned-off-by: Chris Wilson \u003cchris@chris-wilson.co.uk\u003e\nSigned-off-by: Eric Anholt \u003ceric@anholt.net\u003e\n" }, { "commit": "e898cd221db65273bfc102fa20e4e228e0b8c7e1", "tree": "6b52e7221bae61610f3f6d4103e182edc3c6b1a3", "parents": [ "d97ed3396399126cfca1e12e2b2e2d8bbc4924e5" ], "author": { "name": "Chris Wilson", "email": "chris@chris-wilson.co.uk", "time": "Wed Aug 04 15:18:14 2010 +0100" }, "committer": { "name": "Eric Anholt", "email": "eric@anholt.net", "time": "Mon Aug 09 11:24:31 2010 -0700" }, "message": "drm/i915: Inline ringbuffer_emit()\n\nAs the function has been reduced to a store plus increment, the body is\nnow smaller than the call so inline it.\n\nSigned-off-by: Chris Wilson \u003cchris@chris-wilson.co.uk\u003e\nSigned-off-by: Eric Anholt \u003ceric@anholt.net\u003e\n" }, { "commit": "d97ed3396399126cfca1e12e2b2e2d8bbc4924e5", "tree": "831529a147ec7cd85ae080e415a84b351af574fe", "parents": [ "1741dd4aa7552055659bf74ab829a21579407f10" ], "author": { "name": "Chris Wilson", "email": "chris@chris-wilson.co.uk", "time": "Wed Aug 04 15:18:13 2010 +0100" }, "committer": { "name": "Eric Anholt", "email": "eric@anholt.net", "time": "Mon Aug 09 11:24:31 2010 -0700" }, "message": "drm/i915: Move ringbuffer accounting to begin/advance.\n\nAs we check that the ringbuffer will not wrap upon emission, we do not\nneed to check that incrementing the tail wrapped every time. However, we\ndo upon advancing just in case the tail is now pointing at the very end\nof the ring.\n\nLikewise we can account for the space used during emission in begin()\nand avoid decrementing it for every emit.\n\nSigned-off-by: Chris Wilson \u003cchris@chris-wilson.co.uk\u003e\nSigned-off-by: Eric Anholt \u003ceric@anholt.net\u003e\n" }, { "commit": "1741dd4aa7552055659bf74ab829a21579407f10", "tree": "906fe978285f21f221036e60afa6cb552520bf27", "parents": [ "ae7d49d879fd196bded306e9465e0aa5a203e971" ], "author": { "name": "Chris Wilson", "email": "chris@chris-wilson.co.uk", "time": "Wed Aug 04 15:18:12 2010 +0100" }, "committer": { "name": "Eric Anholt", "email": "eric@anholt.net", "time": "Mon Aug 09 11:24:31 2010 -0700" }, "message": "drm/i915: Unroll wrapping of the ringbuffer.\n\nThe tail is quadword aligned, so we can add two MI_NOOP as a time.\n\nSigned-off-by: Chris Wilson \u003cchris@chris-wilson.co.uk\u003e\nSigned-off-by: Eric Anholt \u003ceric@anholt.net\u003e\n" }, { "commit": "ae7d49d879fd196bded306e9465e0aa5a203e971", "tree": "40bb7a541a38fade186a1ea8dadb94f525584a62", "parents": [ "87f8ebf309b2df69b57be96bf36d2d61009fd296" ], "author": { "name": "Chris Wilson", "email": "chris@chris-wilson.co.uk", "time": "Wed Aug 04 12:37:41 2010 +0100" }, "committer": { "name": "Eric Anholt", "email": "eric@anholt.net", "time": "Mon Aug 09 11:24:30 2010 -0700" }, "message": "drm/i915: Emit a backtrace if we attempt to rebind a pinned buffer\n\nThis debugging trace was useful for finding the fbcon regression on\ni965, and it may prove useful again in future.\n\nSigned-off-by: Chris Wilson \u003cchris@chris-wilson.co.uk\u003e\nSigned-off-by: Eric Anholt \u003ceric@anholt.net\u003e\n" }, { "commit": "87f8ebf309b2df69b57be96bf36d2d61009fd296", "tree": "165a58616aa4e6dcf1a825a69cb81d8ae884616f", "parents": [ "6146b3d61925116e3fecce36c2fd873665bd6614" ], "author": { "name": "Chris Wilson", "email": "chris@chris-wilson.co.uk", "time": "Wed Aug 04 12:24:42 2010 +0100" }, "committer": { "name": "Eric Anholt", "email": "eric@anholt.net", "time": "Mon Aug 09 11:24:30 2010 -0700" }, "message": "drm/i915: Disable the cursor for DPMS_OFF\n\nThe comments have long desired that we should switch off the cursor\nalong with the display plane, make it so.\n\nSigned-off-by: Chris Wilson \u003cchris@chris-wilson.co.uk\u003e\nSigned-off-by: Eric Anholt \u003ceric@anholt.net\u003e\n" }, { "commit": "6146b3d61925116e3fecce36c2fd873665bd6614", "tree": "ab3993e2ce1503fdd0926e14e342ad5b09d37d58", "parents": [ "69d0b96c095468526009cb3104eee561c9252a84" ], "author": { "name": "Daniel Vetter", "email": "daniel.vetter@ffwll.ch", "time": "Wed Aug 04 21:22:10 2010 +0200" }, "committer": { "name": "Eric Anholt", "email": "eric@anholt.net", "time": "Mon Aug 09 11:24:30 2010 -0700" }, "message": "drm/i915: i8xx also doesn\u0027t like multiple oustanding pageflips\n\nMy i855GM suffers from a 80k/s interrupt storm without this.\nSo add 2nd gen to the list of things that don\u0027t like more than\none outstanding pageflip request.\n\nFurthermore I\u0027ve changed the busy loop into a ringbuffer wait.\nBusy-loops that don\u0027t check whether the chip died are simply evil.\nAnd performance should actually improve, because there\u0027s usually\na decent amount of rendering queued on the gpu, hopefully rendering\nthat MI_WAIT into a noop by the time it\u0027s executed.\n\nThe current code holds dev-\u003estruct_mutex while executing this loop,\nhence stalling all other gem activity anyway.\n\nSigned-off-by: Daniel Vetter \u003cdaniel.vetter@ffwll.ch\u003e\nCc: stable@kernel.org\nReviewed-by: Jesse Barnes \u003cjbarnes@virtuousgeek.org\u003e\n[anholt: resolved against conflict]\nSigned-off-by: Eric Anholt \u003ceric@anholt.net\u003e\n" }, { "commit": "69d0b96c095468526009cb3104eee561c9252a84", "tree": "4589586a0d5a86174cfe13ee5976ef179dbca037", "parents": [ "0be555b66a871d711a89c301b37e763058d34d33" ], "author": { "name": "Daniel Vetter", "email": "daniel.vetter@ffwll.ch", "time": "Wed Aug 04 21:22:09 2010 +0200" }, "committer": { "name": "Eric Anholt", "email": "eric@anholt.net", "time": "Mon Aug 09 11:24:30 2010 -0700" }, "message": "drm/i915: fixup pageflip ringbuffer commands for i8xx\n\nAdd a new path for 2nd gen chips that uses the commands for i81x\nchips (where public docs do exist) augmented with the plane bits\nfrom i915. It seems to work and doesn\u0027t result in a black screen\nlike before.\n\nSigned-off-by: Daniel Vetter \u003cdaniel.vetter@ffwll.ch\u003e\nCc: stable@kernel.org\n[anholt: resolved against conflict]\nReviewed-by: Jesse Barnes \u003cjbarnes@virtuousgeek.org\u003e\nSigned-off-by: Eric Anholt \u003ceric@anholt.net\u003e\n" }, { "commit": "0be555b66a871d711a89c301b37e763058d34d33", "tree": "0ffba3830fa95017b499b109d2a03a1a67af0b9f", "parents": [ "403c89ff3960c540ac4d203035078f82082411cb" ], "author": { "name": "Chris Wilson", "email": "chris@chris-wilson.co.uk", "time": "Wed Aug 04 15:36:30 2010 +0100" }, "committer": { "name": "Eric Anholt", "email": "eric@anholt.net", "time": "Mon Aug 09 11:24:30 2010 -0700" }, "message": "drm/i915: report all active objects as busy\n\nIncorporates a similar patch by Daniel Vetter, the alteration being to\nreport the current busy state after retiring.\n\nSigned-off-by: Chris Wilson \u003cchris@chris-wilson.co.uk\u003e\nSigned-off-by: Daniel Vetter \u003cdaniel.vetter@ffwll.ch\u003e\nSigned-off-by: Eric Anholt \u003ceric@anholt.net\u003e\n" }, { "commit": "403c89ff3960c540ac4d203035078f82082411cb", "tree": "61b6531c28dad306aac4e25e591babeec8d577d9", "parents": [ "88f356b725c8a18c4da3ee0b6dcbc647418268f2" ], "author": { "name": "Chris Wilson", "email": "chris@chris-wilson.co.uk", "time": "Wed Aug 04 15:25:31 2010 +0100" }, "committer": { "name": "Eric Anholt", "email": "eric@anholt.net", "time": "Mon Aug 09 11:24:29 2010 -0700" }, "message": "drm/i915: Mark the static memory latency tables const.\n\nSigned-off-by: Chris Wilson \u003cchris@chris-wilson.co.uk\u003e\nSigned-off-by: Eric Anholt \u003ceric@anholt.net\u003e\n" }, { "commit": "88f356b725c8a18c4da3ee0b6dcbc647418268f2", "tree": "a87dc23ec8370579c3a8c341b52f22033501e49f", "parents": [ "e044218a8ecb560b6fad65912a4e7e509db40414" ], "author": { "name": "Chris Wilson", "email": "chris@chris-wilson.co.uk", "time": "Wed Aug 04 13:55:32 2010 +0100" }, "committer": { "name": "Eric Anholt", "email": "eric@anholt.net", "time": "Mon Aug 09 11:24:29 2010 -0700" }, "message": "drm/i915: Only emit flushes on active rings.\n\nThis avoids the excess flush and requests on idle rings (and spamming\nthe debug log ;-)\n\nSigned-off-by: Chris Wilson \u003cchris@chris-wilson.co.uk\u003e\nSigned-off-by: Eric Anholt \u003ceric@anholt.net\u003e\n" }, { "commit": "e044218a8ecb560b6fad65912a4e7e509db40414", "tree": "db1ade3dedc4a2dd20662e6150eb2361e4a775b8", "parents": [ "c55217064eb728fc9348de781979b533e7cc116c" ], "author": { "name": "Chris Wilson", "email": "chris@chris-wilson.co.uk", "time": "Wed Aug 04 13:50:29 2010 +0100" }, "committer": { "name": "Eric Anholt", "email": "eric@anholt.net", "time": "Mon Aug 09 11:24:29 2010 -0700" }, "message": "drm/i915/sdvo: Add dot crawl property\n\nThis property is slightly unusual in that it is a boolean and so has no\nGET_MAX command.\n\nReference:\n\n Bug 28636 - missing TV parameter \"Dot Crawl freeze\"\n https://bugs.freedesktop.org/show_bug.cgi?id\u003d28636\n\nSigned-off-by: Chris Wilson \u003cchris@chris-wilson.co.uk\u003e\nSigned-off-by: Eric Anholt \u003ceric@anholt.net\u003e\n" }, { "commit": "c55217064eb728fc9348de781979b533e7cc116c", "tree": "7bb21d6228b34655d29a7bbc287e64e24033244c", "parents": [ "fcc8d6721cef2158398139d66cc99b5e843126a0" ], "author": { "name": "Chris Wilson", "email": "chris@chris-wilson.co.uk", "time": "Wed Aug 04 13:50:28 2010 +0100" }, "committer": { "name": "Eric Anholt", "email": "eric@anholt.net", "time": "Mon Aug 09 11:24:29 2010 -0700" }, "message": "drm/i915/sdvo: Add missing TV filters\n\nReference:\n\n Bug 28634 - missing TV parameter \"Flicker Filter\"\n https://bugs.freedesktop.org/show_bug.cgi?id\u003d28634\n\nSigned-off-by: Chris Wilson \u003cchris@chris-wilson.co.uk\u003e\nSigned-off-by: Eric Anholt \u003ceric@anholt.net\u003e\n" }, { "commit": "fcc8d6721cef2158398139d66cc99b5e843126a0", "tree": "9518840ff67d41c362a92ab88851a0e9eb8dcf67", "parents": [ "400397506f96466a7f57911b33b4b9c075880994" ], "author": { "name": "Chris Wilson", "email": "chris@chris-wilson.co.uk", "time": "Wed Aug 04 13:50:27 2010 +0100" }, "committer": { "name": "Eric Anholt", "email": "eric@anholt.net", "time": "Mon Aug 09 11:24:29 2010 -0700" }, "message": "drm/i915/sdvo: Check for allocation failure when constructing properties\n\nSigned-off-by: Chris Wilson \u003cchris@chris-wilson.co.uk\u003e\nSigned-off-by: Eric Anholt \u003ceric@anholt.net\u003e\n" }, { "commit": "400397506f96466a7f57911b33b4b9c075880994", "tree": "94b61d8434b2d0f9ab205a1aa98602bbda248169", "parents": [ "32aad86fe88e7323d4fc5e9e423abcee0d55a03d" ], "author": { "name": "Chris Wilson", "email": "chris@chris-wilson.co.uk", "time": "Wed Aug 04 13:50:26 2010 +0100" }, "committer": { "name": "Eric Anholt", "email": "eric@anholt.net", "time": "Mon Aug 09 11:24:29 2010 -0700" }, "message": "drm/i915/sdvo: Use an integer mapping for supported tv format modes\n\nSigned-off-by: Chris Wilson \u003cchris@chris-wilson.co.uk\u003e\nSigned-off-by: Eric Anholt \u003ceric@anholt.net\u003e\n" }, { "commit": "32aad86fe88e7323d4fc5e9e423abcee0d55a03d", "tree": "e0cc3fd5d4fd9df21c8e480c13679f17ac81577b", "parents": [ "615fb93f6d99cce2ab36dcf09986e321e17c356f" ], "author": { "name": "Chris Wilson", "email": "chris@chris-wilson.co.uk", "time": "Wed Aug 04 13:50:25 2010 +0100" }, "committer": { "name": "Eric Anholt", "email": "eric@anholt.net", "time": "Mon Aug 09 11:24:28 2010 -0700" }, "message": "drm/i915/sdvo: Propagate errors from reading/writing control bus.\n\nSigned-off-by: Chris Wilson \u003cchris@chris-wilson.co.uk\u003e\nSigned-off-by: Eric Anholt \u003ceric@anholt.net\u003e\n" }, { "commit": "615fb93f6d99cce2ab36dcf09986e321e17c356f", "tree": "e3c614917bfc39df6f029d335bc62edbc281c959", "parents": [ "ea5b213ad4b161463e76b63dbb115ea20e2200f0" ], "author": { "name": "Chris Wilson", "email": "chris@chris-wilson.co.uk", "time": "Wed Aug 04 13:50:24 2010 +0100" }, "committer": { "name": "Eric Anholt", "email": "eric@anholt.net", "time": "Mon Aug 09 11:24:28 2010 -0700" }, "message": "drm/i915: Subclass intel_connector.\n\nMake the code that tiny bit clearer by reducing the pointer dance.\n\n2 files changed, 130 insertions(+), 147 deletions(-)\n\nSigned-off-by: Chris Wilson \u003cchris@chris-wilson.co.uk\u003e\nSigned-off-by: Eric Anholt \u003ceric@anholt.net\u003e\n" }, { "commit": "ea5b213ad4b161463e76b63dbb115ea20e2200f0", "tree": "b6d07b00b479fcc3849e0fdc4c98f498aa3645bf", "parents": [ "94113cecaea5067a0f7e1135abbd92cf2c297d42" ], "author": { "name": "Chris Wilson", "email": "chris@chris-wilson.co.uk", "time": "Wed Aug 04 13:50:23 2010 +0100" }, "committer": { "name": "Eric Anholt", "email": "eric@anholt.net", "time": "Mon Aug 09 11:24:28 2010 -0700" }, "message": "drm/i915: Subclass intel_encoder.\n\nSubclass intel_encoder to reduce the pointer dance through\nintel_encoder-\u003edev_priv.\n\n10 files changed, 896 insertions(+), 997 deletions(-)\n\nSigned-off-by: Chris Wilson \u003cchris@chris-wilson.co.uk\u003e\nSigned-off-by: Eric Anholt \u003ceric@anholt.net\u003e\n" }, { "commit": "94113cecaea5067a0f7e1135abbd92cf2c297d42", "tree": "b787ce0cc0da9d3af7e2e1b80e73331f30e63f5e", "parents": [ "3e33d94df7f5c94adb09139b5d816a248d703a36" ], "author": { "name": "Chris Wilson", "email": "chris@chris-wilson.co.uk", "time": "Wed Aug 04 11:25:21 2010 +0100" }, "committer": { "name": "Eric Anholt", "email": "eric@anholt.net", "time": "Mon Aug 09 11:24:28 2010 -0700" }, "message": "drm/i915: Do not clobber the contents of TRANS_DP_CTL when enabling.\n\nSigned-off-by: Chris Wilson \u003cchris@chris-wilson.co.uk\u003e\nSigned-off-by: Eric Anholt \u003ceric@anholt.net\u003e\n" }, { "commit": "3e33d94df7f5c94adb09139b5d816a248d703a36", "tree": "6c5d7f39d9c73d5a6db5b777d9a06156ef8f78ba", "parents": [ "45d7f32c7a43cbb9592886d38190e379e2eb2226" ], "author": { "name": "Chris Wilson", "email": "chris@chris-wilson.co.uk", "time": "Wed Aug 04 11:17:25 2010 +0100" }, "committer": { "name": "Eric Anholt", "email": "eric@anholt.net", "time": "Mon Aug 09 11:24:27 2010 -0700" }, "message": "drm/i915: Remove useless message when disabling \"Big FIFO\" on PineView\n\nAs we already have appropriate debug and warnings when we activate and\ndeactivate the self-refresh FIFO, having a further INFO is just annoying.\n\nSigned-off-by: Chris Wilson \u003cchris@chris-wilson.co.uk\u003e\nSigned-off-by: Eric Anholt \u003ceric@anholt.net\u003e\n" }, { "commit": "45d7f32c7a43cbb9592886d38190e379e2eb2226", "tree": "ea68b67b1d2127527d856248c0485f2ed7e50088", "parents": [ "53bcef60633086ad73683d01a4ef9ca678484d2d", "ab11b487402f97975f3ac1eeea09c82f4431481e" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Sun Aug 08 10:10:11 2010 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Sun Aug 08 10:10:11 2010 -0700" }, "message": "Merge git://git.kernel.org/pub/scm/linux/kernel/git/cmetcalf/linux-tile\n\n* git://git.kernel.org/pub/scm/linux/kernel/git/cmetcalf/linux-tile:\n arch/tile: check kmalloc() result\n arch/tile: catch up on various minor cleanups.\n arch/tile: avoid erroneous error return for PTRACE_POKEUSR.\n tile: set ARCH_KMALLOC_MINALIGN\n tile: remove homegrown L1_CACHE_ALIGN macro\n arch/tile: Miscellaneous cleanup changes.\n arch/tile: Split the icache flush code off to a generic \u003carch\u003e header.\n arch/tile: Fix bug in support for atomic64_xx() ops.\n arch/tile: Shrink the tile-opcode files considerably.\n arch/tile: Add driver to enable access to the user dynamic network.\n arch/tile: Enable more sophisticated IRQ model for 32-bit chips.\n Move list types from \u003clinux/list.h\u003e to \u003clinux/types.h\u003e.\n Add wait4() back to the set of \u003casm-generic/unistd.h\u003e syscalls.\n Revert adding some arch-specific signal syscalls to \u003clinux/syscalls.h\u003e.\n arch/tile: Do not use GFP_KERNEL for dma_alloc_coherent(). Feedback from fujita.tomonori@lab.ntt.co.jp.\n arch/tile: core support for Tilera 32-bit chips.\n Fix up the \"generic\" unistd.h ABI to be more useful.\n" }, { "commit": "53bcef60633086ad73683d01a4ef9ca678484d2d", "tree": "8b14cc031124d0aa0da6cd3b60115bc7eaa80061", "parents": [ "4fd6c6bf83cb16321e9902b00e2af79054f4e0d6", "85d9865721c62a551547984e6cc8bd3ba732e294" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Sun Aug 08 10:08:26 2010 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Sun Aug 08 10:08:26 2010 -0700" }, "message": "Merge branch \u0027for-linus\u0027 of git://www.jni.nu/cris\n\n* \u0027for-linus\u0027 of git://www.jni.nu/cris: (51 commits)\n CRIS: Fix alignment problem for older ld\n CRIS: Always dump registers for segfaulting process.\n CRIS: Add config for pausing a seg-faulting process\n CRIS: Don\u0027t take faults while in_atomic\n CRIS: Fixup lookup for delay slot faults\n CRIS: Discard exit.text and .data at runtime\n CRIS: Add cache aligned and read mostly data sections\n CRIS: Return something from profile write\n CRIS: Add ARTPEC-3 and timestamps for sync-serial\n CRIS: Better ARTPEC-3 support for gpio\n CRIS: Add include guard\n CRIS: Better handling of pinmux settings\n CRIS: New DMA defines for ARTPEC-3\n CRIS: __do_strncpy_from_user: Don\u0027t read the byte beyond the nil\n CRIS: Pagetable for ARTPEC-3\n CRIS: Machine dependent memmap.h\n CRIS: Check if pointer is set before using it\n CRIS: Machine dependent dma.h\n CRIS: Define __read_mostly for CRISv32\n CRIS: Discard .note.gnu.build-id section\n ...\n" }, { "commit": "4fd6c6bf83cb16321e9902b00e2af79054f4e0d6", "tree": "7153f611af0125336ac0ec22c5cb430fe520edcc", "parents": [ "c5f347579a661c9506e794315f0798b75ef71d35", "84b9414babdc303dde1d3f44cd2a54dffb67ab97" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Sun Aug 08 10:05:57 2010 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Sun Aug 08 10:05:57 2010 -0700" }, "message": "Merge branch \u0027for-linus\u0027 of git://android.kernel.org/kernel/tegra\n\n* \u0027for-linus\u0027 of git://android.kernel.org/kernel/tegra:\n [ARM] tegra: add MAINTAINERS entry\n [ARM] tegra: harmony: Add harmony board file\n [ARM] tegra: add pinmux support\n [ARM] tegra: add GPIO support\n [ARM] tegra: Add timer support\n [ARM] tegra: SMP support\n [ARM] tegra: Add clock support\n [ARM] tegra: Add IRQ support\n [ARM] tegra: initial tegra support\n" }, { "commit": "c5f347579a661c9506e794315f0798b75ef71d35", "tree": "eb900af7a9f758fe775ded478645fcc1ce75328f", "parents": [ "537d84787659b355b3331813dc134c7497ddafa5", "f27098379b1dbfedae99e5b86e10529f799d4071" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Sun Aug 08 10:04:17 2010 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Sun Aug 08 10:04:17 2010 -0700" }, "message": "Merge branch \u0027for-linus\u0027 of git://github.com/schandinat/linux-2.6\n\n* \u0027for-linus\u0027 of git://github.com/schandinat/linux-2.6:\n drivers/video/via/via-gpio.c: fix warning\n viafb: Depends on X86\n fbdev: section cleanup in viafb driver\n viafb: fix accel_flags check_var bug\n viafb: probe cleanups\n viafb: remove ioctls which break the framebuffer interface\n viafb: update fix before calculating depth\n viafb: PLL value cleanup\n viafb: simplify lcd size \"detection\"\n viafb: fix PCI table\n viafb: add lcd scaling support for some IGPs\n viafb: improve lcd code readability\n viafb: remove duplicated scaling code\n MAINTAINERS: update viafb entry\n" }, { "commit": "537d84787659b355b3331813dc134c7497ddafa5", "tree": "e43d376ed8522b09163ed1f7902e1fed25d2fe3b", "parents": [ "d71048e22f47725a5808ea2e4e1e72fa36c1a788", "ece350d3949e9a60b39e4f9853be118e98d48fbc" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Sun Aug 08 10:02:59 2010 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Sun Aug 08 10:02:59 2010 -0700" }, "message": "Merge branch \u0027for-linus\u0027 of git://gitorious.org/linux-omap-dss2/linux\n\n* \u0027for-linus\u0027 of git://gitorious.org/linux-omap-dss2/linux: (64 commits)\n OMAP: DSS2: OMAPFB: add support for FBIO_WAITFORVSYNC\n OMAP: DSS2: Replace strncmp() with sysfs_streq() in overlay_manager_store()\n OMAP: DSS2: Fix error path in omap_dsi_update()\n OMAP: DSS2: TDO35S: fix video signaling\n OMAP: DSS2: OMAPFB: Fix invalid bpp for PAL and NTSC modes\n OMAP: DSS2: OMAPFB: Fix probe error path\n OMAP3EVM: Replace vdvi regulator supply with vdds_dsi\n OMAP: DSS2: Remove extra return statement\n OMAP: DSS2: adjust YUV overlay width to be even\n OMAP: DSS2: OMAPFB: Fix sysfs mirror input check\n OMAP: DSS2: OMAPFB: Remove redundant color register range check\n OMAP: DSS2: OMAPFB: Remove redundant rotate range check\n OMAP: DSS2: OMAPFB: Check fb2display() return value\n OMAP: DSS2: Taal: Optimize enable_te, rotate, mirror when value unchanged\n OMAP: DSS2: DSI: detect unsupported update requests\n OMAP: DSS2: DSI: increase FIFO low threshold\n OMAP: DSS2: DSI: Add error IRQ mask for DSI complexIO\n OMAP: DSS2: DSI: Remove BTA after set_max_rx_packet_size\n OMAP: DSS2: change manual update scaling setup\n OMAP: DSS2: DSI: use BTA to end the frame transfer\n ...\n" }, { "commit": "d71048e22f47725a5808ea2e4e1e72fa36c1a788", "tree": "65debebb2964cb4cbde4d29e15730527d686a540", "parents": [ "44d51a029f95d49c5c7ccd7808f81904c20c3abd", "d21872b3683ff37f73c68993749a6e6aeeaed265" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Sun Aug 08 10:01:46 2010 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Sun Aug 08 10:01:46 2010 -0700" }, "message": "Merge branch \u0027omap-for-linus\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap-2.6\n\n* \u0027omap-for-linus\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap-2.6: (143 commits)\n omap: mailbox: reorganize headers\n omap: mailbox: standarize on \u0027omap-mailbox\u0027\n omap: mailbox: only compile for configured archs\n omap: mailbox: simplify omap_mbox_register()\n omap: mailbox: reorganize registering\n omap: mailbox: add IRQ names\n omap: mailbox: remove unecessary fields\n omap: mailbox: don\u0027t export unecessary symbols\n omap: mailbox: update omap1 probing\n omap: mailbox: use correct config for omap1\n omap: mailbox: 2420 should be detected at run-time\n omap: mailbox: reorganize structures\n omap: mailbox: trivial cleanups\n omap mailbox: Set a device in logical mbox instance for traceability\n omap: mailbox: convert block api to kfifo\n omap: mailbox: remove (un)likely macros from cold paths\n omap: mailbox cleanup: split MODULE_AUTHOR line\n omap: mailbox: convert rwlocks to spinlock\n Mailbox: disable mailbox interrupt when request queue\n Mailbox: new mutext lock for h/w mailbox configuration\n ...\n" }, { "commit": "44d51a029f95d49c5c7ccd7808f81904c20c3abd", "tree": "41b82695b3bfb73b4146809546c2d79d6eaa4c47", "parents": [ "2d53056973079e6c2ffc0d7ae3afbdd3d4f18ae3", "cce3dddb87e4b72b1787527eec6826a43a562e71" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Sun Aug 08 10:00:55 2010 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Sun Aug 08 10:00:55 2010 -0700" }, "message": "Merge branch \u0027davinci-for-linus\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/khilman/linux-davinci\n\n* \u0027davinci-for-linus\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/khilman/linux-davinci:\n davinci: dm646x EVM: Specify reserved EDMA channel/slots\n davinci: da8xx/omapl EVM: Specify reserved channels/slots\n davinci: support for EDMA resource sharing\n davinci: edma: provide ability to detect insufficient CC info data\n davinci: da8xx: sparse cleanup: remove duplicate entries in irq priorities\n davinci: DM365: fixed second serial port\n Davinci: tnetv107x evm board initial support\n Davinci: tnetv107x initial gpio support\n Davinci: tnetv107x soc support\n Davinci: tnetv107x decompresser uart definitions\n Davinci: generalized debug macros\n" }, { "commit": "2d53056973079e6c2ffc0d7ae3afbdd3d4f18ae3", "tree": "e921596d80cd0a6434629dbd8d22c0ca3ec14b88", "parents": [ "9e50ab91d025afc17ca14a1764be2e1d0c24245d", "e78483c5aeb0d7fbb0e365802145f1045e62957e" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Sat Aug 07 17:09:24 2010 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Sat Aug 07 17:09:24 2010 -0700" }, "message": "Merge branch \u0027for-linus\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/ieee1394/linux1394-2.6\n\n* \u0027for-linus\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/ieee1394/linux1394-2.6: (82 commits)\n firewire: core: add forgotten dummy driver methods, remove unused ones\n firewire: add isochronous multichannel reception\n firewire: core: small clarifications in core-cdev\n firewire: core: remove unused code\n firewire: ohci: release channel in error path\n firewire: ohci: use memory barriers to order descriptor updates\n tools/firewire: nosy-dump: increment program version\n tools/firewire: nosy-dump: remove unused code\n tools/firewire: nosy-dump: use linux/firewire-constants.h\n tools/firewire: nosy-dump: break up a deeply nested function\n tools/firewire: nosy-dump: make some symbols static or const\n tools/firewire: nosy-dump: change to kernel coding style\n tools/firewire: nosy-dump: work around segfault in decode_fcp\n tools/firewire: nosy-dump: fix it on x86-64\n tools/firewire: add userspace front-end of nosy\n firewire: nosy: note ioctls in ioctl-number.txt\n firewire: nosy: use generic printk macros\n firewire: nosy: endianess fixes and annotations\n firewire: nosy: annotate __user pointers and __iomem pointers\n firewire: nosy: fix device shutdown with active client\n ...\n" }, { "commit": "9e50ab91d025afc17ca14a1764be2e1d0c24245d", "tree": "2647ef3fed12810ef88eb77e05bb7c3b2ea49d56", "parents": [ "3cc08fc35db75b059118626c30b60b0f56583802", "a0d468718b9049f7396d101075a129a2d683ad66" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Sat Aug 07 17:08:30 2010 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Sat Aug 07 17:08:30 2010 -0700" }, "message": "Merge branch \u0027acpica\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/lenb/linux-acpi-2.6\n\n* \u0027acpica\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/lenb/linux-acpi-2.6: (27 commits)\n ACPI / ACPICA: Simplify acpi_ev_initialize_gpe_block()\n ACPI / ACPICA: Fail acpi_gpe_wakeup() if ACPI_GPE_CAN_WAKE is unset\n ACPI / ACPICA: Do not execute _PRW methods during initialization\n ACPI: Fix bogus GPE test in acpi_bus_set_run_wake_flags()\n ACPICA: Update version to 20100702\n ACPICA: Fix for Alias references within Package objects\n ACPICA: Fix lint warning for 64-bit constant\n ACPICA: Remove obsolete GPE function\n ACPICA: Update debug output components\n ACPICA: Add support for WDDT - Watchdog Descriptor Table\n ACPICA: Drop acpi_set_gpe\n ACPICA: Use low-level GPE enable during GPE block initialization\n ACPI / EC: Do not use acpi_set_gpe\n ACPI / EC: Drop suspend and resume routines\n ACPICA: Remove wakeup GPE reference counting which is not used\n ACPICA: Introduce acpi_gpe_wakeup()\n ACPICA: Rename acpi_hw_gpe_register_bit\n ACPICA: Update version to 20100528\n ACPICA: Add signatures for undefined tables: ATKG, GSCI, IEIT\n ACPICA: Optimization: Reduce the number of namespace walks\n ...\n" }, { "commit": "3cc08fc35db75b059118626c30b60b0f56583802", "tree": "704d71199c8be8d5b822ca424675291e8cec7bde", "parents": [ "faa38b5e0e092914764cdba9f83d31a3f794d182", "03b37ecdb3975f09832747600853d3818a50eda3" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Sat Aug 07 17:08:02 2010 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Sat Aug 07 17:08:02 2010 -0700" }, "message": "Merge branch \u0027for-linus\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/roland/infiniband\n\n* \u0027for-linus\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/roland/infiniband: (42 commits)\n IB/qib: Add missing \u003clinux/slab.h\u003e include\n IB/ehca: Drop unnecessary NULL test\n RDMA/nes: Fix confusing if statement indentation\n IB/ehca: Init irq tasklet before irq can happen\n RDMA/nes: Fix misindented code\n RDMA/nes: Fix showing wqm_quanta\n RDMA/nes: Get rid of \"set but not used\" variables\n RDMA/nes: Read firmware version from correct place\n IB/srp: Export req_lim via sysfs\n IB/srp: Make receive buffer handling more robust\n IB/srp: Use print_hex_dump()\n IB: Rename RAW_ETY to RAW_ETHERTYPE\n RDMA/nes: Fix two sparse warnings\n RDMA/cxgb3: Make needlessly global iwch_l2t_send() static\n IB/iser: Make needlessly global iser_alloc_rx_descriptors() static\n RDMA/cxgb4: Add timeouts when waiting for FW responses\n IB/qib: Fix race between qib_error_qp() and receive packet processing\n IB/qib: Limit the number of packets processed per interrupt\n IB/qib: Allow writes to the diag_counters to be able to clear them\n IB/qib: Set cfgctxts to number of CPUs by default\n ...\n" }, { "commit": "faa38b5e0e092914764cdba9f83d31a3f794d182", "tree": "b3e5921bdc36378033b4910eb4f29cb0dfc486e0", "parents": [ "78417334b5cb6e1f915b8fdcc4fce3f1a1b4420c", "74bf40f0793fed9e01eb6164c2ce63e8c27ca205" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Sat Aug 07 17:07:31 2010 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Sat Aug 07 17:07:31 2010 -0700" }, "message": "Merge branch \u0027for-linus\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound-2.6\n\n* \u0027for-linus\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound-2.6: (214 commits)\n ALSA: hda - Add pin-fix for HP dc5750\n ALSA: als4000: Fix potentially invalid DMA mode setup\n ALSA: als4000: enable burst mode\n ALSA: hda - Fix initial capsrc selection in patch_alc269()\n ASoC: TWL4030: Capture route runtime DAPM ordering fix\n ALSA: hda - Add PC-beep whitelist for an Intel board\n ALSA: hda - More relax for pending period handling\n ALSA: hda - Define AC_FMT_* constants\n ALSA: hda - Fix beep frequency on IDT 92HD73xx and 92HD71Bxx codecs\n ALSA: hda - Add support for HDMI HBR passthrough\n ALSA: hda - Set Stream Type in Stream Format according to AES0\n ALSA: hda - Fix Thinkpad X300 so SPDIF is not exposed\n ALSA: hda - FIX to not expose SPDIF on Thinkpad X301, since it does not have the ability to use SPDIF\n ASoC: wm9081: fix resource reclaim in wm9081_register error path\n ASoC: wm8978: fix a memory leak if a wm8978_register fail\n ASoC: wm8974: fix a memory leak if another WM8974 is registered\n ASoC: wm8961: fix resource reclaim in wm8961_register error path\n ASoC: wm8955: fix resource reclaim in wm8955_register error path\n ASoC: wm8940: fix a memory leak if wm8940_register return error\n ASoC: wm8904: fix resource reclaim in wm8904_register error path\n ...\n" }, { "commit": "78417334b5cb6e1f915b8fdcc4fce3f1a1b4420c", "tree": "8e3fce9f27fd058904c0a3247a5c5ebb8df9fbe8", "parents": [ "cd816a0d84377c4e87f55cbe934a23417f9f5743", "5f202bd5ca64132cdd7f186656bc0221f257733d" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Sat Aug 07 17:06:54 2010 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Sat Aug 07 17:06:54 2010 -0700" }, "message": "Merge branch \u0027bkl/core\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/frederic/random-tracing\n\n* \u0027bkl/core\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/frederic/random-tracing:\n do_coredump: Do not take BKL\n init: Remove the BKL from startup code\n" }, { "commit": "cd816a0d84377c4e87f55cbe934a23417f9f5743", "tree": "8834341f81dc570f9f255af57ac28041c317226a", "parents": [ "0d9f9e122c74583de15a86d1c660c08dc298f2c8", "a7a387cc596278af1516c534b50cc0bee171129d" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Sat Aug 07 14:28:20 2010 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Sat Aug 07 14:28:20 2010 -0700" }, "message": "Merge branch \u0027for-linus\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/jmorris/security-testing-2.6\n\n* \u0027for-linus\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/jmorris/security-testing-2.6:\n SELINUX: Fix build error.\n" }, { "commit": "0d9f9e122c74583de15a86d1c660c08dc298f2c8", "tree": "a04ad387e231db43db112753fa2eae23754189a9", "parents": [ "df44f9f4f9b5d362b5a2d1c8444fe7e6d4c42653", "998db52c03cd293d16a457f1b396cea932244147" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Sat Aug 07 14:24:41 2010 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Sat Aug 07 14:24:41 2010 -0700" }, "message": "Merge branch \u0027for-2.6.36\u0027 of git://linux-nfs.org/~bfields/linux\n\n* \u0027for-2.6.36\u0027 of git://linux-nfs.org/~bfields/linux: (34 commits)\n nfsd4: fix file open accounting for RDWR opens\n nfsd: don\u0027t allow setting maxblksize after svc created\n nfsd: initialize nfsd versions before creating svc\n net: sunrpc: removed duplicated #include\n nfsd41: Fix a crash when a callback is retried\n nfsd: fix startup/shutdown order bug\n nfsd: minor nfsd read api cleanup\n gcc-4.6: nfsd: fix initialized but not read warnings\n nfsd4: share file descriptors between stateid\u0027s\n nfsd4: fix openmode checking on IO using lock stateid\n nfsd4: miscellaneous process_open2 cleanup\n nfsd4: don\u0027t pretend to support write delegations\n nfsd: bypass readahead cache when have struct file\n nfsd: minor nfsd_svc() cleanup\n nfsd: move more into nfsd_startup()\n nfsd: just keep single lockd reference for nfsd\n nfsd: clean up nfsd_create_serv error handling\n nfsd: fix error handling in __write_ports_addxprt\n nfsd: fix error handling when starting nfsd with rpcbind down\n nfsd4: fix v4 state shutdown error paths\n ...\n" }, { "commit": "df44f9f4f9b5d362b5a2d1c8444fe7e6d4c42653", "tree": "cb27a80199e4730a98ed6fc93411d52df0001d37", "parents": [ "5df6b8e65ad0f2eaee202ff002ac00d1ac605315" ], "author": { "name": "David Howells", "email": "dhowells@redhat.com", "time": "Fri Aug 06 17:26:48 2010 +0100" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Sat Aug 07 14:23:37 2010 -0700" }, "message": "AFS: Fix the module init error handling\n\nFix the module init error handling. There are a bunch of goto labels for\naborting the init procedure at different points and just undoing what needs\nundoing - they aren\u0027t all in the right places, however.\n\nThis can lead to an oops like the following:\n\n\tBUG: unable to handle kernel NULL pointer dereference at 0000000000000020\n\tIP: [\u003cffffffff81042a31\u003e] destroy_workqueue+0x17/0xc0\n\t...\n\tModules linked in: kafs(+) dns_resolver rxkad af_rxrpc fscache\n\n\tPid: 2171, comm: insmod Not tainted 2.6.35-cachefs+ #319 DG965RY/\n\t...\n\tProcess insmod (pid: 2171, threadinfo ffff88003ca6a000, task ffff88003dcc3050)\n\t...\n\tCall Trace:\n\t [\u003cffffffffa0055994\u003e] afs_callback_update_kill+0x10/0x12 [kafs]\n\t [\u003cffffffffa007d1c5\u003e] afs_init+0x190/0x1ce [kafs]\n\t [\u003cffffffffa007d035\u003e] ? afs_init+0x0/0x1ce [kafs]\n\t [\u003cffffffff810001ef\u003e] do_one_initcall+0x59/0x14e\n\t [\u003cffffffff8105f7ee\u003e] sys_init_module+0x9c/0x1de\n\t [\u003cffffffff81001eab\u003e] system_call_fastpath+0x16/0x1b\n\nSigned-off-by: David Howells \u003cdhowells@redhat.com\u003e\nSigned-off-by: Linus Torvalds \u003ctorvalds@linux-foundation.org\u003e\n" }, { "commit": "5df6b8e65ad0f2eaee202ff002ac00d1ac605315", "tree": "2eff6606f8e39dc1fd7eb8a05feb2a9927151805", "parents": [ "fe21ea18c742ab0eb8f6f8ebc543374839a02a87", "3dce9a5c3a39a664e372886ea86c42ae7ae33dfc" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Sat Aug 07 13:19:36 2010 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Sat Aug 07 13:19:36 2010 -0700" }, "message": "Merge branch \u0027nfs-for-2.6.36\u0027 of git://git.linux-nfs.org/projects/trondmy/nfs-2.6\n\n* \u0027nfs-for-2.6.36\u0027 of git://git.linux-nfs.org/projects/trondmy/nfs-2.6: (42 commits)\n NFS: NFSv4.1 is no longer a \"developer only\" feature\n NFS: NFS_V4 is no longer an EXPERIMENTAL feature\n NFS: Fix /proc/mount for legacy binary interface\n NFS: Fix the locking in nfs4_callback_getattr\n SUNRPC: Defer deleting the security context until gss_do_free_ctx()\n SUNRPC: prevent task_cleanup running on freed xprt\n SUNRPC: Reduce asynchronous RPC task stack usage\n SUNRPC: Move the bound cred to struct rpc_rqst\n SUNRPC: Clean up of rpc_bindcred()\n SUNRPC: Move remaining RPC client related task initialisation into clnt.c\n SUNRPC: Ensure that rpc_exit() always wakes up a sleeping task\n SUNRPC: Make the credential cache hashtable size configurable\n SUNRPC: Store the hashtable size in struct rpc_cred_cache\n NFS: Ensure the AUTH_UNIX credcache is allocated dynamically\n NFS: Fix the NFS users of rpc_restart_call()\n SUNRPC: The function rpc_restart_call() should return success/failure\n NFSv4: Get rid of the bogus RPC_ASSASSINATED(task) checks\n NFSv4: Clean up the process of renewing the NFSv4 lease\n NFSv4.1: Handle NFS4ERR_DELAY on SEQUENCE correctly\n NFS: nfs_rename() should not have to flush out writebacks\n ...\n" }, { "commit": "fe21ea18c742ab0eb8f6f8ebc543374839a02a87", "tree": "ce34b75b8b522331425b9c151cdd1e71226e8d9a", "parents": [ "a57f9a3e811cf1246b394f0cc667c6bc5a52e099", "2d45ba381a74a743eeaa2b06c7c5c0d2bf73ba1a" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Sat Aug 07 13:18:36 2010 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Sat Aug 07 13:18:36 2010 -0700" }, "message": "Merge branch \u0027for-linus\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/mszeredi/fuse\n\n* \u0027for-linus\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/mszeredi/fuse:\n fuse: add retrieve request\n fuse: add store request\n fuse: don\u0027t use atomic kmap\n" }, { "commit": "a57f9a3e811cf1246b394f0cc667c6bc5a52e099", "tree": "488b4dd7cd061e7e0e059acb8443967e21051aab", "parents": [ "09dc942c2a767e2d298f1cc9294bc19c7d7208c5", "89c0fd014d34d409a7b196667c2b9a4813b6c968" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Sat Aug 07 13:10:55 2010 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Sat Aug 07 13:10:55 2010 -0700" }, "message": "Merge branch \u0027for-linus\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/ryusuke/nilfs2\n\n* \u0027for-linus\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/ryusuke/nilfs2: (45 commits)\n nilfs2: reject filesystem with unsupported block size\n nilfs2: avoid rec_len overflow with 64KB block size\n nilfs2: simplify nilfs_get_page function\n nilfs2: reject incompatible filesystem\n nilfs2: add feature set fields to super block\n nilfs2: clarify byte offset in super block format\n nilfs2: apply read-ahead for nilfs_btree_lookup_contig\n nilfs2: introduce check flag to btree node buffer\n nilfs2: add btree get block function with readahead option\n nilfs2: add read ahead mode to nilfs_btnode_submit_block\n nilfs2: fix buffer head leak in nilfs_btnode_submit_block\n nilfs2: eliminate inline keywords in btree implementation\n nilfs2: get maximum number of child nodes from bmap object\n nilfs2: reduce repetitive calculation of max number of child nodes\n nilfs2: optimize calculation of min/max number of btree node children\n nilfs2: remove redundant pointer checks in bmap lookup functions\n nilfs2: get rid of nilfs_bmap_union\n nilfs2: unify bmap set_target_v operations\n nilfs2: get rid of nilfs_btree uses\n nilfs2: get rid of nilfs_direct uses\n ...\n" }, { "commit": "09dc942c2a767e2d298f1cc9294bc19c7d7208c5", "tree": "d310c118467c90c264e953bdc320ae08394c662a", "parents": [ "90e0c225968f0878e090c7ff3f88323973476cee", "6c7a120ac6c62316ab1fc78dfc0a7b13f3bfcbff" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Sat Aug 07 13:03:53 2010 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Sat Aug 07 13:03:53 2010 -0700" }, "message": "Merge branch \u0027next\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/tytso/ext4\n\n* \u0027next\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/tytso/ext4: (40 commits)\n ext4: Adding error check after calling ext4_mb_regular_allocator()\n ext4: Fix dirtying of journalled buffers in data\u003djournal mode\n ext4: re-inline ext4_rec_len_(to|from)_disk functions\n jbd2: Remove t_handle_lock from start_this_handle()\n jbd2: Change j_state_lock to be a rwlock_t\n jbd2: Use atomic variables to avoid taking t_handle_lock in jbd2_journal_stop\n ext4: Add mount options in superblock\n ext4: force block allocation on quota_off\n ext4: fix freeze deadlock under IO\n ext4: drop inode from orphan list if ext4_delete_inode() fails\n ext4: check to make make sure bd_dev is set before dereferencing it\n jbd2: Make barrier messages less scary\n ext4: don\u0027t print scary messages for allocation failures post-abort\n ext4: fix EFBIG edge case when writing to large non-extent file\n ext4: fix ext4_get_blocks references\n ext4: Always journal quota file modifications\n ext4: Fix potential memory leak in ext4_fill_super\n ext4: Don\u0027t error out the fs if the user tries to make a file too big\n ext4: allocate stripe-multiple IOs on stripe boundaries\n ext4: move aio completion after unwritten extent conversion\n ...\n\nFix up conflicts in fs/ext4/inode.c as per Ted.\n\nFix up xfs conflicts as per earlier xfs merge.\n" }, { "commit": "90e0c225968f0878e090c7ff3f88323973476cee", "tree": "30fff5a5cb18b08d40e4d496489be6ce714a6cde", "parents": [ "938a73b959cf77aadc41bded3bf416b618aa20b3", "5f11e6a44059f728dddd8d0dbe5b4368ea93575b" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Sat Aug 07 12:57:07 2010 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Sat Aug 07 12:57:07 2010 -0700" }, "message": "Merge branch \u0027for_linus\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/jack/linux-fs-2.6\n\n* \u0027for_linus\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/jack/linux-fs-2.6:\n ext3: Fix dirtying of journalled buffers in data\u003djournal mode\n ext3: default to ordered mode\n quota: Use mark_inode_dirty_sync instead of mark_inode_dirty\n quota: Change quota error message to print out disk and function name\n MAINTAINERS: Update entries of ext2 and ext3\n MAINTAINERS: Update address of Andreas Dilger\n ext3: Avoid filesystem corruption after a crash under heavy delete load\n ext3: remove vestiges of nobh support\n ext3: Fix set but unused variables\n quota: clean up quota active checks\n quota: Clean up the namespace in dqblk_xfs.h\n quota: check quota reservation on remove_dquot_ref\n" }, { "commit": "938a73b959cf77aadc41bded3bf416b618aa20b3", "tree": "812bdbf0d1dc219d55eaf0e66935a523669ca6c6", "parents": [ "45480aa75b03d6705ab5ceebda9d09be22f4e928", "f70cb33b9c270f4f1a7f28327e7d35dbf1a6fc40" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Sat Aug 07 12:56:48 2010 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Sat Aug 07 12:56:48 2010 -0700" }, "message": "Merge branch \u0027for-linus\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/teigland/dlm\n\n* \u0027for-linus\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/teigland/dlm:\n fs/dlm: Drop unnecessary null test\n dlm: use genl_register_family_with_ops()\n" }, { "commit": "45480aa75b03d6705ab5ceebda9d09be22f4e928", "tree": "e8314360d01e4f2cea3a926f0f7f7d856d57c3cb", "parents": [ "1fc7995d19139d6f99203b43c161968f3f554a15", "581b7e9fc00789782cb3bdca58db49f6f0f66608" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Sat Aug 07 12:56:27 2010 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Sat Aug 07 12:56:27 2010 -0700" }, "message": "Merge branch \u0027for_linus\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/jack/linux-udf-2.6\n\n* \u0027for_linus\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/jack/linux-udf-2.6:\n udf: super.c Fix warning: variable \u0027sbi\u0027 set but not used\n udf: remove duplicated #include\n" }, { "commit": "1fc7995d19139d6f99203b43c161968f3f554a15", "tree": "8ad219a60e85935df878f2f9927a58b84f63433e", "parents": [ "3b7433b8a8a83c87972065b1852b7dcae691e464", "5227bbb008fa6d2efddd86170bdfac2020cf571d" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Sat Aug 07 12:54:46 2010 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Sat Aug 07 12:54:46 2010 -0700" }, "message": "Merge git://git.kernel.org/pub/scm/linux/kernel/git/sfrench/cifs-2.6\n\n* git://git.kernel.org/pub/scm/linux/kernel/git/sfrench/cifs-2.6:\n [DNS RESOLVER] Minor typo correction\n DNS: Fixes for the DNS query module\n cifs: Include linux/err.h for IS_ERR and PTR_ERR\n DNS: Make AFS go to the DNS for AFSDB records for unknown cells\n DNS: Separate out CIFS DNS Resolver code\n cifs: account for new creduid\u003d0x%x parameter in spnego upcall string\n cifs: reduce false positives with inode aliasing serverino autodisable\n CIFS: Make cifs_convert_address() take a const src pointer and a length\n cifs: show features compiled in as part of DebugData\n cifs: update README\n\nFix up trivial conflicts in fs/cifs/cifsfs.c due to workqueue changes\n" }, { "commit": "3b7433b8a8a83c87972065b1852b7dcae691e464", "tree": "93fa2c003f8baef5ab0733b53bac77961ed5240c", "parents": [ "4a386c3e177ca2fbc70c9283d0b46537844763a0", "6ee0578b4daaea01c96b172c6aacca43fd9807a6" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Sat Aug 07 12:42:58 2010 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Sat Aug 07 12:42:58 2010 -0700" }, "message": "Merge branch \u0027for-linus\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/tj/wq\n\n* \u0027for-linus\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/tj/wq: (55 commits)\n workqueue: mark init_workqueues() as early_initcall()\n workqueue: explain for_each_*cwq_cpu() iterators\n fscache: fix build on !CONFIG_SYSCTL\n slow-work: kill it\n gfs2: use workqueue instead of slow-work\n drm: use workqueue instead of slow-work\n cifs: use workqueue instead of slow-work\n fscache: drop references to slow-work\n fscache: convert operation to use workqueue instead of slow-work\n fscache: convert object to use workqueue instead of slow-work\n workqueue: fix how cpu number is stored in work-\u003edata\n workqueue: fix mayday_mask handling on UP\n workqueue: fix build problem on !CONFIG_SMP\n workqueue: fix locking in retry path of maybe_create_worker()\n async: use workqueue for worker pool\n workqueue: remove WQ_SINGLE_CPU and use WQ_UNBOUND instead\n workqueue: implement unbound workqueue\n workqueue: prepare for WQ_UNBOUND implementation\n libata: take advantage of cmwq and remove concurrency limitations\n workqueue: fix worker management invocation without pending works\n ...\n\nFixed up conflicts in fs/cifs/* as per Tejun. Other trivial conflicts in\ninclude/linux/workqueue.h, kernel/trace/Kconfig and kernel/workqueue.c\n" }, { "commit": "998db52c03cd293d16a457f1b396cea932244147", "tree": "6546b0752c402c458723242e3a03723e2083040b", "parents": [ "7fa53cc872332b265bc5ba1266f39586f218ad4a" ], "author": { "name": "J. Bruce Fields", "email": "bfields@pad.home.fieldses.org", "time": "Sat Aug 07 09:21:41 2010 -0400" }, "committer": { "name": "J. Bruce Fields", "email": "bfields@pad.home.fieldses.org", "time": "Sat Aug 07 09:50:05 2010 -0400" }, "message": "nfsd4: fix file open accounting for RDWR opens\n\nCommit f9d7562fdb9dc0ada3a7aba5dbbe9d965e2a105d \"nfsd4: share file\ndescriptors between stateid\u0027s\" didn\u0027t correctly account for O_RDWR opens.\nSymptoms include leaked files, resulting in failures to unmount and/or\nwarnings about orphaned inodes on reboot.\n\nSigned-off-by: J. Bruce Fields \u003cbfields@redhat.com\u003e\n" }, { "commit": "4a386c3e177ca2fbc70c9283d0b46537844763a0", "tree": "7f3a6a6a984a988e8a6e908d93dcd57d92a82efd", "parents": [ "e8779776afbd5f2d5315cf48c4257ca7e9b250fb", "1cff92d8fdb27684308864d9cdb324bee43b40ab" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Fri Aug 06 16:25:13 2010 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Fri Aug 06 16:25:13 2010 -0700" }, "message": "Merge branch \u0027x86-xsave-for-linus\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip\n\n* \u0027x86-xsave-for-linus\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip:\n x86, xsave: Make xstate_enable_boot_cpu() __init, protect on CPU 0\n x86, xsave: Add __init attribute to setup_xstate_features()\n x86, xsave: Make init_xstate_buf static\n x86, xsave: Check cpuid level for XSTATE_CPUID (0x0d)\n x86, xsave: Introduce xstate enable functions\n x86, xsave: Separate fpu and xsave initialization\n x86, xsave: Move boot cpu initialization to xsave_init()\n x86, xsave: 32/64 bit boot cpu check unification in initialization\n x86, xsave: Do not include asm/i387.h in asm/xsave.h\n x86, xsave: Use xsaveopt in context-switch path when supported\n x86, xsave: Sync xsave memory layout with its header for user handling\n x86, xsave: Track the offset, size of state in the xsave layout\n" }, { "commit": "e8779776afbd5f2d5315cf48c4257ca7e9b250fb", "tree": "a439733c6c71dd7d24ba65557159c30c2e49861a", "parents": [ "3cf8ad3394b8675e92a35c438f22341197535531", "a2d7b0d4852536273b65d16fe179c65184fe5e2d" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Fri Aug 06 16:24:51 2010 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Fri Aug 06 16:24:51 2010 -0700" }, "message": "Merge branch \u0027x86-mce-for-linus\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip\n\n* \u0027x86-mce-for-linus\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip:\n x86, mce: Use HW_ERR in MCE handler\n x86, mce: Add HW_ERR printk prefix for hardware error logging\n x86, mce: Fix MSR_IA32_MCI_CTL2 CMCI threshold setup\n x86, mce: Rename MSR_IA32_MCx_CTL2 value\n" }, { "commit": "3cf8ad3394b8675e92a35c438f22341197535531", "tree": "39c9c5b9465e4f63f6cdf9b767d8046eaf0f3ac7", "parents": [ "66cd55d2b903643cbd019ef97a5305d9428d3865", "54e5bc020ce1c959eaa7be18cedb734b6b13745e" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Fri Aug 06 16:24:34 2010 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Fri Aug 06 16:24:34 2010 -0700" }, "message": "Merge branch \u0027x86-olpc-for-linus\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip\n\n* \u0027x86-olpc-for-linus\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip:\n x86, olpc: Constify an olpc_ofw() arg\n x86, olpc: Use pr_debug() for EC commands\n x86, olpc: Add comment about implicit optimization barrier\n x86, olpc: Add support for calling into OpenFirmware\n" }, { "commit": "66cd55d2b903643cbd019ef97a5305d9428d3865", "tree": "454a5af22b1aaf8fe62689974342a784f6f38822", "parents": [ "75cb5fdce29c77ec54db45f0c6be7cc5715f8e15", "3b770a2128423a687e6e9c57184a584fb4ba4c77" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Fri Aug 06 16:24:17 2010 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Fri Aug 06 16:24:17 2010 -0700" }, "message": "Merge branch \u0027x86-alternatives-for-linus\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip\n\n* \u0027x86-alternatives-for-linus\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip:\n x86, alternatives: BUG on encountering an invalid CPU feature number\n x86, alternatives: Fix one more open-coded 8-bit alternative number\n x86, alternatives: Use 16-bit numbers for cpufeature index\n" }, { "commit": "75cb5fdce29c77ec54db45f0c6be7cc5715f8e15", "tree": "ffc1d292d9b26a02d76f517c591f78b2aa8b576d", "parents": [ "ce06ea8339de1dca3455e9c89c56ea161988ab71", "b2691085d1f3ccce641dcfdd02722ba5d34db6ba", "9f242dc10e0c3c1eb32d8c83c18650a35fd7f80d", "68f202e4e87cfab4439568bf397fcc5c7cf8d729", "5bbd4a336c81d32df71642abf310cf3d0c98dc9b", "8e221b6db4477643fefc885a97ea9889ac733140", "be783a47214afc5a0aea9dafcbd9f1535ba05e94" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Fri Aug 06 16:22:59 2010 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Fri Aug 06 16:22:59 2010 -0700" }, "message": "Merge branches \u0027x86-cleanups-for-linus\u0027, \u0027x86-vmware-for-linus\u0027, \u0027x86-mtrr-for-linus\u0027, \u0027x86-apic-for-linus\u0027, \u0027x86-fpu-for-linus\u0027 and \u0027x86-vdso-for-linus\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip\n\n* \u0027x86-cleanups-for-linus\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip:\n x86: Clean up arch/x86/kernel/cpu/mtrr/cleanup.c: use \";\" not \",\" to terminate statements\n\n* \u0027x86-vmware-for-linus\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip:\n x86, vmware: Preset lpj values when on VMware.\n\n* \u0027x86-mtrr-for-linus\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip:\n x86, mtrr: Use stop machine context to rendezvous all the cpu\u0027s\n\n* \u0027x86-apic-for-linus\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip:\n x86/apic/es7000_32: Remove unused variable\n\n* \u0027x86-fpu-for-linus\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip:\n x86: Avoid unnecessary __clear_user() and xrstor in signal handling\n\n* \u0027x86-vdso-for-linus\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip:\n x86, vdso: Unmap vdso pages\n" }, { "commit": "ce06ea8339de1dca3455e9c89c56ea161988ab71", "tree": "ef6e12f96bbe0c78e6cd0ad1fc6fc679b80808e0", "parents": [ "17879857821adad4e180c5d6457c3b8bbf1d0c0c", "9261ec1a8d7b17e2540bef7cad3470870d13b61e" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Fri Aug 06 16:15:12 2010 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Fri Aug 06 16:15:12 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 console: Fix compilation regression\n" }, { "commit": "a7a387cc596278af1516c534b50cc0bee171129d", "tree": "6b020262150ab47e2aaeb7ccdd57534460df2665", "parents": [ "06c22dadc6d3f9b65e55407a87faaf6a4a014112" ], "author": { "name": "Ralf Baechle", "email": "ralf@linux-mips.org", "time": "Fri Aug 06 20:37:56 2010 +0100" }, "committer": { "name": "James Morris", "email": "jmorris@namei.org", "time": "Fri Aug 06 18:11:39 2010 -0400" }, "message": "SELINUX: Fix build error.\n\nFix build error caused by a stale security/selinux/av_permissions.h in the $(src)\ndirectory which will override a more recent version in $(obj) that is it\nappears to strike only when building with a separate object directory.\n\nSigned-off-by: Ralf Baechle \u003cralf@linux-mips.org\u003e\nAcked-by: Eric Paris \u003ceparis@redhat.com\u003e\nSigned-off-by: James Morris \u003cjmorris@namei.org\u003e\n" }, { "commit": "7fa53cc872332b265bc5ba1266f39586f218ad4a", "tree": "0583a66f8665581a7a9b613f30000e9093c9ff84", "parents": [ "e844a7b9805a2b74cfd34c8604f5bba3e0869305" ], "author": { "name": "J. Bruce Fields", "email": "bfields@redhat.com", "time": "Fri Aug 06 18:00:33 2010 -0400" }, "committer": { "name": "J. Bruce Fields", "email": "bfields@redhat.com", "time": "Fri Aug 06 18:00:33 2010 -0400" }, "message": "nfsd: don\u0027t allow setting maxblksize after svc created\n\nIt\u0027s harmless to set this after the server is created, but also\nineffective, since the value is only used at the time of\nsvc_create_pooled(). So fail the attempt, in keeping with the pattern\nset by write_versions, write_{lease,grace}time and write_recoverydir.\n\n(This could break userspace that tried to write to nfsd/max_block_size\nbetween setting up sockets and starting the server. However, such code\nwouldn\u0027t have worked anyway, and I don\u0027t know of any examples--rpc.nfsd\nin nfs-utils, probably the only user of the interface, doesn\u0027t do that.)\n\nSigned-off-by: J. Bruce Fields \u003cbfields@redhat.com\u003e\n" }, { "commit": "e844a7b9805a2b74cfd34c8604f5bba3e0869305", "tree": "f0270f65da19a0f6ebc50787dd9edce6a8def9d3", "parents": [ "e2aa7f8304b3b5656ded8699216cc65138d03b64" ], "author": { "name": "J. Bruce Fields", "email": "bfields@redhat.com", "time": "Fri Aug 06 15:48:03 2010 -0400" }, "committer": { "name": "J. Bruce Fields", "email": "bfields@redhat.com", "time": "Fri Aug 06 17:05:40 2010 -0400" }, "message": "nfsd: initialize nfsd versions before creating svc\n\nCommit 59db4a0c102e0de226a3395dbf25ea51bf845937 \"nfsd: move more into\nnfsd_startup()\" inadvertently moved nfsd_versions after\nnfsd_create_svc(). On older distributions using an rpc.nfsd that does\nnot explicitly set the list of nfsd versions, this results in\nsvc-create_pooled() being called with an empty versions array. The\nresulting incomplete initialization leads to a NULL dereference in\nsvc_process_common() the first time a client accesses the server.\n\nMove nfsd_reset_versions() back before the svc_create_pooled(); this\ntime, put it closer to the svc_create_pooled() call, to make this\nmistake more difficult in the future.\n\nSigned-off-by: J. Bruce Fields \u003cbfields@redhat.com\u003e\n" }, { "commit": "e2aa7f8304b3b5656ded8699216cc65138d03b64", "tree": "a7bcb0f3d96a5d2b5d6d3fa36f9cf5b1aa9d7343", "parents": [ "c18c821fd40ad0ffc199a55be874e556bf999416" ], "author": { "name": "Andrea Gelmini", "email": "andrea.gelmini@gelma.net", "time": "Thu Aug 05 15:51:36 2010 +0200" }, "committer": { "name": "J. Bruce Fields", "email": "bfields@redhat.com", "time": "Fri Aug 06 17:05:39 2010 -0400" }, "message": "net: sunrpc: removed duplicated #include\n\nSigned-off-by: Andrea Gelmini \u003candrea.gelmini@gelma.net\u003e\nSigned-off-by: J. Bruce Fields \u003cbfields@redhat.com\u003e\n" }, { "commit": "c18c821fd40ad0ffc199a55be874e556bf999416", "tree": "ba1830c90160a4f85a32552425a556b70e56bae1", "parents": [ "774f8bbd9ef2e71d4ef4b89933d292091d31ca98" ], "author": { "name": "Boaz Harrosh", "email": "bharrosh@panasas.com", "time": "Tue Jun 29 14:33:55 2010 +0300" }, "committer": { "name": "J. Bruce Fields", "email": "bfields@redhat.com", "time": "Fri Aug 06 17:05:39 2010 -0400" }, "message": "nfsd41: Fix a crash when a callback is retried\n\nIf a callback is retried at nfsd4_cb_recall_done() due to\nsome error, the returned rpc reply crashes here:\n\n@@ -514,6 +514,7 @@ decode_cb_sequence(struct xdr_stream *xdr, struct nfsd4_cb_sequence *res,\n \tu32 dummy;\n \t__be32 *p;\n\n +\tBUG_ON(!res);\n \tif (res-\u003ecbs_minorversion \u003d\u003d 0)\n \t\treturn 0;\n\n[BUG_ON added for demonstration]\n\nThis is because the nfsd4_cb_done_sequence() has NULLed out\nthe task-\u003etk_msg.rpc_resp pointer.\n\nAlso eventually the rpc would use the new slot without making\nsure it is free by calling nfsd41_cb_setup_sequence().\n\nThis problem was introduced by a 4.1 protocol addition patch:\n\t[0421b5c5] nfsd41: Backchannel: Implement cb_recall over NFSv4.1\n\nWhich was overlooking the possibility of an RPC callback retries.\nFor not-4.1 case redoing the _prepare is harmless.\n\nSigned-off-by: Boaz Harrosh \u003cbharrosh@panasas.com\u003e\nSigned-off-by: J. Bruce Fields \u003cbfields@redhat.com\u003e\n" }, { "commit": "774f8bbd9ef2e71d4ef4b89933d292091d31ca98", "tree": "bbc4afb785f31727b61279b1a026768d5953d60f", "parents": [ "039a87ca536a85bc169ce092e44bd57adfa1f563" ], "author": { "name": "J. Bruce Fields", "email": "bfields@redhat.com", "time": "Mon Aug 02 14:12:44 2010 -0400" }, "committer": { "name": "J. Bruce Fields", "email": "bfields@redhat.com", "time": "Fri Aug 06 17:05:30 2010 -0400" }, "message": "nfsd: fix startup/shutdown order bug\n\nWe must create the server before we can call init_socks or check the\nnumber of threads.\n\nSymptoms were a NULL pointer dereference in nfsd_svc(). Problem\nidentified by Jeff Layton.\n\nAlso fix a minor cleanup-on-error case in nfsd_startup().\n\nReported-by: Tetsuo Handa \u003cpenguin-kernel@I-love.SAKURA.ne.jp\u003e\nSigned-off-by: J. Bruce Fields \u003cbfields@redhat.com\u003e\n" }, { "commit": "9261ec1a8d7b17e2540bef7cad3470870d13b61e", "tree": "ee7d2713d947a8a231d720627806c1db6b67ed6b", "parents": [ "fc1caf6eafb30ea185720e29f7f5eccca61ecd60" ], "author": { "name": "Jason Wessel", "email": "jason.wessel@windriver.com", "time": "Fri Aug 06 15:36:47 2010 -0500" }, "committer": { "name": "Jason Wessel", "email": "jason.wessel@windriver.com", "time": "Fri Aug 06 15:36:47 2010 -0500" }, "message": "console: Fix compilation regression\n\nA regression of building without CONFIG_HW_CONSOLE was introduced with\ncommit b45cfba4e9005d64d419718e7ff7f7cab44c1994 (vt,console,kdb:\nimplement atomic console enter/leave functions).\n\nERROR: \"con_debug_enter\" [drivers/serial/kgdboc.ko] undefined!\nERROR: \"vc_cons\" [drivers/serial/kgdboc.ko] undefined!\nERROR: \"fg_console\" [drivers/serial/kgdboc.ko] undefined!\nERROR: \"con_debug_leave\" [drivers/serial/kgdboc.ko] undefined!\n\nWhen there is no HW console the con_debug_enter and con_debug_leave\nfunctions should have no code.\n\nSigned-off-by: Jason Wessel \u003cjason.wessel@windriver.com\u003e\nCC: Jesse Barnes \u003cjbarnes@virtuousgeek.org\u003e\nReported-by: Randy Dunlap \u003crandy.dunlap@oracle.com\u003e\n" }, { "commit": "17879857821adad4e180c5d6457c3b8bbf1d0c0c", "tree": "28afa4b59847ca13b8d51a83fa04954916387de9", "parents": [ "b62ad9ab181a67207a4c8c373461b587c4861a68", "4877c737283813bdb4bebfa3168c1585f6e3a8ca" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Fri Aug 06 13:25:43 2010 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Fri Aug 06 13:25:43 2010 -0700" }, "message": "Merge branch \u0027irq-core-for-linus\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip\n\n* \u0027irq-core-for-linus\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip:\n xen: Do not suspend IPI IRQs.\n powerpc: Use IRQF_NO_SUSPEND not IRQF_TIMER for non-timer interrupts\n ixp4xx-beeper: Use IRQF_NO_SUSPEND not IRQF_TIMER for non-timer interrupt\n irq: Add new IRQ flag IRQF_NO_SUSPEND\n" }, { "commit": "b62ad9ab181a67207a4c8c373461b587c4861a68", "tree": "ace1572964d81f5f9bbc10b7960c1f742832d744", "parents": [ "af390084359a5de20046c901529b2b6a50b941cb", "b29230769e3482bbd62a07d6d9485371ee66a18f" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Fri Aug 06 13:18:29 2010 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Fri Aug 06 13:18:29 2010 -0700" }, "message": "Merge branch \u0027timers-timekeeping-for-linus\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip\n\n* \u0027timers-timekeeping-for-linus\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip:\n um: Fix read_persistent_clock fallout\n kgdb: Do not access xtime directly\n powerpc: Clean up obsolete code relating to decrementer and timebase\n powerpc: Rework VDSO gettimeofday to prevent time going backwards\n clocksource: Add __clocksource_updatefreq_hz/khz methods\n x86: Convert common clocksources to use clocksource_register_hz/khz\n timekeeping: Make xtime and wall_to_monotonic static\n hrtimer: Cleanup direct access to wall_to_monotonic\n um: Convert to use read_persistent_clock\n timkeeping: Fix update_vsyscall to provide wall_to_monotonic offset\n powerpc: Cleanup xtime usage\n powerpc: Simplify update_vsyscall\n time: Kill off CONFIG_GENERIC_TIME\n time: Implement timespec_add\n x86: Fix vtime/file timestamp inconsistencies\n\nTrivial conflicts in Documentation/feature-removal-schedule.txt\n\nMuch less trivial conflicts in arch/powerpc/kernel/time.c resolved as\nper Thomas\u0027 earlier merge commit 47916be4e28c (\"Merge branch\n\u0027powerpc.cherry-picks\u0027 into timers/clocksource\")\n" }, { "commit": "af390084359a5de20046c901529b2b6a50b941cb", "tree": "b73a6261d1b1f9fb34432cc9a47411a49330b8dc", "parents": [ "7645e4320497b35ce9fb6c2269ebcd57af9fe735", "0fcb80818bc3ade5befd409051089f710adcf7b0" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Fri Aug 06 13:12:36 2010 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Fri Aug 06 13:12:36 2010 -0700" }, "message": "Merge branch \u0027timers-for-linus\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip\n\n* \u0027timers-for-linus\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip:\n Documentation: Add timers/timers-howto.txt\n timer: Added usleep_range timer\n Revert \"timer: Added usleep[_range] timer\"\n clockevents: Remove the per cpu tick skew\n posix_timer: Move copy_to_user(created_timer_id) down in timer_create()\n timer: Added usleep[_range] timer\n timers: Document meaning of deferrable timer\n" }, { "commit": "7645e4320497b35ce9fb6c2269ebcd57af9fe735", "tree": "00b4a98f52f5e4d41f5baa495546bab2425805d3", "parents": [ "1685e633b396b0f3dabbc9fa5d65dfefe6435250" ], "author": { "name": "H. Peter Anvin", "email": "hpa@zytor.com", "time": "Fri Aug 06 12:18:11 2010 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Fri Aug 06 13:07:19 2010 -0700" }, "message": "x86, kvm: Remove cast obsoleted by set_64bit() prototype cleanup\n\nKVM ended up having to put a pretty ugly wrapper around set_64bit()\nin order to get the type right. Now set_64bit() takes the expected\nu64 type, and this wrapper can be cleaned up.\n\nSigned-off-by: H. Peter Anvin \u003chpa@zytor.com\u003e\nCc: Avi Kivity \u003cavi@redhat.com\u003e\nLKML-Reference: \u003c4C5C4E7A.8040603@kernel.org\u003e\nSigned-off-by: Linus Torvalds \u003ctorvalds@linux-foundation.org\u003e\n" }, { "commit": "1685e633b396b0f3dabbc9fa5d65dfefe6435250", "tree": "ee83e26e2468ca1518a1b065c690159e12c8def9", "parents": [ "1cfd2bda8c486ae0e7a8005354758ebb68172bca", "127c03cdbad9bd5af5d7f33bd31a1015a90cb77f" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Fri Aug 06 12:25:06 2010 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Fri Aug 06 12:25:06 2010 -0700" }, "message": "Merge git://git.kernel.org/pub/scm/linux/kernel/git/brodo/pcmcia-2.6\n\n* git://git.kernel.org/pub/scm/linux/kernel/git/brodo/pcmcia-2.6:\n pcmcia: avoid buffer overflow in pcmcia_setup_isa_irq\n pcmcia: do not request windows if you don\u0027t need to\n pcmcia: insert PCMCIA device resources into resource tree\n pcmcia: export resource information to sysfs\n pcmcia: use struct resource for PCMCIA devices, part 2\n pcmcia: remove memreq_t\n pcmcia: move local definitions out of include/pcmcia/cs.h\n pcmcia: do not use io_req_t when calling pcmcia_request_io()\n pcmcia: do not use io_req_t after call to pcmcia_request_io()\n pcmcia: use struct resource for PCMCIA devices\n pcmcia: clean up cs.h\n pcmcia: use pcmica_{read,write}_config_byte\n pcmcia: remove cs_types.h\n pcmcia: remove unused flag, simplify headers\n pcmcia: remove obsolete CS_EVENT_ definitions\n pcmcia: split up central event handler\n pcmcia: simplify event callback\n pcmcia: remove obsolete ioctl\n\nConflicts in:\n - drivers/staging/comedi/drivers/*\n - drivers/staging/wlags49_h2/wl_cs.c\ndue to dev_info_t and whitespace changes\n" }, { "commit": "1cfd2bda8c486ae0e7a8005354758ebb68172bca", "tree": "76ce15f377d8d6eb3ae4aa8b8b0b415457e38d36", "parents": [ "b57bdda58cda0aaf6def042d101dd85977a286ed", "763e9db9994e27a7d2cb3701c8a097a867d0e0b4" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Fri Aug 06 11:44:36 2010 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Fri Aug 06 11:44:36 2010 -0700" }, "message": "Merge branch \u0027linux-next\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/jbarnes/pci-2.6\n\n* \u0027linux-next\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/jbarnes/pci-2.6: (30 commits)\n PCI: update for owner removal from struct device_attribute\n PCI: Fix warnings when CONFIG_DMI unset\n PCI: Do not run NVidia quirks related to MSI with MSI disabled\n x86/PCI: use for_each_pci_dev()\n PCI: use for_each_pci_dev()\n PCI: MSI: Restore read_msi_msg_desc(); add get_cached_msi_msg_desc()\n PCI: export SMBIOS provided firmware instance and label to sysfs\n PCI: Allow read/write access to sysfs I/O port resources\n x86/PCI: use host bridge _CRS info on ASRock ALiveSATA2-GLAN\n PCI: remove unused HAVE_ARCH_PCI_SET_DMA_MAX_SEGMENT_{SIZE|BOUNDARY}\n PCI: disable mmio during bar sizing\n PCI: MSI: Remove unsafe and unnecessary hardware access\n PCI: Default PCIe ASPM control to on and require !EMBEDDED to disable\n PCI: kernel oops on access to pci proc file while hot-removal\n PCI: pci-sysfs: remove casts from void*\n ACPI: Disable ASPM if the platform won\u0027t provide _OSC control for PCIe\n PCI hotplug: make sure child bridges are enabled at hotplug time\n PCI hotplug: shpchp: Removed check for hotplug of display devices\n PCI hotplug: pciehp: Fixed return value sign for pciehp_unconfigure_device\n PCI: Don\u0027t enable aspm before drivers have had a chance to veto it\n ...\n" } ], "next": "b57bdda58cda0aaf6def042d101dd85977a286ed" }