From mboxrd@z Thu Jan  1 00:00:00 1970
From: Stephen Rothwell <sfr@canb.auug.org.au>
Subject: linux-next: manual merge of the kspp tree with the drm-misc tree
Date: Mon, 27 Mar 2017 12:26:11 +1100
Message-ID: <20170327122611.1044b2a1@canb.auug.org.au>
Mime-Version: 1.0
Content-Type: text/plain; charset="utf-8"
Content-Transfer-Encoding: base64
Return-path: <dri-devel-bounces@lists.freedesktop.org>
List-Unsubscribe: <https://lists.freedesktop.org/mailman/options/dri-devel>,
 <mailto:dri-devel-request@lists.freedesktop.org?subject=unsubscribe>
List-Archive: <https://lists.freedesktop.org/archives/dri-devel>
List-Post: <mailto:dri-devel@lists.freedesktop.org>
List-Help: <mailto:dri-devel-request@lists.freedesktop.org?subject=help>
List-Subscribe: <https://lists.freedesktop.org/mailman/listinfo/dri-devel>,
 <mailto:dri-devel-request@lists.freedesktop.org?subject=subscribe>
Errors-To: dri-devel-bounces@lists.freedesktop.org
Sender: "dri-devel" <dri-devel-bounces@lists.freedesktop.org>
To: Kees Cook <keescook@google.com>, Daniel Vetter <daniel.vetter@ffwll.ch>, Intel Graphics <intel-gfx@lists.freedesktop.org>, DRI <dri-devel@lists.freedesktop.org>
Cc: Emese Revfy <re.emese@gmail.com>, linux-next@vger.kernel.org, linux-kernel@vger.kernel.org
List-Id: linux-next.vger.kernel.org

SGkgS2VlcywKClRvZGF5J3MgbGludXgtbmV4dCBtZXJnZSBvZiB0aGUga3NwcCB0cmVlIGdvdCBh
IGNvbmZsaWN0IGluOgoKICBpbmNsdWRlL2RybS9kcm1fZHJ2LmgKCmJldHdlZW4gY29tbWl0OgoK
ICA5MWZhYTA0NzhiNTkgKCJkcm06IGRyb3AgZXh0ZXJuIGZyb20gZnVuY3Rpb24gZGVjbHMiKQoK
ZnJvbSB0aGUgZHJtLW1pc2MgdHJlZSBhbmQgY29tbWl0OgoKICA2YmJhYWMxMTY1NTIgKCJpbml0
aWZ5OiBNYXJrIGZ1bmN0aW9ucyB3aXRoIHRoZSBfX25vY2FwdHVyZSBhdHRyaWJ1dGUiKQoKZnJv
bSB0aGUga3NwcCB0cmVlLgoKSSBmaXhlZCBpdCB1cCAoc2VlIGJlbG93KSBhbmQgY2FuIGNhcnJ5
IHRoZSBmaXggYXMgbmVjZXNzYXJ5LiBUaGlzCmlzIG5vdyBmaXhlZCBhcyBmYXIgYXMgbGludXgt
bmV4dCBpcyBjb25jZXJuZWQsIGJ1dCBhbnkgbm9uIHRyaXZpYWwKY29uZmxpY3RzIHNob3VsZCBi
ZSBtZW50aW9uZWQgdG8geW91ciB1cHN0cmVhbSBtYWludGFpbmVyIHdoZW4geW91ciB0cmVlCmlz
IHN1Ym1pdHRlZCBmb3IgbWVyZ2luZy4gIFlvdSBtYXkgYWxzbyB3YW50IHRvIGNvbnNpZGVyIGNv
b3BlcmF0aW5nCndpdGggdGhlIG1haW50YWluZXIgb2YgdGhlIGNvbmZsaWN0aW5nIHRyZWUgdG8g
bWluaW1pc2UgYW55IHBhcnRpY3VsYXJseQpjb21wbGV4IGNvbmZsaWN0cy4KCi0tIApDaGVlcnMs
ClN0ZXBoZW4gUm90aHdlbGwKCmRpZmYgLS1jYyBpbmNsdWRlL2RybS9kcm1fZHJ2LmgKaW5kZXgg
NTNiOTgzMjFkZjliLGFkZTk2MGM2NTkyOS4uMDAwMDAwMDAwMDAwCi0tLSBhL2luY2x1ZGUvZHJt
L2RybV9kcnYuaAorKysgYi9pbmNsdWRlL2RybS9kcm1fZHJ2LmgKQEBAIC01MTAsMTkgLTQwMywx
MSArNTEwLDE5IEBAQCBzdHJ1Y3QgZHJtX2RyaXZlciAKICAJaW50IG51bV9pb2N0bHM7CiAgCWNv
bnN0IHN0cnVjdCBmaWxlX29wZXJhdGlvbnMgKmZvcHM7CiAgCiArCS8qIEV2ZXJ5dGhpbmcgYmVs
b3cgaGVyZSBpcyBmb3IgbGVnYWN5IGRyaXZlciwgbmV2ZXIgdXNlISAqLwogKwkvKiBwcml2YXRl
OiAqLwogKwogIAkvKiBMaXN0IG9mIGRldmljZXMgaGFuZ2luZyBvZmYgdGhpcyBkcml2ZXIgd2l0
aCBzdGVhbHRoIGF0dGFjaC4gKi8KICAJc3RydWN0IGxpc3RfaGVhZCBsZWdhY3lfZGV2X2xpc3Q7
CiArCWludCAoKmZpcnN0b3BlbikgKHN0cnVjdCBkcm1fZGV2aWNlICopOwogKwlpbnQgKCpkbWFf
aW9jdGwpIChzdHJ1Y3QgZHJtX2RldmljZSAqZGV2LCB2b2lkICpkYXRhLCBzdHJ1Y3QgZHJtX2Zp
bGUgKmZpbGVfcHJpdik7CiArCWludCAoKmRtYV9xdWllc2NlbnQpIChzdHJ1Y3QgZHJtX2Rldmlj
ZSAqKTsKICsJaW50ICgqY29udGV4dF9kdG9yKSAoc3RydWN0IGRybV9kZXZpY2UgKmRldiwgaW50
IGNvbnRleHQpOwogKwlpbnQgZGV2X3ByaXZfc2l6ZTsKICB9OwogIAotIF9fcHJpbnRmKDYsIDcp
CiAtZXh0ZXJuIF9fcHJpbnRmKDYsIDcpIF9fbm9jYXB0dXJlKDQpCisrX19wcmludGYoNiwgNykg
X19ub2NhcHR1cmUoNCkKICB2b2lkIGRybV9kZXZfcHJpbnRrKGNvbnN0IHN0cnVjdCBkZXZpY2Ug
KmRldiwgY29uc3QgY2hhciAqbGV2ZWwsCiAgCQkgICAgdW5zaWduZWQgaW50IGNhdGVnb3J5LCBj
b25zdCBjaGFyICpmdW5jdGlvbl9uYW1lLAogIAkJICAgIGNvbnN0IGNoYXIgKnByZWZpeCwgY29u
c3QgY2hhciAqZm9ybWF0LCAuLi4pOwpfX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19f
X19fX19fX19fX19fXwpkcmktZGV2ZWwgbWFpbGluZyBsaXN0CmRyaS1kZXZlbEBsaXN0cy5mcmVl
ZGVza3RvcC5vcmcKaHR0cHM6Ly9saXN0cy5mcmVlZGVza3RvcC5vcmcvbWFpbG1hbi9saXN0aW5m
by9kcmktZGV2ZWwK