From mboxrd@z Thu Jan  1 00:00:00 1970
From: Oded Gabbay <oded.gabbay@amd.com>
Subject: Re: conflicts in amdkfd between -next and -fixes
Date: Thu, 29 Jan 2015 10:14:34 +0200
Message-ID: <54C9EBEA.9090409@amd.com>
References: <CAPM=9txqSVhuvqVtc7uTDQgvK8SAWtUhvKt1fzDuv-iZhWCOnQ@mail.gmail.com>
Mime-Version: 1.0
Content-Type: text/plain; charset="utf-8"; Format="flowed"
Content-Transfer-Encoding: base64
Return-path: <dri-devel-bounces@lists.freedesktop.org>
Received: from na01-bn1-obe.outbound.protection.outlook.com
 (mail-bn1bon0148.outbound.protection.outlook.com [157.56.111.148])
 by gabe.freedesktop.org (Postfix) with ESMTP id 03A7F6E4C1
 for <dri-devel@lists.freedesktop.org>; Thu, 29 Jan 2015 00:14:51 -0800 (PST)
In-Reply-To: <CAPM=9txqSVhuvqVtc7uTDQgvK8SAWtUhvKt1fzDuv-iZhWCOnQ@mail.gmail.com>
List-Unsubscribe: <http://lists.freedesktop.org/mailman/options/dri-devel>,
 <mailto:dri-devel-request@lists.freedesktop.org?subject=unsubscribe>
List-Archive: <http://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: <http://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: Dave Airlie <airlied@gmail.com>, dri-devel <dri-devel@lists.freedesktop.org>
Cc: Stephen Rothwell <sfr@canb.auug.org.au>
List-Id: dri-devel@lists.freedesktop.org

CgpPbiAwMS8yOS8yMDE1IDAzOjQ5IEFNLCBEYXZlIEFpcmxpZSB3cm90ZToKPiBIZXkgT2RlZCwK
Pgo+IHNvIEkgcHVsbGVkIC1maXhlcyBpbnRvIC1uZXh0IHRoaXMgbW9ybmluZyBhbmQgbWFkZSBh
bWRrZmQgYnVpbGQKPiBhZ2FpbiwgaXQgaGFkIGEgZmV3IGNvbmZsaWN0cyBpbiBpdCwKPgo+IEkn
dmUgcHVzaGVkIGEgZHJtLW5leHQgYnJhbmNoIHdpdGggdGhlIGNvbmZsaWN0cyByZXNvbHZlZCBh
bmQgYW1ka2ZkCj4gdGhhdCBidWlsZHMsIHRoZSBvbmx5IG9uZSBJJ20gYSBiaXQgc2NhcmVkIG9u
IHdhcyB0aGUgc2l6ZSBjYWxjdWxhdGlvbgo+IGZpeHVwIGZvciB0aGUgcmVtb3ZhbCBvZiB0aGUg
bWF4IHByb2Nlc3Nlcy4KPgo+IGNhbiB5b3UgcGxlYXNlIGxvb2sgYXQgdGhlIGRybS1uZXh0IGFu
ZCBzZWUgaWYgaXQgYnJlYWtzIGFueXRoaW5nLgo+Cj4gRGF2ZS4KPiBfX19fX19fX19fX19fX19f
X19fX19fX19fX19fX19fX19fX19fX19fX19fX19fXwo+IGRyaS1kZXZlbCBtYWlsaW5nIGxpc3QK
PiBkcmktZGV2ZWxAbGlzdHMuZnJlZWRlc2t0b3Aub3JnCj4gaHR0cDovL2xpc3RzLmZyZWVkZXNr
dG9wLm9yZy9tYWlsbWFuL2xpc3RpbmZvL2RyaS1kZXZlbAo+CgpIaSBEYXZlLApJIGxvb2tlZCBh
dCBkcm0tbmV4dCBhbmQgeW91ciBtZXJnZSBpcyBwZXJmZWN0LiB0aGFua3MhCkhvd2V2ZXIsIEkg
bm90aWNlZCB0d28gbWlub3IgYnVncyBzbyB0aGlzIHBhc3Mgb24gdGhlIGNvZGUgd2FzIGV2ZW4g
bW9yZSAKYmVuZWZpY2lhbCA6KQpJJ2xsIHNlbmQgZml4ZXMgc2hvcnRseS4KCglPZGVkCl9fX19f
X19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fCmRyaS1kZXZlbCBtYWls
aW5nIGxpc3QKZHJpLWRldmVsQGxpc3RzLmZyZWVkZXNrdG9wLm9yZwpodHRwOi8vbGlzdHMuZnJl
ZWRlc2t0b3Aub3JnL21haWxtYW4vbGlzdGluZm8vZHJpLWRldmVsCg==