[PULL] MatchSeat, logind patch, two invalid memory access

Peter Hutterer peter.hutterer at who-t.net
Sun May 4 14:37:06 PDT 2014


The last two aren't rev-by. If you want to add the tag, feel free to add the
tag after merging.

The following changes since commit e06fbe4dc81110e01d36f958849c4ab5f2a9df0e:

  dix: remove a now-superfluous comment (2014-04-29 10:06:25 +1000)

are available in the git repository at:

  git://people.freedesktop.org/~whot/xserver for-keith

for you to fetch changes up to 56929f41e6c4cc1b2d72a33d14b4d993e7b613a3:

  Xi: don't copy a DeviceEvent into an InternalEvent (2014-05-05 07:26:33 +1000)

----------------------------------------------------------------
Laércio de Sousa (2):
      xfree86: allow fallback to PCI bus probe for graphics devices on non-seat0 X servers (#66851)
      xfree86: add short description about MatchSeat key in xorg.conf man page

Oleg Samarin (1):
      xfree86: add new key MatchSeat to xorg.conf sections "Device", "Screen", and "ServerLayout"

Peter Hutterer (3):
      systemd-logind: let the logind code decided whether to close an fd
      mi: start calculating the sprite trace from the first child of root
      Xi: don't copy a DeviceEvent into an InternalEvent

 Xi/exevents.c                                | 16 ++++++-------
 config/config.c                              |  6 ++---
 hw/xfree86/common/xf86Bus.c                  |  4 ++--
 hw/xfree86/common/xf86Config.c               | 34 ++++++++++++++++++++--------
 hw/xfree86/common/xf86Xinput.c               |  9 +++-----
 hw/xfree86/common/xf86platformBus.c          |  3 +--
 hw/xfree86/man/xorg.conf.man                 | 24 ++++++++++++++++++++
 hw/xfree86/os-support/linux/lnx_platform.c   |  2 +-
 hw/xfree86/os-support/linux/systemd-logind.c |  7 ++++--
 hw/xfree86/parser/Device.c                   |  6 +++++
 hw/xfree86/parser/Layout.c                   |  6 +++++
 hw/xfree86/parser/Screen.c                   |  6 +++++
 hw/xfree86/parser/xf86Parser.h               |  3 +++
 hw/xfree86/parser/xf86tokens.h               |  1 +
 include/systemd-logind.h                     |  4 ++--
 mi/miwindow.c                                |  2 +-
 16 files changed, 96 insertions(+), 37 deletions(-)
-------------- next part --------------
A non-text attachment was scrubbed...
Name: not available
Type: application/pgp-signature
Size: 181 bytes
Desc: not available
URL: <http://lists.x.org/archives/xorg-devel/attachments/20140505/7a06e647/attachment.sig>


More information about the xorg-devel mailing list