[PULL] DRI2 XID confusion fixes

[Owen Taylor]

On Sun, 2010-05-02 at 17:57 -0700, Kristian Høgsberg wrote:
> Here's a pull request for the four patches I sent out earlier.  The
> dix resource patch has been updated to also update the element count
> for FreeClientNeverRetainResources() and FreeClientResources(), which
> also didn't keep the count up to date.  Also in the patch is a fix for
> LookupClientResourceComplex() and FreeClientNeverRetainResources()
> reentrancy.  These two functions didn't check the element count and
> restart if changed after the callback, which makes them non-reentrant.
> 
> Owen, I added a Tested-by from you for the DRI2 XID fix since we were
> working on that together and you were testing the patch in the fedora
> X server.  I hope that's OK.

Yes, it worked well in my testing, and I built it for Fedora and reports
from people trying that have been positive as well.

- Owen