[git pull] stable cherry-picks

[Matt Dew]

Hi Dave,
    Pulled, merged, built and lightly tested.

Guys,
1) should I be adding anything to the commit messages, besides the default
'Merge branch 'server-1.13-branch' of ...'  IE:  a Signed-off by tag or
such?  Looking back through the log, it seems to be just the default 'Merge
..' message.


2) any testing I should be doing other than restarting X and playing with
it a bit?  I don't have a way to really test multi-seat with my current
setup.

thanks,
Matt


On Thu, Nov 1, 2012 at 6:22 PM, Dave Airlie <airlied at gmail.com> wrote:

> Hi Matt,
>
> just some cherry-picks for master for some multi-seat and offload
> related bugs. There is one more fix I want to pull back but it caused
> a regression or two so need to get the fixes into master first.
>
> Dave.
>
> The following changes since commit
> f0bad69edd57facd6cffde8cb0863d1a735e2492:
>
>   Version bumped to 1.13 (2012-09-05 14:45:08 -0700)
>
> are available in the git repository at:
>
>   git://people.freedesktop.org/~airlied/xserver server-1.13-branch
>
> for you to fetch changes up to b87edf1acca7e57139cd6bdf5838c2b4179352dc:
>
>   xf86: fix multi-seat video device support. (v2) (2012-11-02 10:17:53
> +1000)
>
> ----------------------------------------------------------------
> Dave Airlie (4):
>       dri2: invalidate drawable after sharing pixmap
>       xf86/platform: scan pci after probing devices
>       config/udev: ignore change on drm devices
>       xf86: fix multi-seat video device support. (v2)
>
>  config/udev.c                       |  8 +++-
>  hw/xfree86/common/xf86Bus.c         |  4 ++
>  hw/xfree86/common/xf86platformBus.c |  6 ++-
>  hw/xfree86/dri2/dri2.c              | 74
> +++++++++++++++++++++----------------
>  4 files changed, 58 insertions(+), 34 deletions(-)
>
> On Fri, Nov 2, 2012 at 4:29 AM, Matt Dew <marcoz at osource.org> wrote:
> > Hi all,
> >    The xserver 1.13 stable branch is now open for nominations.  I have
> two pull
> > requests so far.
> >
> > one from Peter Hutterer
> > git://people.freedesktop.org/~whot/xserver server-1.13-branch:  up to
> > 8f39a6b0b35764c8d5cac4c7bf66d5902c0ae9a5:
> >
> >
> > one from Jon Turney
> > git://people.freedesktop.org/~jturney/xserver server-1.13-branch:  up to
> > 0456d56092e7617131c77b50a7e7f501e6d9d275:
> >
> > Matt
> >
> >
> > On 10/29/2012 02:03 PM, Matt Dew wrote:
> >> Hey group,
> >>
> >>     Here's my proposed schedule.  It's possibly a bit slower later than
> >> some people would probably like, but  it's a schedule I believe I can
> >> stick to.
> >>
> >> branch will open for nominations - Nov 1 (this Thurs)
> >> RC1 - Nov 22
> >> RC2 - Dec 6
> >> Final - Dec 13,
> >>
> >> then 6-week schedule thereafter.
> >>
> >> Comments, concerns?
> >>
> >> Please let me know,  I'm still green at this,
> >>
> >> Matt
> >>
> > _______________________________________________
> > xorg-devel at lists.x.org: X.Org development
> > Archives: http://lists.x.org/archives/xorg-devel
> > Info: http://lists.x.org/mailman/listinfo/xorg-devel
>
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.x.org/archives/xorg-devel/attachments/20121101/dc81c27f/attachment.html>