From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Wed, 28 Jun 2017 20:13:48 +0000 (-0700)
Subject: Merge branch 'etnaviv/fixes' of git://git.pengutronix.de/git/lst/linux
X-Git-Tag: v4.12~21
X-Git-Url: https://git.kernelconcepts.de/?p=karo-tx-linux.git;a=commitdiff_plain;h=cf723497f2b0dfd688dd27949f1d6e26a5aec44c

Merge branch 'etnaviv/fixes' of git://git.pengutronix.de/git/lst/linux

Pull drm/etnaviv fixes from Lucas Stach:
 "I realized I just missed the cut-off point for the final drm fixes
  pull, but I have 2 more etnaviv fixes that need to go into 4.12, as
  they fix fallout from the explicit sync work introduced in the last
  merge window"

[ Pulling directly because Dave is on vacation. Noted by Daniel Vetter,
  and acked by Dave Airlie  - Linus ]

* 'etnaviv/fixes' of git://git.pengutronix.de/git/lst/linux:
  drm/etnaviv: Fix implicit/explicit sync sense inversion
  drm/etnaviv: fix submit flags getting overwritten by BO content
---

cf723497f2b0dfd688dd27949f1d6e26a5aec44c