[PULL] misc cleanups

[Adam Jackson]

On Wed, 2011-12-14 at 20:33 +0100, Julien Cristau wrote:
> On Wed, Dec 14, 2011 at 11:30:37 -0800, Keith Packard wrote:
> 
> > On Thu, 01 Dec 2011 17:42:40 -0500, Adam Jackson <ajax at redhat.com> wrote:
> > > The following changes since commit fb22a408c69a84f81905147de9e82cf66ffb6eb2:
> > > 
> > >   Save major/minor opcodes in ClientRec for RecordAReply (2011-12-01 15:11:20 +0000)
> > > 
> > > are available in the git repository at:
> > >   ssh://people.freedesktop.org/~ajax/xserver server-1.12-queue
> > > 
> > > Adam Jackson (7):
> > >       os: Repack ConnectionOutput for LP64
> > >       dix: Repack ClientRec
> > >       dix: Pull client-is-local flag up to the ClientRec
> > >       dix: Extend initial connection handshake for forwarding proxies
> > 
> [...]
> > Other than this patch, everything else looks like perfectly fine
> > cleanups to me. Unless I hear objections about this protocol change,
> > I'll just pull the whole mess in in a day or so.
> > 
> As I mentioned on IRC 4c4cf5917d6ba95085d669c56235493b0fb56c20 (dix:
> Pull client-is-local flag up to the ClientRec) has conflict markers in
> hw/xquartz/xpr/appledri.c.  Might want to fix that before pulling to
> master.

Yeah, hold off.  I'll send another pull tomorrow, I've a few patches
since that have passed review.

- ajax
-------------- next part --------------
A non-text attachment was scrubbed...
Name: not available
Type: application/pgp-signature
Size: 198 bytes
Desc: This is a digitally signed message part
URL: <http://lists.x.org/archives/xorg-devel/attachments/20111214/8ddcc904/attachment.pgp>