Merge lp:~alan-griffiths/mir/reboot-0.26.3-release into lp:mir

[Alan Griffiths]

Restore platforms that are unsupported in xenial, add support for building downstreams on, and re-sync deprecation macros with current development.

=== modified file 'CMakeLists.txt'
--- CMakeLists.txt	2017-05-08 03:04:26 +0000
+++ CMakeLists.txt	2017-05-26 09:20:21 +0000
@@ -28,8 +28,13 @@
 set(CMAKE_LIBRARY_OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR}/lib)
 
 set(MIR_VERSION_MAJOR 0)
+<<<<<<< TREE
 set(MIR_VERSION_MINOR 27)
 set(MIR_VERSION_PATCH 0)
+=======
+set(MIR_VERSION_MINOR 26)
+set(MIR_VERSION_PATCH 3)
+>>>>>>> MERGE-SOURCE
 
 add_definitions(-DMIR_VERSION_MAJOR=${MIR_VERSION_MAJOR})
 add_definitions(-DMIR_VERSION_MINOR=${MIR_VERSION_MINOR})

=== modified file 'debian/changelog'
--- debian/changelog	2017-05-08 03:04:26 +0000
+++ debian/changelog	2017-05-26 09:20:21 +0000
@@ -1,3 +1,57 @@
+mir (0.26.3-0ubuntu1) UNRELEASED; urgency=medium
+
+  * New upstream release 0.26.3 (https://launchpad.net/mir/+milestone/0.26.3)
+    - Enhancements:
+      . Make deprecations optional (and default to off for builds on 16.04 LTS)
+      . Added support for building on Ubuntu 17.10 artful.
+    - Bugs fixed:
+      . Mir needs to be updated to 0.26 in 16.04LTS (LP: #1685186)
+      . unity-system-compositor crashed with SIGSEGV in
+        libinput_device_config_accel_is_available() from
+        libinput_device_config_accel_set_speed() from
+        mir::input::evdev::LibInputDevice::apply_settings() (LP: #1672955)
+      . Please transition to Boost 1.62 (LP: #1675138)
+      . Mir sending key repeat events continually to nested shell after VT
+        switch (causes Unity8 lockup for a while) (LP: #1675357)
+      . mir_demo_standalone_render_overlays fails to link (LP: #1677239)
+
+ -- Daniel van Vugt <[e-mail]>  Thu, 30 Mar 2017 11:43:28 +0800
+
+mir (0.26.2+17.04.20170322.1-0ubuntu2) zesty; urgency=medium
+
+  [ Mattia Rizzolo ]
+  * Patch the code to use unversioned runtime boost libraries (LP: #1675138).
+
+ -- Gianfranco Costamagna <[e-mail]>  Fri, 24 Mar 2017 22:58:36 +0100
+
+mir (0.26.2+17.04.20170322.1-0ubuntu1) zesty; urgency=medium
+
+  [ Daniel van Vugt ]
+  * New upstream release 0.26.2 (https://launchpad.net/mir/+milestone/0.26.2)
+    - Bugs fixed:
+      . EDID does not change when hotplugging a monitor (LP: #1660017)
+      . [regression] mirout crashes when connecting to unity8 or any nested
+        server: [libprotobuf FATAL /usr/include/google/protobuf/repeated_field.
+        h:1408] CHECK failed: (index) < (current_size_) (LP: #1661163)
+      . Mir server crashed with SIGSEGV in
+        mir::compositor::TemporaryBuffer::size() called from
+        mir::gl::tessellate_renderable_into_rectangle() (LP: #1664760)
+      . Nested servers (Unity8) periodically stutter (half frame rate) with
+        Mir 0.26.1 (LP: #1666372)
+      . Don't dereference the end iterator in ms::ApplicationSession::
+        surface_after() (LP: #1667645)
+      . [regression] OSK input shaping no longer works correctly (LP: #1669444)
+      . Setting MirWindowSpec parameters always causes window's input_region
+        to be reset (LP: #1670876)
+      . Subpixel order not included in Mir display information (LP: #1393578)
+      . Presentation chains should support various swap interval modes
+        (LP: #1673533)
+      . Need an extension for GBM buffers to replace
+        mir_buffer_get_buffer_package() (LP: #1673534)
+      . Seg fault on detect_fd_leaks (LP: #1661498)
+
+ -- Cemil Azizoglu <[e-mail]>  Wed, 22 Mar 2017 04:54:19 +0000
+
 mir (0.26.1+17.04.20170209.1-0ubuntu1) zesty; urgency=medium
 
   * New upstream release 0.26.1 (https://launchpad.net/mir/+milestone/0.26.1)

=== modified file 'debian/control'
--- debian/control	2017-05-08 03:04:26 +0000
+++ debian/control	2017-05-26 09:20:21 +0000
@@ -292,6 +292,21 @@
  .
  Contains a tool for stress testing the Mir display server
 
+<<<<<<< TREE
+=======
+Package: mir-android-diagnostics
+Architecture: i386 amd64 armhf
+Pre-Depends: ${misc:Pre-Depends}
+Depends: ${misc:Depends},
+         ${shlibs:Depends},
+Recommends: mir-demos,
+Description: Display Server for Ubuntu - android platform diagnostics utility
+ Mir is a display server running on linux systems, with a focus on efficiency,
+ robust operation and a well-defined driver model.
+ .
+ Contains a tool for checking the graphics components of android devices.
+
+>>>>>>> MERGE-SOURCE
 Package: libmircore1
 Section: libs
 Architecture: linux-any
@@ -347,7 +362,25 @@
  Contains the shared libraries required for the Mir server to interact with
  the hardware platform using the Mesa drivers.
 
+<<<<<<< TREE
 Package: mir-platform-input-evdev7
+=======
+Package: mir-platform-graphics-android12
+Section: libs
+Architecture: i386 amd64 armhf
+Multi-Arch: same
+Pre-Depends: ${misc:Pre-Depends}
+Depends: ${misc:Depends},
+         ${shlibs:Depends},
+Description: Display server for Ubuntu - platform library for Android
+ Mir is a display server running on linux systems, with a focus on efficiency,
+ robust operation and a well-defined driver model.
+ .
+ Contains the shared libraries required for the Mir server to interact with
+ the hardware platform using the Android drivers.
+
+Package: mir-platform-input-evdev6
+>>>>>>> MERGE-SOURCE
 Section: libs
 Architecture: linux-any
 Multi-Arch: same
@@ -389,6 +422,23 @@
  Contains header files required to use the platform specific capabilities of
  the Mir Mesa backend.
 
+<<<<<<< TREE
+=======
+Package: mir-client-platform-android5
+Section: libs
+Architecture: i386 amd64 armhf
+Multi-Arch: same
+Pre-Depends: ${misc:Pre-Depends}
+Depends: ${misc:Depends},
+         ${shlibs:Depends}
+Description: Display server for Ubuntu - client platform library for Android
+ Mir is a display server running on linux systems, with a focus on efficiency,
+ robust operation and a well-defined driver model.
+ .
+ Contains the shared libraries required for the Mir clients to interact with
+ the underlying hardware platform using the Android drivers.
+
+>>>>>>> MERGE-SOURCE
 Package: mir-graphics-drivers-desktop
 Section: libs
 Architecture: linux-any
@@ -406,6 +456,25 @@
  This package depends on a full set of graphics drivers for traditional desktop
  systems.
 
+<<<<<<< TREE
+=======
+Package: mir-graphics-drivers-android
+Section: libs
+Architecture: i386 amd64 armhf
+Multi-Arch: same
+Pre-Depends: ${misc:Pre-Depends}
+Depends: ${misc:Depends},
+         mir-platform-graphics-android12,
+         mir-client-platform-android5,
+         mir-platform-input-evdev6,
+Description: Display server for Ubuntu - android driver metapackage
+ Mir is a display server running on linux systems, with a focus on efficiency,
+ robust operation and a well-defined driver model.
+ .
+ This package depends on a full set of graphics drivers for running Mir on top
+ of an existing Android driver stack.
+
+>>>>>>> MERGE-SOURCE
 Package: libmircookie2
 Section: libs
 Architecture: any

=== modified file 'include/client/mir/event_printer.h'
=== modified file 'include/client/mir/events/event_builders.h'
=== modified file 'include/client/mir_toolkit/client_types.h'
--- include/client/mir_toolkit/client_types.h	2017-05-23 00:22:04 +0000
+++ include/client/mir_toolkit/client_types.h	2017-05-26 09:20:21 +0000
@@ -54,6 +54,7 @@
 typedef struct MirError MirError;
 typedef struct MirPresentationChain MirPresentationChain;
 typedef struct MirBuffer MirBuffer;
+<<<<<<< TREE
 typedef struct MirRenderSurface MirRenderSurface;
 
 /**
@@ -62,6 +63,9 @@
  */
 typedef struct MirCursorConfiguration MirCursorConfiguration
 MIR_FOR_REMOVAL_IN_VERSION_1("Use mir_window_spec_set_cursor_name/mir_window_spec_set_cursor_render_surface instead");
+=======
+typedef struct MirRenderSurface MirRenderSurface;
+>>>>>>> MERGE-SOURCE
 
 /**
  * Descriptor for an output connection.
@@ -576,10 +580,16 @@
 
 typedef void (*mir_surface_id_callback)(
     MirSurface* surface, MirPersistentId* id, void* context)
+<<<<<<< TREE
 MIR_FOR_REMOVAL_IN_VERSION_1("Use MirWindowIdCallback instead");
 
 typedef MirSurfaceParameters MirWindowParameters
 MIR_FOR_REMOVAL_IN_VERSION_1("Use mir_window_get_xxx apis or listen for attribute events instead");
+=======
+MIR_FOR_REMOVAL_IN_VERSION_1("Use MirWindowIdCallback instead");
+
+typedef MirSurfaceParameters MirWindowParameters;
+>>>>>>> MERGE-SOURCE
 
 #pragma GCC diagnostic pop
 

=== modified file 'include/client/mir_toolkit/events/event.h'
=== modified file 'include/client/mir_toolkit/extensions/gbm_buffer.h'
--- include/client/mir_toolkit/extensions/gbm_buffer.h	2017-05-08 03:04:26 +0000
+++ include/client/mir_toolkit/extensions/gbm_buffer.h	2017-05-26 09:20:21 +0000
@@ -76,6 +76,7 @@
         connection, "mir_extension_gbm_buffer", 1);
 }
 
+<<<<<<< TREE
 /** Allocate a MirBuffer via gbm and wait for the allocation.
  *  available in V2.
  *  The buffer can be destroyed via mir_buffer_release().
@@ -155,6 +156,87 @@
         connection, "mir_extension_gbm_buffer", 2);
 }
 
+=======
+/** Allocate a MirBuffer via gbm and wait for the allocation.
+ *  available in V2.
+ *  The buffer can be destroyed via mir_buffer_release().
+ *
+ *   \param [in] connection            The connection
+ *   \param [in] width                 Requested buffer width
+ *   \param [in] height                Requested buffer height
+ *   \param [in] gbm_pixel_format      The pixel format, one of the GBM_FORMATs
+ *   \param [in] gbm_bo_flags          The gbm_bo_flags for the buffer.
+ *   \return                           The buffer
+ **/
+typedef MirBuffer* (*MirConnectionAllocateBufferGbmSync)(
+    MirConnection* connection,
+    uint32_t width, uint32_t height,
+    uint32_t gbm_pixel_format,
+    uint32_t gbm_bo_flags);
+
+/** Check if a MirBuffer is suitable for import via GBM_BO_IMPORT_FD
+ * 
+ *   \param [in] buffer The buffer
+ *   \return            True if suitable, false if unsuitable
+ */
+typedef bool (*MirBufferIsGbmImportable)(MirBuffer* buffer);
+
+/** Access the fd a MirBuffer suitable for gbm import
+ *   \pre               The buffer is suitable for GBM_BO_IMPORT_FD
+ *   \warning           The fd is owned by the buffer. Do not close() it.
+ *   \param [in] buffer The buffer
+ *   \return            The fd
+ */
+typedef int (*MirBufferGbmFd)(MirBuffer* buffer);
+
+/** Get the stride of a MirBuffer
+ *   \pre               The buffer is suitable for GBM_BO_IMPORT_FD
+ *   \param [in] buffer The buffer
+ *   \return            The stride of the buffer
+ */
+typedef uint32_t (*MirBufferGbmStride)(MirBuffer* buffer);
+
+/** Get the GBM_FORMAT of a MirBuffer
+ *   \pre               The buffer is suitable for GBM_BO_IMPORT_FD
+ *   \param [in] buffer The buffer
+ *   \return            The GBM_FORMAT of the buffer
+ */
+typedef uint32_t (*MirBufferGbmFormat)(MirBuffer* buffer);
+
+/** Get the gbm_bo_flags of a MirBuffer
+ *   \pre               The buffer is suitable for GBM_BO_IMPORT_FD
+ *   \param [in] buffer The buffer
+ *   \return            The gbm_bo_flags of the buffer
+ */
+typedef uint32_t (*MirBufferGbmFlags)(MirBuffer* buffer);
+
+/** Get the age of a MirBuffer
+ *   \pre               The buffer is suitable for GBM_BO_IMPORT_FD
+ *   \param [in] buffer The buffer
+ *   \return            The age of the buffer
+ */
+typedef unsigned int (*MirBufferGbmAge)(MirBuffer* buffer);
+
+typedef struct MirExtensionGbmBufferV2
+{
+    MirConnectionAllocateBufferGbm allocate_buffer_gbm;
+    MirConnectionAllocateBufferGbmSync allocate_buffer_gbm_sync;
+    MirBufferIsGbmImportable is_gbm_importable;
+    MirBufferGbmFd fd;
+    MirBufferGbmStride stride;
+    MirBufferGbmFormat format;
+    MirBufferGbmFlags flags;
+    MirBufferGbmAge age;
+} MirExtensionGbmBufferV2;
+
+static inline MirExtensionGbmBufferV2 const* mir_extension_gbm_buffer_v2(
+    MirConnection* connection)
+{
+    return (MirExtensionGbmBufferV2 const*) mir_connection_request_extension(
+        connection, "mir_extension_gbm_buffer", 2);
+}
+
+>>>>>>> MERGE-SOURCE
 #ifdef __cplusplus
 }
 #endif

=== modified file 'include/client/mir_toolkit/mir_buffer_stream.h'
--- include/client/mir_toolkit/mir_buffer_stream.h	2017-05-23 00:22:04 +0000
+++ include/client/mir_toolkit/mir_buffer_stream.h	2017-05-26 09:20:21 +0000
@@ -155,9 +155,17 @@
  *   \return                  One of mir_platform_type_android or 
  *                            mir_platform_type_gbm
  */
+<<<<<<< TREE
 MirPlatformType mir_buffer_stream_get_platform_type(MirBufferStream *stream)
 MIR_FOR_REMOVAL_IN_VERSION_1("To identify the graphics platform use mir_connection_get_graphics_module(). \n"
                              "To safely interpret the buffer contents use mir_buffer_stream_get_graphics_region()");
+=======
+/// @cond
+MIR_FOR_REMOVAL_IN_VERSION_1("To identify the graphics platform use mir_connection_get_graphics_module(). \n"
+                             "To safely interpret the buffer contents use mir_buffer_stream_get_graphics_region()")
+/// @endcond
+MirPlatformType mir_buffer_stream_get_platform_type(MirBufferStream *stream);
+>>>>>>> MERGE-SOURCE
 
 /**
  * Retrieve the current buffer in "raw" representation.

=== modified file 'include/client/mir_toolkit/mir_connection.h'
=== modified file 'include/client/mir_toolkit/mir_cursor_configuration.h'
--- include/client/mir_toolkit/mir_cursor_configuration.h	2017-05-23 00:22:04 +0000
+++ include/client/mir_toolkit/mir_cursor_configuration.h	2017-05-26 09:20:21 +0000
@@ -20,7 +20,17 @@
 
 #include <mir_toolkit/common.h>
 #include <mir_toolkit/client_types.h>
-#include <mir_toolkit/deprecations.h>
+<<<<<<< TREE
+#include <mir_toolkit/deprecations.h>
+=======
+#include <mir_toolkit/deprecations.h>
+
+/**
+ * Opaque structure containing cursor parameterization. Create with mir_cursor* family.
+ * Used with mir_window_configure_cursor.
+ */
+typedef struct MirCursorConfiguration MirCursorConfiguration;
+>>>>>>> MERGE-SOURCE
 
 #ifdef __cplusplus
 /**
@@ -51,8 +61,15 @@
  *    \return A cursor parameters object which must be passed
  *            to_mir_cursor_configuration_destroy
  */
+<<<<<<< TREE
 MirCursorConfiguration *mir_cursor_configuration_from_name(char const* name)
 MIR_FOR_REMOVAL_IN_VERSION_1("Use mir_window_spec_set_cursor_name() instead");
+=======
+/// @cond
+MIR_FOR_REMOVAL_IN_VERSION_1("use mir_window_spec_set_cursor_name()")
+/// @endcond
+MirCursorConfiguration *mir_cursor_configuration_from_name(char const* name);
+>>>>>>> MERGE-SOURCE
 
 /**
  * Returns a new cursor configuration tied to a given buffer stream.

=== modified file 'include/client/mir_toolkit/mir_display_configuration.h'
=== modified file 'include/client/mir_toolkit/mir_window.h'
--- include/client/mir_toolkit/mir_window.h	2017-05-23 00:22:04 +0000
+++ include/client/mir_toolkit/mir_window.h	2017-05-26 09:20:21 +0000
@@ -585,8 +585,37 @@
  */
 void mir_window_spec_set_streams(MirWindowSpec* spec,
                                  MirBufferStreamInfo* streams,
+<<<<<<< TREE
                                  unsigned int num_streams)
 MIR_FOR_REMOVAL_IN_VERSION_1("Use mir_window_spec_add_render_surface instead");
+=======
+                                 unsigned int num_streams);
+
+/**
+ * Set the MirWindowSpec to display content contained in a render surface
+ *
+ * \warning: The initial call to mir_window_spec_add_render_surface will set
+ *           the bottom-most content, and subsequent calls will stack the
+ *           content on top.
+ *
+ * \param spec             The window_spec to be updated
+ * \param render_surface   The render surface containing the content to be displayed
+ * \param logical_width    The width that the content will be displayed at
+ *                         (Ignored for buffer streams)
+ * \param logical_height   The height that the content will be displayed at
+ *                         (Ignored for buffer streams)
+ * \param displacement_x   The x displacement from the top-left corner of the MirWindow
+ * \param displacement_y   The y displacement from the top-left corner of the MirWindow
+ */
+#pragma GCC diagnostic push
+#pragma GCC diagnostic ignored "-Wdeprecated-declarations"
+void mir_window_spec_add_render_surface(MirWindowSpec* spec,
+                                        MirRenderSurface* render_surface,
+                                        int logical_width, int logical_height,
+                                        int displacement_x, int displacement_y)
+MIR_FOR_REMOVAL_IN_VERSION_1("This function is slated for rename due to MirRenderSurface-->MirSurface transition");
+#pragma GCC diagnostic pop
+>>>>>>> MERGE-SOURCE
 
 /**
  * Release the resources held by a MirWindowSpec.

=== modified file 'include/client/mir_toolkit/rs/mir_render_surface.h'
--- include/client/mir_toolkit/rs/mir_render_surface.h	2017-05-23 00:22:04 +0000
+++ include/client/mir_toolkit/rs/mir_render_surface.h	2017-05-26 09:20:21 +0000
@@ -21,6 +21,7 @@
 #define MIR_TOOLKIT_MIR_RENDER_SURFACE_H_
 
 #include <mir_toolkit/client_types.h>
+<<<<<<< TREE
 #include <mir_toolkit/deprecations.h>
 
 #ifndef MIR_DEPRECATE_RENDERSURFACES
@@ -33,6 +34,20 @@
 #else
     #define MIR_RENDERSURFACES_FOR_RENAME_IN_VERSION_1
 #endif
+=======
+#include <mir_toolkit/deprecations.h>
+
+#ifndef MIR_DEPRECATE_RENDERSURFACES
+    #define MIR_DEPRECATE_RENDERSURFACES 0
+#endif
+
+#if MIR_ENABLE_DEPRECATIONS > 0 && MIR_DEPRECATE_RENDERSURFACES > 0
+    #define MIR_DEPRECATE_RENDERSURFACES_FOR_RENAME\
+    __attribute__((deprecated("This function is slated for rename due to MirRenderSurface-->MirSurface transition")))
+#else
+    #define MIR_DEPRECATE_RENDERSURFACES_FOR_RENAME
+#endif
+>>>>>>> MERGE-SOURCE
 
 #ifdef __cplusplus
 /**
@@ -42,9 +57,15 @@
 extern "C" {
 #endif
 
+<<<<<<< TREE
 typedef void (*MirRenderSurfaceCallback)(MirRenderSurface*, void* context)
 MIR_RENDERSURFACES_FOR_RENAME_IN_VERSION_1;
 
+=======
+typedef void (*MirRenderSurfaceCallback)(MirRenderSurface*, void* context)
+MIR_DEPRECATE_RENDERSURFACES_FOR_RENAME;
+
+>>>>>>> MERGE-SOURCE
 #pragma GCC diagnostic push
 #pragma GCC diagnostic ignored "-Wdeprecated-declarations"
 /**
@@ -64,7 +85,11 @@
     int width, int height,
     MirRenderSurfaceCallback callback,
     void* context)
+<<<<<<< TREE
 MIR_RENDERSURFACES_FOR_RENAME_IN_VERSION_1;
+=======
+MIR_DEPRECATE_RENDERSURFACES_FOR_RENAME;
+>>>>>>> MERGE-SOURCE
 
 /**
  * Create a render surface and wait for the result
@@ -79,7 +104,11 @@
 MirRenderSurface* mir_connection_create_render_surface_sync(
     MirConnection* connection,
     int width, int height)
+<<<<<<< TREE
 MIR_RENDERSURFACES_FOR_RENAME_IN_VERSION_1;
+=======
+MIR_DEPRECATE_RENDERSURFACES_FOR_RENAME;
+>>>>>>> MERGE-SOURCE
 
 /**
  * Get the size of the MirRenderSurface
@@ -91,7 +120,11 @@
 void mir_render_surface_get_size(
     MirRenderSurface* render_surface,
     int* width, int* height)
+<<<<<<< TREE
 MIR_RENDERSURFACES_FOR_RENAME_IN_VERSION_1;
+=======
+MIR_DEPRECATE_RENDERSURFACES_FOR_RENAME;
+>>>>>>> MERGE-SOURCE
 
 /**
  * Set the size of the MirRenderSurface
@@ -103,7 +136,11 @@
 void mir_render_surface_set_size(
     MirRenderSurface* render_surface,
     int width, int height)
+<<<<<<< TREE
 MIR_RENDERSURFACES_FOR_RENAME_IN_VERSION_1;
+=======
+MIR_DEPRECATE_RENDERSURFACES_FOR_RENAME;
+>>>>>>> MERGE-SOURCE
 
 /**
  * Test for a valid render surface
@@ -115,8 +152,12 @@
  */
 bool mir_render_surface_is_valid(
     MirRenderSurface* render_surface)
+<<<<<<< TREE
 MIR_RENDERSURFACES_FOR_RENAME_IN_VERSION_1;
 
+=======
+MIR_DEPRECATE_RENDERSURFACES_FOR_RENAME;
+>>>>>>> MERGE-SOURCE
 /**
  * Retrieve a text description of the error. The returned string is owned by
  * the library and remains valid until the render surface or the associated
@@ -128,7 +169,11 @@
  */
 char const *mir_render_surface_get_error_message(
     MirRenderSurface* render_surface)
+<<<<<<< TREE
 MIR_RENDERSURFACES_FOR_RENAME_IN_VERSION_1;
+=======
+MIR_DEPRECATE_RENDERSURFACES_FOR_RENAME;
+>>>>>>> MERGE-SOURCE
 
 /**
  * Release the specified render surface
@@ -137,7 +182,11 @@
  */
 void mir_render_surface_release(
     MirRenderSurface* render_surface)
+<<<<<<< TREE
 MIR_RENDERSURFACES_FOR_RENAME_IN_VERSION_1;
+=======
+MIR_DEPRECATE_RENDERSURFACES_FOR_RENAME;
+>>>>>>> MERGE-SOURCE
 
 /**
  * Obtain the buffer stream backing a given render surface.
@@ -157,7 +206,11 @@
     MirRenderSurface* render_surface,
     int width, int height,
     MirPixelFormat format)
+<<<<<<< TREE
 MIR_RENDERSURFACES_FOR_RENAME_IN_VERSION_1;
+=======
+MIR_DEPRECATE_RENDERSURFACES_FOR_RENAME;
+>>>>>>> MERGE-SOURCE
 
 /**
  * Obtain the presentation chain backing a given render surface.
@@ -170,6 +223,7 @@
  */
 MirPresentationChain* mir_render_surface_get_presentation_chain(
     MirRenderSurface* render_surface)
+<<<<<<< TREE
 MIR_RENDERSURFACES_FOR_RENAME_IN_VERSION_1;
 
 /** Query whether the server supports a given presentation mode.
@@ -191,6 +245,29 @@
  */
 void mir_presentation_chain_set_mode(
     MirPresentationChain* chain, MirPresentMode mode);
+=======
+MIR_DEPRECATE_RENDERSURFACES_FOR_RENAME;
+
+/** Query whether the server supports a given presentation mode.
+ *
+ *  \param [in] connection  The connection
+ *  \param [in] mode        The MirPresentMode
+ *  \return                 True if supported, false if not
+ */
+bool mir_connection_present_mode_supported(
+    MirConnection* connection, MirPresentMode mode);
+
+/** Respecify the submission mode that the MirPresentationChain is operating with.
+ *  The buffers currently queued will immediately be requeued according
+ *  to the new mode.
+ *
+ *  \pre    mir_connection_present_mode_supported must indicate that the mode is supported
+ *  \param [in] chain   The chain
+ *  \param [in] mode    The mode to change to
+ */
+void mir_presentation_chain_set_mode(
+    MirPresentationChain* chain, MirPresentMode mode);
+>>>>>>> MERGE-SOURCE
 
 /**
  * Set the MirWindowSpec to contain a specific cursor.
@@ -204,6 +281,7 @@
     MirWindowSpec* spec,
     MirRenderSurface* render_surface,
     int hotspot_x, int hotspot_y)
+<<<<<<< TREE
 MIR_RENDERSURFACES_FOR_RENAME_IN_VERSION_1;
 
 /**
@@ -243,6 +321,31 @@
                                         int logical_width, int logical_height,
                                         int displacement_x, int displacement_y)
 MIR_RENDERSURFACES_FOR_RENAME_IN_VERSION_1;
+=======
+MIR_DEPRECATE_RENDERSURFACES_FOR_RENAME;
+
+/**
+ * Set the MirWindowSpec to display content contained in a render surface
+ *
+ * \warning: The initial call to mir_window_spec_add_render_surface will set
+ *           the bottom-most content, and subsequent calls will stack the
+ *           content on top.
+ *
+ * \param spec             The window_spec to be updated
+ * \param render_surface   The render surface containing the content to be displayed
+ * \param logical_width    The width that the content will be displayed at
+ *                         (Ignored for buffer streams)
+ * \param logical_height   The height that the content will be displayed at
+ *                         (Ignored for buffer streams)
+ * \param displacement_x   The x displacement from the top-left corner of the MirWindow
+ * \param displacement_y   The y displacement from the top-left corner of the MirWindow
+ */
+void mir_window_spec_add_render_surface(MirWindowSpec* spec,
+                                        MirRenderSurface* render_surface,
+                                        int logical_width, int logical_height,
+                                        int displacement_x, int displacement_y)
+MIR_DEPRECATE_RENDERSURFACES_FOR_RENAME;
+>>>>>>> MERGE-SOURCE
 
 #pragma GCC diagnostic pop
 

=== modified file 'include/core/mir_toolkit/deprecations.h'
--- include/core/mir_toolkit/deprecations.h	2017-05-16 16:10:46 +0000
+++ include/core/mir_toolkit/deprecations.h	2017-05-26 09:20:21 +0000
@@ -1,3 +1,4 @@
+<<<<<<< TREE
 /*
  * Copyright © 2017 Canonical Ltd.
  *
@@ -34,3 +35,41 @@
 #endif
 
 #endif //MIR_DEPRECATIONS_H_
+=======
+/*
+ * Copyright © 2017 Canonical Ltd.
+ *
+ * This program is free software: you can redistribute it and/or modify it
+ * under the terms of the GNU Lesser General Public License version 3,
+ * as published by the Free Software Foundation.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+#ifndef MIR_DEPRECATIONS_H_
+#define MIR_DEPRECATIONS_H_
+
+#ifndef MIR_ENABLE_DEPRECATIONS
+    // use g++ version < 6.2 as a proxy for building on Ubunutu 16.04LTS ("Xenial") or 16.10 (Yakkety)
+    #if defined(__clang__) || !defined(__GNUC__) || (__GNUC__ > 6) || ((__GNUC__ == 6) && (__GNUC_MINOR__ >= 2))
+        #define MIR_ENABLE_DEPRECATIONS 1
+    #else
+        #define MIR_ENABLE_DEPRECATIONS 0
+    #endif
+#endif
+
+#if MIR_ENABLE_DEPRECATIONS > 0
+    #define MIR_FOR_REMOVAL_IN_VERSION_1(message)\
+    __attribute__((deprecated(message)))
+#else
+    #define MIR_FOR_REMOVAL_IN_VERSION_1(message)
+#endif
+
+#endif //MIR_DEPRECATIONS_H_
+>>>>>>> MERGE-SOURCE

=== modified file 'src/client/display_configuration_api.cpp'
=== modified file 'src/client/mir_render_surface_api.cpp'
=== modified file 'src/client/symbols.map'
=== modified file 'src/platform/options/default_configuration.cpp'
=== added directory 'src/platforms/android'
=== added directory 'src/platforms/android/utils'
=== added file 'src/platforms/android/utils/CMakeLists.txt.OTHER'
--- src/platforms/android/utils/CMakeLists.txt.OTHER	1970-01-01 00:00:00 +0000
+++ src/platforms/android/utils/CMakeLists.txt.OTHER	2017-05-26 09:20:21 +0000
@@ -0,0 +1,46 @@
+list(
+  APPEND ANDROID_DIAGNOSTICS_SRCS
+  ${CMAKE_CURRENT_SOURCE_DIR}/test_android_hardware_sanity.cpp
+  ${CMAKE_CURRENT_SOURCE_DIR}/patterns.cpp
+)
+
+add_definitions(-DMIR_SERVER_GRAPHICS_PLATFORM_VERSION="${MIR_SERVER_GRAPHICS_PLATFORM_VERSION}")
+
+include_directories(
+  ${PROJECT_SOURCE_DIR}/include/server
+  ${PROJECT_SOURCE_DIR}/include/client
+  ${PROJECT_SOURCE_DIR}/include/platform
+  ${PROJECT_SOURCE_DIR}/src/include/common
+  ${PROJECT_SOURCE_DIR}/include/test
+  ${PROJECT_SOURCE_DIR}/tests/include
+  ${PROJECT_SOURCE_DIR}/src/include/server
+  ${PROJECT_SOURCE_DIR}/examples
+  ${PROJECT_SOURCE_DIR}/src/platforms/android/include
+)
+
+add_executable(
+  mir_android_diagnostics
+  ${ANDROID_DIAGNOSTICS_SRCS})
+
+target_link_libraries(
+  mir_android_diagnostics
+  mirserver
+  mirdraw
+  mir-test-static
+  mir-test-framework-static
+  ${LIBHARDWARE_LIBRARIES}
+)
+
+mir_add_wrapped_executable(mir_demo_standalone_render_overlays
+  render_overlays.cpp
+)
+
+target_link_libraries(mir_demo_standalone_render_overlays
+  mirclient
+  mircommon
+  mirplatform
+)
+
+install(PROGRAMS ${CMAKE_RUNTIME_OUTPUT_DIRECTORY}/mir_android_diagnostics
+  DESTINATION ${CMAKE_INSTALL_BINDIR}
+)

=== modified file 'src/platforms/mesa/client/client_platform.cpp'
--- src/platforms/mesa/client/client_platform.cpp	2017-05-17 04:48:46 +0000
+++ src/platforms/mesa/client/client_platform.cpp	2017-05-26 09:20:21 +0000
@@ -21,9 +21,15 @@
 #include "client_buffer_factory.h"
 #include "mesa_native_display_container.h"
 #include "native_surface.h"
+<<<<<<< TREE
 #include "mir/client/client_buffer_factory.h"
 #include "mir/client/client_context.h"
 #include "mir/client/client_buffer.h"
+=======
+#include "mir/client_buffer_factory.h"
+#include "mir/client_context.h"
+#include "mir/client_buffer.h"
+>>>>>>> MERGE-SOURCE
 #include "mir/mir_render_surface.h"
 #include "mir/mir_buffer.h"
 #include "mir/weak_egl.h"
@@ -138,6 +144,7 @@
         available_callback, available_context); 
 }
 
+<<<<<<< TREE
 void allocate_buffer_gbm_legacy(
     MirConnection* connection,
     int width, int height,
@@ -283,6 +290,144 @@
 {
     return 0;
 }
+=======
+void allocate_buffer_gbm_legacy(
+    MirConnection* connection,
+    int width, int height,
+    unsigned int gbm_pixel_format,
+    unsigned int gbm_bo_flags,
+    MirBufferCallback available_callback, void* available_context)
+{
+    allocate_buffer_gbm(
+        connection, static_cast<uint32_t>(width), static_cast<uint32_t>(height),
+        static_cast<uint32_t>(gbm_pixel_format), static_cast<uint32_t>(gbm_bo_flags),
+        available_callback, available_context);
+}
+
+MirBuffer* allocate_buffer_gbm_sync(
+    MirConnection* connection,
+    uint32_t width, uint32_t height,
+    uint32_t gbm_pixel_format,
+    uint32_t gbm_bo_flags)
+try
+{
+    struct BufferSync
+    {
+        void set_buffer(MirBuffer* b)
+        {
+            std::unique_lock<decltype(mutex)> lk(mutex);
+            buffer = b;
+            cv.notify_all();
+        }
+
+        MirBuffer* wait_for_buffer()
+        {
+            std::unique_lock<decltype(mutex)> lk(mutex);
+            cv.wait(lk, [this]{ return buffer; });
+            return buffer;
+        }
+    private:
+        std::mutex mutex;
+        std::condition_variable cv;
+        MirBuffer* buffer = nullptr;
+    } sync;
+
+    allocate_buffer_gbm(
+        connection, width, height, gbm_pixel_format, gbm_bo_flags,
+        [](auto* b, auto* context){ reinterpret_cast<BufferSync*>(context)->set_buffer(b); }, &sync);
+    return sync.wait_for_buffer();
+}
+catch (...)
+{
+    return nullptr;
+}
+
+bool is_gbm_importable(MirBuffer* b)
+try
+{
+    if (!b)
+        return false;
+    auto buffer = reinterpret_cast<mcl::MirBuffer*>(b);
+    auto native = dynamic_cast<mgm::NativeBuffer*>(buffer->client_buffer()->native_buffer_handle().get());
+    if (!native)
+        return false;
+    return native->is_gbm_buffer;
+}
+catch (...)
+{
+    return false;
+}
+
+int import_fd(MirBuffer* b)
+try
+{
+    if (!is_gbm_importable(b))
+        return -1;
+    auto buffer = reinterpret_cast<mcl::MirBuffer*>(b);
+    auto native = dynamic_cast<mgm::NativeBuffer*>(buffer->client_buffer()->native_buffer_handle().get());
+    return native->fd[0];
+}
+catch (...)
+{
+    return -1;
+}
+
+uint32_t buffer_stride(MirBuffer* b)
+try
+{
+    if (!is_gbm_importable(b))
+        return 0;
+    auto buffer = reinterpret_cast<mcl::MirBuffer*>(b);
+    auto native = dynamic_cast<mgm::NativeBuffer*>(buffer->client_buffer()->native_buffer_handle().get());
+    return native->stride;
+}
+catch (...)
+{
+    return 0;
+}
+
+uint32_t buffer_format(MirBuffer* b)
+try
+{
+    if (!is_gbm_importable(b))
+        return 0;
+    auto buffer = reinterpret_cast<mcl::MirBuffer*>(b);
+    auto native = dynamic_cast<mgm::NativeBuffer*>(buffer->client_buffer()->native_buffer_handle().get());
+    return native->native_format;
+}
+catch (...)
+{
+    return 0;
+}
+
+uint32_t buffer_flags(MirBuffer* b)
+try
+{
+    if (!is_gbm_importable(b))
+        return 0;
+    auto buffer = reinterpret_cast<mcl::MirBuffer*>(b);
+    auto native = dynamic_cast<mgm::NativeBuffer*>(buffer->client_buffer()->native_buffer_handle().get());
+    return native->native_flags;
+}
+catch (...)
+{
+    return 0;
+}
+
+unsigned int buffer_age(MirBuffer* b)
+try
+{
+    if (!is_gbm_importable(b))
+        return 0;
+    auto buffer = reinterpret_cast<mcl::MirBuffer*>(b);
+    auto native = dynamic_cast<mgm::NativeBuffer*>(buffer->client_buffer()->native_buffer_handle().get());
+    return native->age;
+}
+catch (...)
+{
+    return 0;
+}
+>>>>>>> MERGE-SOURCE
 #pragma GCC diagnostic push
 #pragma GCC diagnostic ignored "-Wdeprecated-declarations"
 MirBufferStream* get_hw_stream(

=== modified file 'src/platforms/mesa/client/client_platform.h'
=== modified file 'src/platforms/mesa/server/kms/real_kms_display_configuration.cpp'
--- src/platforms/mesa/server/kms/real_kms_display_configuration.cpp	2017-05-08 03:04:26 +0000
+++ src/platforms/mesa/server/kms/real_kms_display_configuration.cpp	2017-05-26 09:20:21 +0000
@@ -142,6 +142,7 @@
 
 void mgm::RealKMSDisplayConfiguration::update()
 {
+<<<<<<< TREE
     decltype(outputs) new_outputs;
 
     displays->update_from_hardware_state();
@@ -180,6 +181,219 @@
      * to provide a max_simultaneous_outputs value that is useful to clients.
      */
     card.max_simultaneous_outputs = outputs.size();
+=======
+    kms::DRMModeResources resources{drm_fd};
+
+    size_t max_outputs = std::min(resources.num_crtcs(), resources.num_connectors());
+    card = {DisplayConfigurationCardId{0}, max_outputs};
+
+    resources.for_each_connector([&](kms::DRMModeConnectorUPtr connector)
+    {
+        add_or_update_output(resources, *connector);
+    });
+}
+
+namespace
+{
+std::vector<uint8_t> edid_for_connector(int drm_fd, uint32_t connector_id)
+{
+    std::vector<uint8_t> edid;
+
+    mgk::ObjectProperties connector_props{
+        drm_fd, connector_id, DRM_MODE_OBJECT_CONNECTOR};
+
+    if (connector_props.has_property("EDID"))
+    {
+        /*
+         * We don't technically need the property information here, but query it
+         * anyway so we can detect if our assumptions about DRM behaviour
+         * become invalid.
+         */
+        auto property = mgk::DRMModePropertyUPtr{
+            drmModeGetProperty(drm_fd, connector_props.id_for("EDID")),
+            &drmModeFreeProperty};
+
+        if (!property)
+        {
+            mir::log_warning(
+                "Failed to get EDID property for connector %u: %i (%s)",
+                connector_id,
+                errno,
+                ::strerror(errno));
+            return edid;
+        }
+
+        if (!drm_property_type_is(property.get(), DRM_MODE_PROP_BLOB))
+        {
+            mir::log_warning(
+                "EDID property on connector %u has unexpected type %u",
+                connector_id,
+                property->flags);
+            return edid;
+        }
+
+        // A property ID of 0 means invalid.
+        if (connector_props["EDID"] == 0)
+        {
+            /*
+             * Log a debug message only. This will trigger for broken monitors which
+             * don't provide an EDID, which is not as unusual as you might think...
+             */
+            mir::log_debug("No EDID data available on connector %u", connector_id);
+            return edid;
+        }
+
+        auto blob = drmModeGetPropertyBlob(drm_fd, connector_props["EDID"]);
+
+        if (!blob)
+        {
+            mir::log_warning(
+                "Failed to get EDID property blob for connector %u: %i (%s)",
+                connector_id,
+                errno,
+                ::strerror(errno));
+
+            return edid;
+        }
+
+        edid.reserve(blob->length);
+        edid.insert(edid.begin(),
+            reinterpret_cast<uint8_t*>(blob->data),
+            reinterpret_cast<uint8_t*>(blob->data) + blob->length);
+
+        drmModeFreePropertyBlob(blob);
+
+        edid.shrink_to_fit();
+    }
+
+    return edid;
+}
+}
+
+void mgm::RealKMSDisplayConfiguration::add_or_update_output(
+    kms::DRMModeResources const& resources,
+    drmModeConnector const& connector)
+{
+    DisplayConfigurationOutputId id{static_cast<int>(connector.connector_id)};
+    DisplayConfigurationCardId card_id{0};
+    DisplayConfigurationOutputType const type{
+        kms_connector_type_to_output_type(connector.connector_type)};
+    geom::Size physical_size{connector.mmWidth, connector.mmHeight};
+    bool connected{connector.connection == DRM_MODE_CONNECTED};
+    uint32_t const invalid_mode_index = std::numeric_limits<uint32_t>::max();
+    uint32_t current_mode_index{invalid_mode_index};
+    uint32_t preferred_mode_index{invalid_mode_index};
+    std::vector<DisplayConfigurationMode> modes;
+    std::vector<MirPixelFormat> formats {mir_pixel_format_argb_8888,
+                                         mir_pixel_format_xrgb_8888};
+
+    std::vector<uint8_t> edid;
+    if (connected)
+    {
+        /* Only ask for the EDID on connected outputs. There's obviously no monitor EDID
+         * when there is no monitor connected!
+         */
+        edid = edid_for_connector(drm_fd, connector.connector_id);
+    }
+
+    drmModeModeInfo current_mode_info = drmModeModeInfo();
+    GammaCurves gamma;
+
+    /* Get information about the current mode */
+    if (connector.encoder_id)
+    {
+        auto encoder = resources.encoder(connector.encoder_id);
+        if (encoder->crtc_id)
+        {
+            current_mode_info = resources.crtc(encoder->crtc_id)->mode;
+
+            auto crtc = resources.crtc(encoder->crtc_id);
+            if (crtc->gamma_size > 0)
+                gamma = mg::LinearGammaLUTs(crtc->gamma_size);
+        }
+    }
+
+    /* Add all the available modes and find the current and preferred one */
+    for (int m = 0; m < connector.count_modes; m++)
+    {
+        drmModeModeInfo& mode_info = connector.modes[m];
+
+        geom::Size size{mode_info.hdisplay, mode_info.vdisplay};
+
+        double vrefresh_hz = calculate_vrefresh_hz(mode_info);
+
+        modes.push_back({size, vrefresh_hz});
+
+        if (kms_modes_are_equal(mode_info, current_mode_info))
+            current_mode_index = m;
+
+        if ((mode_info.type & DRM_MODE_TYPE_PREFERRED) == DRM_MODE_TYPE_PREFERRED)
+            preferred_mode_index = m;
+    }
+
+    /* Add or update the output */
+    auto iter = find_output_with_id(id);
+
+    if (iter == outputs.end())
+    {
+        outputs.push_back({id, card_id, type, formats, modes, preferred_mode_index,
+                           physical_size, connected, false, geom::Point(),
+                           current_mode_index, mir_pixel_format_xrgb_8888,
+                           mir_power_mode_on, mir_orientation_normal,
+                           1.0f, mir_form_factor_monitor,
+                           kms_subpixel_to_mir_subpixel(connector.subpixel),
+                           gamma, mir_output_gamma_supported, std::move(edid)});
+    }
+    else
+    {
+        auto& output = *iter;
+
+        if (current_mode_index != invalid_mode_index)
+        {
+            output.current_mode_index = current_mode_index;
+        }
+        else if (!modes.empty() &&  // If empty retain old current_mode_index!
+                 ( output.current_mode_index >= modes.size() ||
+                   output.modes[output.current_mode_index] !=
+                          modes[output.current_mode_index]))
+        {
+            // current_mode_index is invalid and the definition of the old
+            // current mode has also changed (different display plugged in)
+            // so fall back to the preferred mode...
+            output.current_mode_index = preferred_mode_index;
+        }
+        // else output.current_mode_index is correct and unchanged.
+
+        output.modes = modes;
+        output.preferred_mode_index = preferred_mode_index;
+        output.physical_size_mm = physical_size;
+        output.connected = connected;
+        output.current_format = mir_pixel_format_xrgb_8888;
+        output.subpixel_arrangement = kms_subpixel_to_mir_subpixel(connector.subpixel);
+        output.gamma = gamma;
+        output.edid = edid;
+    }
+}
+
+std::vector<mg::DisplayConfigurationOutput>::iterator
+mgm::RealKMSDisplayConfiguration::find_output_with_id(mg::DisplayConfigurationOutputId id)
+{
+    return std::find_if(outputs.begin(), outputs.end(),
+                        [id](DisplayConfigurationOutput const& output)
+                        {
+                            return output.id == id;
+                        });
+}
+
+std::vector<mg::DisplayConfigurationOutput>::const_iterator
+mgm::RealKMSDisplayConfiguration::find_output_with_id(mg::DisplayConfigurationOutputId id) const
+{
+    return std::find_if(outputs.begin(), outputs.end(),
+                        [id](DisplayConfigurationOutput const& output)
+                        {
+                            return output.id == id;
+                        });
+>>>>>>> MERGE-SOURCE
 }
 
 // Compatibility means conf1 can be attained from conf2 (and vice versa)

=== modified file 'src/server/compositor/multi_monitor_arbiter.cpp'
--- src/server/compositor/multi_monitor_arbiter.cpp	2017-05-25 05:49:36 +0000
+++ src/server/compositor/multi_monitor_arbiter.cpp	2017-05-26 09:20:21 +0000
@@ -65,9 +65,16 @@
 
     auto& last_entry = onscreen_buffers.front();
     last_entry.use_count++;
+<<<<<<< TREE
     auto last_entry_buffer = last_entry.buffer;
     clean_onscreen_buffers(lk);
     return last_entry_buffer;
+=======
+    auto last_entry_buffer = last_entry.buffer;
+    if (mode == mc::MultiMonitorMode::multi_monitor_sync)
+        clean_onscreen_buffers(lk);
+    return last_entry_buffer;
+>>>>>>> MERGE-SOURCE
 }
 
 void mc::MultiMonitorArbiter::compositor_release(std::shared_ptr<mg::Buffer> const& buffer)

=== modified file 'src/server/frontend/session_mediator.cpp'
=== modified file 'src/server/graphics/nested/nested_display_configuration.cpp'
=== modified file 'src/server/input/default_configuration.cpp'
=== modified file 'src/server/input/default_device.cpp'
--- src/server/input/default_device.cpp	2017-05-08 03:04:26 +0000
+++ src/server/input/default_device.cpp	2017-05-26 09:20:21 +0000
@@ -32,6 +32,7 @@
 
 namespace mi = mir::input;
 
+<<<<<<< TREE
 mi::DefaultDevice::DefaultDevice(MirInputDeviceId id,
                                  std::shared_ptr<dispatch::ActionQueue> const& actions,
                                  InputDevice& device,
@@ -46,6 +47,19 @@
       actions{actions},
       key_mapper{key_mapper},
       device_changed_callback{callback}
+=======
+mi::DefaultDevice::DefaultDevice(MirInputDeviceId id,
+                                 std::shared_ptr<dispatch::ActionQueue> const& actions,
+                                 InputDevice& device,
+                                 std::shared_ptr<KeyMapper> const& key_mapper)
+    : device_id{id},
+      device{device},
+      info(device.get_device_info()),
+      pointer{device.get_pointer_settings()},
+      touchpad{device.get_touchpad_settings()},
+      actions{actions},
+      key_mapper{key_mapper}
+>>>>>>> MERGE-SOURCE
 {
     if (contains(info.capabilities, mi::DeviceCapability::keyboard))
     {
@@ -188,6 +202,7 @@
     settings.tap_to_click = conf.tap_to_click();
     settings.middle_mouse_button_emulation = conf.middle_mouse_button_emulation();
 
+<<<<<<< TREE
     {
         std::lock_guard<std::mutex> lock(config_mutex);
         touchpad = settings;
@@ -198,6 +213,19 @@
                              dev->apply_settings(settings);
                          });
     }
+=======
+    {
+        std::lock_guard<std::mutex> lock(config_mutex);
+        touchpad = settings;
+
+        if (!actions) // device is disabled
+            return;
+        actions->enqueue([settings = std::move(settings), dev=&device]
+                         {
+                         dev->apply_settings(settings);
+                         });
+    }
+>>>>>>> MERGE-SOURCE
 }
 
 mir::optional_value<MirKeyboardConfig> mi::DefaultDevice::keyboard_configuration() const
@@ -211,6 +239,7 @@
     if (!contains(info.capabilities, mi::DeviceCapability::keyboard))
         BOOST_THROW_EXCEPTION(std::invalid_argument("Cannot apply a keyboard configuration"));
 
+<<<<<<< TREE
     set_keyboard_configuration(conf);
     device_changed_callback(this);
 }
@@ -220,8 +249,14 @@
     std::lock_guard<std::mutex> lock(config_mutex);
     if (!actions) // device is disabled
         return;
+=======
+    std::lock_guard<std::mutex> lock(config_mutex);
+    if (!actions) // device is disabled
+        return;
+>>>>>>> MERGE-SOURCE
     if (keyboard.value().device_keymap() != conf.device_keymap())
         keyboard = conf;
+<<<<<<< TREE
     else
         return;
     key_mapper->set_keymap_for_device(device_id, conf.device_keymap());
@@ -263,6 +298,17 @@
                              dev->apply_settings(settings);
                          });
     }
+=======
+    else
+        return;
+    key_mapper->set_keymap_for_device(device_id, conf.device_keymap());
+}
+
+void mi::DefaultDevice::disable_queue()
+{
+    std::lock_guard<std::mutex> lock(config_mutex);
+    actions.reset();
+>>>>>>> MERGE-SOURCE
 }
 
 MirInputDevice mi::DefaultDevice::config() const

=== modified file 'src/server/input/default_device.h'
--- src/server/input/default_device.h	2017-05-08 03:04:26 +0000
+++ src/server/input/default_device.h	2017-05-26 09:20:21 +0000
@@ -30,8 +30,12 @@
 #include "mir/optional_value.h"
 
 #include <memory>
+<<<<<<< TREE
 #include <functional>
 #include <mutex>
+=======
+#include <mutex>
+>>>>>>> MERGE-SOURCE
 
 namespace mir
 {
@@ -74,11 +78,15 @@
     void apply_touchpad_configuration(MirTouchpadConfig const&) override;
     optional_value<MirKeyboardConfig> keyboard_configuration() const override;
     void apply_keyboard_configuration(MirKeyboardConfig const&) override;
+<<<<<<< TREE
     optional_value<MirTouchscreenConfig> touchscreen_configuration() const override;
     void apply_touchscreen_configuration(MirTouchscreenConfig const&) override;
 
     MirInputDevice config() const;
     void disable_queue();
+=======
+    void disable_queue();
+>>>>>>> MERGE-SOURCE
 private:
     void set_pointer_configuration(MirPointerConfig const&);
     void set_touchpad_configuration(MirTouchpadConfig const&);
@@ -92,11 +100,19 @@
     optional_value<PointerSettings> pointer;
     optional_value<TouchpadSettings> touchpad;
     optional_value<MirKeyboardConfig> keyboard;
+<<<<<<< TREE
     optional_value<TouchscreenSettings> touchscreen;
     std::shared_ptr<dispatch::ActionQueue> actions;
+=======
+    std::shared_ptr<dispatch::ActionQueue> actions;
+>>>>>>> MERGE-SOURCE
     std::shared_ptr<KeyMapper> const key_mapper;
+<<<<<<< TREE
     std::function<void(Device*)> device_changed_callback;
     std::mutex mutable config_mutex;
+=======
+    std::mutex mutable config_mutex;
+>>>>>>> MERGE-SOURCE
 };
 
 }

=== modified file 'src/server/input/default_input_device_hub.cpp'
--- src/server/input/default_input_device_hub.cpp	2017-05-08 03:04:26 +0000
+++ src/server/input/default_input_device_hub.cpp	2017-05-26 09:20:21 +0000
@@ -200,8 +200,14 @@
 
     if (it == end(devices))
     {
+<<<<<<< TREE
         auto queue = std::make_shared<dispatch::ActionQueue>();
         auto handle = restore_or_create_device(*device, queue);
+=======
+        auto id = create_new_device_id();
+        auto queue = std::make_shared<dispatch::ActionQueue>();
+        auto handle = std::make_shared<DefaultDevice>(id, queue, *device, key_mapper);
+>>>>>>> MERGE-SOURCE
         // send input device info to observer loop..
         devices.push_back(std::make_unique<RegisteredDevice>(
             device, handle->id(), queue, cookie_authority, handle));
@@ -210,7 +216,18 @@
         add_device_handle(handle);
 
         seat->add_device(*handle);
-        dev->start(seat, input_dispatchable);
+<<<<<<< TREE
+        dev->start(seat, input_dispatchable);
+=======
+        dev->start(seat, input_dispatchable);
+
+        // pass input device handle to observer loop..
+        observer_queue->enqueue(this,
+                                [this, handle]()
+                                {
+                                    add_device_handle(handle);
+                                });
+>>>>>>> MERGE-SOURCE
     }
     else
     {

=== modified file 'src/server/input/default_input_device_hub.h'
--- src/server/input/default_input_device_hub.h	2017-05-08 03:04:26 +0000
+++ src/server/input/default_input_device_hub.h	2017-05-26 09:20:21 +0000
@@ -104,11 +104,15 @@
     void device_changed(Device* dev);
     void emit_changed_devices();
     MirInputDeviceId create_new_device_id();
+<<<<<<< TREE
     void store_device_config(DefaultDevice const& dev);
     std::shared_ptr<DefaultDevice> restore_or_create_device(InputDevice& dev,
                                                             std::shared_ptr<dispatch::ActionQueue> const& queue);
     mir::optional_value<MirInputDevice> get_stored_device_config(std::string const& id);
 
+=======
+
+>>>>>>> MERGE-SOURCE
     std::shared_ptr<Seat> const seat;
     std::shared_ptr<dispatch::MultiplexingDispatchable> const input_dispatchable;
     std::mutex mutable handles_guard;

=== modified file 'src/server/scene/application_session.cpp'
=== modified file 'src/utils/out.c'
=== modified file 'tests/acceptance-tests/test_custom_window_management.cpp'
--- tests/acceptance-tests/test_custom_window_management.cpp	2017-05-25 04:43:29 +0000
+++ tests/acceptance-tests/test_custom_window_management.cpp	2017-05-26 09:20:21 +0000
@@ -371,6 +371,7 @@
     mir_connection_release(connection);
 }
 
+<<<<<<< TREE
 TEST_F(CustomWindowManagement, apply_input_shape_to_surface)
 {
     start_server();
@@ -420,6 +421,55 @@
     mir_connection_release(connection);
 }
 
+=======
+TEST_F(CustomWindowManagement, apply_input_shape_to_surface)
+{
+    start_server();
+
+    auto connection = mir_connect_sync(new_connection().c_str(), __PRETTY_FUNCTION__);
+
+    int const width{800}, height{600};
+    MirPixelFormat const format{mir_pixel_format_bgr_888};
+    auto surface_spec = mir_create_normal_window_spec(connection, width, height);
+    mir_window_spec_set_pixel_format(surface_spec, format);
+
+    auto window = mir_create_window_sync(surface_spec);
+    mir_window_spec_release(surface_spec);
+
+    surface_spec = mir_create_window_spec(connection);
+
+    mt::Signal received;
+
+    MirRectangle rect{ 0, 0, 100, 101 };
+    mir_window_spec_set_input_shape(surface_spec, &rect, 1);
+
+    auto const check_apply_surface = [&received](
+        std::shared_ptr<ms::Session> const&,
+        std::shared_ptr<ms::Surface> const&,
+        msh::SurfaceSpecification const& spec)
+        {
+            EXPECT_TRUE(spec.input_shape.is_set());
+            received.raise();
+        };
+    EXPECT_CALL(window_manager, modify_surface(_,_,_)).WillOnce(Invoke(check_apply_surface));
+
+    mir_window_apply_spec(window, surface_spec);
+    mir_window_spec_release(surface_spec);
+
+    EXPECT_TRUE(received.wait_for(400ms));
+
+    surface_spec = mir_create_window_spec(connection);
+    mir_window_spec_set_input_shape(surface_spec, nullptr, 0);
+
+    mir_window_apply_spec(window, surface_spec);
+    mir_window_spec_release(surface_spec);
+    EXPECT_TRUE(received.wait_for(400ms));
+
+    mir_window_release_sync(window);
+    mir_connection_release(connection);
+}
+
+>>>>>>> MERGE-SOURCE
 TEST_F(CustomWindowManagement, when_the_client_places_a_new_surface_the_request_reaches_the_window_manager)
 {
     int const width{800};

=== modified file 'tests/acceptance-tests/test_new_display_configuration.cpp'
=== modified file 'tests/acceptance-tests/test_presentation_chain.cpp'
--- tests/acceptance-tests/test_presentation_chain.cpp	2017-05-25 04:43:29 +0000
+++ tests/acceptance-tests/test_presentation_chain.cpp	2017-05-26 09:20:21 +0000
@@ -133,18 +133,33 @@
     {
         auto spec = mir_create_normal_window_spec(
             connection, size.width.as_int(), size.height.as_int());
-#pragma GCC diagnostic push
-#pragma GCC diagnostic ignored "-Wdeprecated-declarations"
-        mir_window_spec_set_pixel_format(spec, pf);
-        mir_window_spec_add_render_surface(
-            spec, chain.content(), size.width.as_int(), size.height.as_int(), 0, 0);
-#pragma GCC diagnostic pop
-        auto window = mir_create_window_sync(spec);
-        mir_window_spec_release(spec);
-        return window;
-    }
-};
-
+<<<<<<< TREE
+#pragma GCC diagnostic push
+#pragma GCC diagnostic ignored "-Wdeprecated-declarations"
+        mir_window_spec_set_pixel_format(spec, pf);
+        mir_window_spec_add_render_surface(
+            spec, chain.content(), size.width.as_int(), size.height.as_int(), 0, 0);
+#pragma GCC diagnostic pop
+        auto window = mir_create_window_sync(spec);
+        mir_window_spec_release(spec);
+        return window;
+    }
+};
+
+=======
+        mir_window_spec_set_pixel_format(spec, pf);
+#pragma GCC diagnostic push
+#pragma GCC diagnostic ignored "-Wdeprecated-declarations"
+        mir_window_spec_add_render_surface(
+            spec, chain.content(), size.width.as_int(), size.height.as_int(), 0, 0);
+#pragma GCC diagnostic pop
+        auto window = mir_create_window_sync(spec);
+        mir_window_spec_release(spec);
+        return window;
+    }
+};
+
+>>>>>>> MERGE-SOURCE
 struct PresentationChain : mtf::ConnectedClientHeadlessServer
 {
     bool stall_compositor = false;
@@ -467,6 +482,7 @@
     EXPECT_THAT(mir_buffer_get_error_message(buffer), Not(StrEq("")));
     mir_buffer_release(buffer);
 }
+<<<<<<< TREE
 
 namespace
 {
@@ -623,3 +639,159 @@
     for (auto i = 0u; i < buffers.size() - 1; i++)
         EXPECT_TRUE(buffers[i]->wait_ready(5s));
 }
+=======
+
+namespace
+{
+    struct TrackedBuffer
+    {
+        TrackedBuffer(MirConnection* connection, std::atomic<unsigned int>& counter) :
+            buffer(mir_connection_allocate_buffer_sync(connection, 100, 100, pf)),
+            counter(counter)
+        {
+        }
+        ~TrackedBuffer()
+        {
+            mir_buffer_release(buffer);
+        }
+
+        void submit_to(MirPresentationChain* chain)
+        {
+            std::unique_lock<std::mutex> lk(mutex);
+            if (!avail)
+                throw std::runtime_error("test problem");
+            avail = false;
+            mir_presentation_chain_submit_buffer(chain, buffer, tavailable, this);
+        }
+
+        static void tavailable(MirBuffer*, void* ctxt)
+        {
+            TrackedBuffer* buf = reinterpret_cast<TrackedBuffer*>(ctxt);
+            buf->ready();
+        }
+
+        void ready()
+        {
+            last_count_ = counter.fetch_add(1);
+            std::unique_lock<std::mutex> lk(mutex);
+            avail = true;
+            cv.notify_all();
+        }
+
+        bool wait_ready(std::chrono::milliseconds ms)
+        {
+            std::unique_lock<std::mutex> lk(mutex);
+            return cv.wait_for(lk, ms, [this] { return avail; });
+        }
+
+        bool is_ready() { return avail; }
+        unsigned int last_count() const
+        {
+            return last_count_;
+        }
+ 
+        MirPixelFormat pf = mir_pixel_format_abgr_8888;
+        MirBuffer* buffer;
+        std::atomic<unsigned int>& counter;
+        unsigned int last_count_ = 0u;
+        bool avail = true;
+        std::condition_variable cv;
+        std::mutex mutex;
+    };
+}
+
+TEST_F(PresentationChain, fifo_looks_correct_from_client_perspective)
+{
+    SurfaceWithChainFromStart window(
+        connection, mir_present_mode_fifo, size, pf);
+
+    int const num_buffers = 5;
+
+    std::atomic<unsigned int> counter{ 0u };
+    std::array<std::unique_ptr<TrackedBuffer>, num_buffers> buffers;
+    for (auto& buffer : buffers)
+        buffer = std::make_unique<TrackedBuffer>(connection, counter);
+    for(auto& b : buffers)
+        b->submit_to(window.chain());
+
+    //the last one that will return;
+    EXPECT_TRUE(buffers[3]->wait_ready(5s));
+    EXPECT_THAT(buffers[0]->last_count(), Lt(buffers[1]->last_count()));
+    EXPECT_THAT(buffers[1]->last_count(), Lt(buffers[2]->last_count()));
+    EXPECT_THAT(buffers[2]->last_count(), Lt(buffers[3]->last_count()));
+    EXPECT_FALSE(buffers[4]->is_ready());
+}
+
+TEST_F(PresentationChain, fifo_queues_when_compositor_isnt_consuming)
+{
+    SurfaceWithChainFromStart window(
+        connection, mir_present_mode_fifo, size, pf);
+    int const num_buffers = 5;
+    std::atomic<unsigned int> counter{ 0u };
+    std::array<std::unique_ptr<TrackedBuffer>, num_buffers> buffers;
+    for (auto& buffer : buffers)
+        buffer = std::make_unique<TrackedBuffer>(connection, counter);
+    {
+        auto const stall = mir::raii::paired_calls(
+            [this] { stall_compositor = true; },
+            [this] { stall_compositor = false; });
+        for (auto& b : buffers)
+            b->submit_to(window.chain());
+        for (auto &b : buffers)
+            EXPECT_FALSE(b->is_ready());
+    }
+    for (auto i = 0u; i < buffers.size() - 1; i++)
+        EXPECT_TRUE(buffers[i]->wait_ready(5s));
+}
+
+TEST_F(PresentationChain, mailbox_looks_correct_from_client_perspective)
+{
+    auto const stall = mir::raii::paired_calls(
+        [this] { stall_compositor = true; },
+        [this] { stall_compositor = false; });
+    SurfaceWithChainFromStart window(
+        connection, mir_present_mode_mailbox, size, pf);
+
+    int const num_buffers = 5;
+
+    std::atomic<unsigned int> counter{ 0u };
+    std::array<std::unique_ptr<TrackedBuffer>, num_buffers> buffers;
+    for (auto& buffer : buffers)
+        buffer = std::make_unique<TrackedBuffer>(connection, counter);
+
+    for(auto i = 0u; i < buffers.size(); i++)
+    {
+        buffers[i]->submit_to(window.chain());
+        if (i > 0)
+            EXPECT_TRUE(buffers[i-1]->wait_ready(5s));
+    }
+
+    for(auto i = 0u; i < num_buffers - 1; i++)
+        EXPECT_TRUE(buffers[i]->is_ready());
+    EXPECT_FALSE(buffers[4]->is_ready());
+}
+
+TEST_F(PresentationChain, fifo_queues_clears_out_on_transition_to_mailbox)
+{
+    SurfaceWithChainFromStart window(
+        connection, mir_present_mode_fifo, size, pf);
+    int const num_buffers = 5;
+    std::atomic<unsigned int> counter{ 0u };
+    std::array<std::unique_ptr<TrackedBuffer>, num_buffers> buffers;
+    for (auto& buffer : buffers)
+        buffer = std::make_unique<TrackedBuffer>(connection, counter);
+
+    auto const stall = mir::raii::paired_calls(
+        [this] { stall_compositor = true; },
+        [this] { stall_compositor = false; });
+    for (auto& b : buffers)
+        b->submit_to(window.chain());
+    for (auto &b : buffers)
+        EXPECT_FALSE(b->is_ready());
+
+    mir_presentation_chain_set_mode(window.chain(), mir_present_mode_mailbox);
+
+    for (auto i = 0u; i < buffers.size() - 1; i++)
+        EXPECT_TRUE(buffers[i]->wait_ready(5s));
+}
+>>>>>>> MERGE-SOURCE

=== modified file 'tests/unit-tests/compositor/test_multi_monitor_arbiter.cpp'
=== modified file 'tests/unit-tests/frontend/test_session_mediator.cpp'
=== modified file 'tests/unit-tests/input/test_default_device.cpp'
--- tests/unit-tests/input/test_default_device.cpp	2017-05-08 03:04:26 +0000
+++ tests/unit-tests/input/test_default_device.cpp	2017-05-26 09:20:21 +0000
@@ -183,6 +183,7 @@
 
     queue->dispatch(md::FdEvent::readable);
 }
+<<<<<<< TREE
 
 TEST_F(DefaultDevice, touchpad_device_can_be_constructed_from_input_config)
 {
@@ -339,3 +340,28 @@
     conf.set_keyboard_config(kbd_config);
     EXPECT_NO_THROW(mi::DefaultDevice dev(conf, queue, keyboard, mt::fake_shared(key_mapper), change_callback));
 }
+=======
+
+TEST_F(DefaultDevice, disable_queue_ends_config_processing)
+{
+    mi::DefaultDevice dev(MirInputDeviceId{17}, queue, touchpad, mt::fake_shared(key_mapper));
+
+    dev.disable_queue();
+    MirPointerConfig pointer_conf;
+    pointer_conf.cursor_acceleration_bias(1.0);
+
+    EXPECT_CALL(touchpad, apply_settings(Matcher<mi::TouchpadSettings const&>(_))).Times(0);
+    dev.apply_pointer_configuration(pointer_conf);
+}
+
+TEST_F(DefaultDevice, disable_queue_removes_reference_to_queue)
+{
+    std::weak_ptr<md::ActionQueue> ref = queue;
+    mi::DefaultDevice dev(MirInputDeviceId{17}, queue, touchpad, mt::fake_shared(key_mapper));
+    queue.reset();
+
+    EXPECT_THAT(ref.lock(), Ne(nullptr));
+    dev.disable_queue();
+    EXPECT_THAT(ref.lock(), Eq(nullptr));
+}
+>>>>>>> MERGE-SOURCE

=== modified file 'tests/unit-tests/input/test_default_input_device_hub.cpp'
--- tests/unit-tests/input/test_default_input_device_hub.cpp	2017-05-08 03:04:26 +0000
+++ tests/unit-tests/input/test_default_input_device_hub.cpp	2017-05-26 09:20:21 +0000
@@ -238,6 +238,7 @@
 
     hub.remove_device(mt::fake_shared(device));
     hub.remove_device(mt::fake_shared(another_device));
+<<<<<<< TREE
 }
 
 TEST_F(InputDeviceHubTest, when_pointer_configuration_is_applied_successfully_observer_is_triggerd)
@@ -359,3 +360,26 @@
     hub.remove_device(mt::fake_shared(mouse));
     expect_and_execute_multiplexer();
 }
+=======
+    observer_loop.trigger_server_actions();
+}
+
+TEST_F(InputDeviceHubTest, no_device_config_action_after_device_removal)
+{
+    std::shared_ptr<mi::Device> dev_ptr;
+    MirPointerConfig ptr_config;
+    ptr_config.cursor_acceleration_bias(0.5);
+
+    ON_CALL(mock_observer, device_added(WithName("mouse"))).WillByDefault(SaveArg<0>(&dev_ptr));
+
+    hub.add_device(mt::fake_shared(mouse));
+    hub.add_observer(mt::fake_shared(mock_observer));
+    observer_loop.trigger_server_actions();
+
+    EXPECT_CALL(mouse, apply_settings(Matcher<mi::PointerSettings const&>(_))).Times(0);
+
+    dev_ptr->apply_pointer_configuration(ptr_config);
+    hub.remove_device(mt::fake_shared(mouse));
+    observer_loop.trigger_server_actions();
+}
+>>>>>>> MERGE-SOURCE

=== modified file 'tests/unit-tests/platforms/mesa/client/test_client_platform.cpp'
=== modified file 'tests/unit-tests/platforms/nested/mir_display_configuration_builder.cpp'
--- tests/unit-tests/platforms/nested/mir_display_configuration_builder.cpp	2017-05-08 03:04:26 +0000
+++ tests/unit-tests/platforms/nested/mir_display_configuration_builder.cpp	2017-05-26 09:20:21 +0000
@@ -81,11 +81,15 @@
     output->set_power_mode(mir_power_mode_on);
     output->set_orientation(mir_orientation_normal);
     output->set_edid(valid_edid, sizeof(valid_edid));
+<<<<<<< TREE
     output->set_subpixel_arrangement(mir_subpixel_arrangement_horizontal_rgb);
 
     auto const& current_mode = output->mode(output->current_mode());
     output->set_logical_width(current_mode.horizontal_resolution());
     output->set_logical_height(current_mode.vertical_resolution());
+=======
+    output->set_subpixel_arrangement(mir_subpixel_arrangement_horizontal_rgb);
+>>>>>>> MERGE-SOURCE
 
     return std::make_shared<MirDisplayConfig>(conf);
 }
@@ -126,11 +130,15 @@
         output->set_power_mode(mir_power_mode_on);
         output->set_orientation(mir_orientation_normal);
         output->set_edid(valid_edid, sizeof(valid_edid));
+<<<<<<< TREE
         output->set_subpixel_arrangement(mir_subpixel_arrangement_horizontal_rgb);
 
         auto const& current_mode = output->mode(output->current_mode());
         output->set_logical_width(current_mode.horizontal_resolution());
         output->set_logical_height(current_mode.vertical_resolution());
+=======
+        output->set_subpixel_arrangement(mir_subpixel_arrangement_horizontal_rgb);
+>>>>>>> MERGE-SOURCE
     }
 
     return std::make_shared<MirDisplayConfig>(conf);