Merged. a11cf8d..348de79 server-1.14-branch -> server-1.14-branch
Peter, yours should be in there as well. Matt On 05/08/2013 11:12 PM, Matt Dew wrote: > Hi Dave, > I just saw this email. I'll pull it tomorrow. (need sleep.) > > Matt > > On 05/05/2013 05:57 PM, Dave Airlie wrote: >> Hi Matt, >> >> some VT switch and one fail fix. I'll have more if I ever get any >> other patches into master. >> >> Dave. >> >> The following changes since commit >> f5796f98dadccf67c04f601178966614dd51a1b4: >> >> xserver 1.14.1 (2013-04-17 16:12:00 +1000) >> >> are available in the git repository at: >> >> git://people.freedesktop.org/~airlied/xserver stable-1.14-fixes >> >> for you to fetch changes up to c760fb0154848d47438908ba8b3da2fffc68a460: >> >> hw/xfree86: Only report SetDesiredModes() failed if at least one >> modeset fails (2013-05-06 09:52:35 +1000) >> >> ---------------------------------------------------------------- >> Chris Wilson (1): >> hw/xfree86: Only report SetDesiredModes() failed if at least one >> modeset fails >> >> Dave Airlie (3): >> xfree86: add VT owner interface >> xf86: use new xf86VTOwner interface in a few places >> xf86: don't hotplug output devices while VT switched. >> >> hw/xfree86/common/xf86.h | 1 + >> hw/xfree86/common/xf86Events.c | 15 +++++++++- >> hw/xfree86/common/xf86Init.c | 2 +- >> hw/xfree86/common/xf86Xinput.c | 2 +- >> hw/xfree86/common/xf86platformBus.c | 19 +++++++++++++ >> hw/xfree86/common/xf86platformBus.h | 4 +++ >> hw/xfree86/modes/xf86Crtc.c | 5 ++-- >> hw/xfree86/os-support/linux/lnx_platform.c | 45 >> ++++++++++++++++++++++++++---- >> hw/xfree86/os-support/solaris/sun_init.c | 2 +- >> hw/xfree86/os-support/xf86_OSproc.h | 3 ++ >> include/hotplug.h | 1 + >> 11 files changed, 88 insertions(+), 11 deletions(-) >> > _______________________________________________ [email protected]: X.Org development Archives: http://lists.x.org/archives/xorg-devel Info: http://lists.x.org/mailman/listinfo/xorg-devel
