reset upstream subtrees to yocto 2.6

Reset the following subtrees on thud HEAD:

  poky: 87e3a9739d
  meta-openembedded: 6094ae18c8
  meta-security: 31dc4e7532
  meta-raspberrypi: a48743dc36
  meta-xilinx: c42016e2e6

Also re-apply backports that didn't make it into thud:
  poky:
    17726d0 systemd-systemctl-native: handle Install wildcards

  meta-openembedded:
    4321a5d libtinyxml2: update to 7.0.1
    042f0a3 libcereal: Add native and nativesdk classes
    e23284f libcereal: Allow empty package
    030e8d4 rsyslog: curl-less build with fmhttp PACKAGECONFIG
    179a1b9 gtest: update to 1.8.1

Squashed OpenBMC subtree compatibility updates:
  meta-aspeed:
    Brad Bishop (1):
          aspeed: add yocto 2.6 compatibility

  meta-ibm:
    Brad Bishop (1):
          ibm: prepare for yocto 2.6

  meta-ingrasys:
    Brad Bishop (1):
          ingrasys: set layer compatibility to yocto 2.6

  meta-openpower:
    Brad Bishop (1):
          openpower: set layer compatibility to yocto 2.6

  meta-phosphor:
    Brad Bishop (3):
          phosphor: set layer compatibility to thud
          phosphor: libgpg-error: drop patches
          phosphor: react to fitimage artifact rename

    Ed Tanous (4):
          Dropbear: upgrade options for latest upgrade
          yocto2.6: update openssl options
          busybox: remove upstream watchdog patch
          systemd: Rebase CONFIG_CGROUP_BPF patch

Change-Id: I7b1fe71cca880d0372a82d94b5fd785323e3a9e7
Signed-off-by: Brad Bishop <bradleyb@fuzziesquirrel.com>

1 files changed, 0 insertions, 60 deletions

diff --git a/meta-raspberrypi/recipes-graphics/userland/userland/0010-Fix-for-framerate-with-nested-composition.patch b/meta-raspberrypi/recipes-graphics/userland/userland/0010-Fix-for-framerate-with-nested-composition.patch
deleted file mode 100644
index a6c9a59fb..000000000
--- a/meta-raspberrypi/recipes-graphics/userland/userland/0010-Fix-for-framerate-with-nested-composition.patch
+++ /dev/null
@@ -1,60 +0,0 @@
-From 7c51c2d37bfadaabbbf205237d932b685b09d34f Mon Sep 17 00:00:00 2001
-From: Khem Raj <raj.khem@gmail.com>
-Date: Tue, 29 Mar 2016 20:38:30 -0700
-Subject: [PATCH 10/16] Fix for framerate with nested composition
-
-frame rate appears irregular and lower than expected when using nested composition.
-
-Signed-off-by: Khem Raj <raj.khem@gmail.com>
----
- interface/khronos/egl/egl_client.c | 8 ++++++++
- 1 file changed, 8 insertions(+)
-
-diff --git a/interface/khronos/egl/egl_client.c b/interface/khronos/egl/egl_client.c
-index 03fe67b..13a110c 100644
---- a/interface/khronos/egl/egl_client.c
-+++ b/interface/khronos/egl/egl_client.c
-@@ -2342,6 +2342,9 @@ EGLAPI EGLBoolean EGLAPIENTRY eglSwapBuffers(EGLDisplay dpy, EGLSurface surf)
-                      surface->back_wl_buffer = buffer;
-                   }
- 
-+                  glFlush();
-+                  glFinish();
-+
-                   RPC_CALL7(eglIntSwapBuffers_impl,
-                         thread,
-                         EGLINTSWAPBUFFERS_ID_V2,
-@@ -2353,6 +2356,8 @@ EGLAPI EGLBoolean EGLAPIENTRY eglSwapBuffers(EGLDisplay dpy, EGLSurface surf)
-                         RPC_UINT(khrn_platform_get_window_position(surface->win)),
-                         RPC_INT(surface->back_wl_buffer->resource));
- 
-+                  RPC_FLUSH(thread);
-+
-                   surface->front_wl_buffer->in_use = 1;
-                   wl_surface_attach(wl_egl_window->wl_surface,
-                                     surface->front_wl_buffer->wl_buffer,
-@@ -2360,11 +2365,13 @@ EGLAPI EGLBoolean EGLAPIENTRY eglSwapBuffers(EGLDisplay dpy, EGLSurface surf)
-                   wl_surface_damage(wl_egl_window->wl_surface, 0, 0,
-                                     surface->width, surface->height);
-                   wl_surface_commit(wl_egl_window->wl_surface);
-+                  wl_display_flush(wl_display);
- 
-                   while(ret != -1 && surface->back_wl_buffer->in_use)
-                      ret = wl_display_dispatch_queue(wl_display, process->wl_queue);
-                } else
- #endif
-+               {
-                RPC_CALL6(eglIntSwapBuffers_impl,
-                      thread,
-                      EGLINTSWAPBUFFERS_ID,
-@@ -2376,6 +2383,7 @@ EGLAPI EGLBoolean EGLAPIENTRY eglSwapBuffers(EGLDisplay dpy, EGLSurface surf)
-                      RPC_UINT(khrn_platform_get_window_position(surface->win)));
- 
-                RPC_FLUSH(thread);
-+               }
- 
- #ifdef ANDROID
-                CLIENT_UNLOCK();
--- 
-2.16.1
-