From mboxrd@z Thu Jan 1 00:00:00 1970 From: Geert Uytterhoeven Subject: Re: linux-next: manual merge of the mfd tree with the drm-intel tree Date: Tue, 21 Aug 2018 10:27:48 +0200 Message-ID: References: <20180726151006.345e8397@canb.auug.org.au> <20180816121256.0435930e@canb.auug.org.au> Mime-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: base64 Return-path: In-Reply-To: <20180816121256.0435930e@canb.auug.org.au> List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: intel-gfx-bounces@lists.freedesktop.org Sender: "Intel-gfx" To: Stephen Rothwell Cc: paulo.r.zanoni@intel.com, Neil Armstrong , Daniel Vetter , Intel Graphics Development , Linux Kernel Mailing List , Linux-Next , DRI Development , rodrigo.vivi@intel.com, Lee Jones List-Id: linux-next.vger.kernel.org T24gVGh1LCBBdWcgMTYsIDIwMTggYXQgODowNSBQTSBTdGVwaGVuIFJvdGh3ZWxsIDxzZnJAY2Fu Yi5hdXVnLm9yZy5hdT4gd3JvdGU6Cj4gT24gVGh1LCAyNiBKdWwgMjAxOCAxNToxMDowNiArMTAw MCBTdGVwaGVuIFJvdGh3ZWxsIDxzZnJAY2FuYi5hdXVnLm9yZy5hdT4gd3JvdGU6Cj4gPiBUb2Rh eSdzIGxpbnV4LW5leHQgbWVyZ2Ugb2YgdGhlIG1mZCB0cmVlIGdvdCBhIGNvbmZsaWN0IGluOgo+ ID4KPiA+ICAgZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50ZWxfZGlzcGxheS5oCj4gPgo+ID4gYmV0 d2VlbiBjb21taXQ6Cj4gPgo+ID4gICA2MDc1NTQ2ZjU3ZjggKCJkcm0vaTkxNS9pY2w6IHN0b3Jl IHRoZSBwb3J0IHR5cGUgZm9yIFRDIHBvcnRzIikKPiA+Cj4gPiBmcm9tIHRoZSBkcm0taW50ZWwg dHJlZSBhbmQgY29tbWl0Ogo+ID4KPiA+ICAgOWMyMjkxMjdhZWUyICgiZHJtL2k5MTU6IGhkbWk6 IGFkZCBDRUMgbm90aWZpZXIgdG8gaW50ZWxfaGRtaSIpCj4gPgo+ID4gZnJvbSB0aGUgbWZkIHRy ZWUuCj4gPgo+ID4gSSBmaXhlZCBpdCB1cCAoc2VlIGJlbG93KSBhbmQgY2FuIGNhcnJ5IHRoZSBm aXggYXMgbmVjZXNzYXJ5LiBUaGlzCj4gPiBpcyBub3cgZml4ZWQgYXMgZmFyIGFzIGxpbnV4LW5l eHQgaXMgY29uY2VybmVkLCBidXQgYW55IG5vbiB0cml2aWFsCj4gPiBjb25mbGljdHMgc2hvdWxk IGJlIG1lbnRpb25lZCB0byB5b3VyIHVwc3RyZWFtIG1haW50YWluZXIgd2hlbiB5b3VyIHRyZWUK PiA+IGlzIHN1Ym1pdHRlZCBmb3IgbWVyZ2luZy4gIFlvdSBtYXkgYWxzbyB3YW50IHRvIGNvbnNp ZGVyIGNvb3BlcmF0aW5nCj4gPiB3aXRoIHRoZSBtYWludGFpbmVyIG9mIHRoZSBjb25mbGljdGlu ZyB0cmVlIHRvIG1pbmltaXNlIGFueSBwYXJ0aWN1bGFybHkKPiA+IGNvbXBsZXggY29uZmxpY3Rz Lgo+ID4KPiA+IC0tCj4gPiBDaGVlcnMsCj4gPiBTdGVwaGVuIFJvdGh3ZWxsCj4gPgo+ID4gZGlm ZiAtLWNjIGRyaXZlcnMvZ3B1L2RybS9pOTE1L2ludGVsX2Rpc3BsYXkuaAo+ID4gaW5kZXggMGE3 OWE0NmQ1ODA1LDFmMTc2YTcxZTA4MS4uMDAwMDAwMDAwMDAwCj4gPiAtLS0gYS9kcml2ZXJzL2dw dS9kcm0vaTkxNS9pbnRlbF9kaXNwbGF5LmgKPiA+ICsrKyBiL2RyaXZlcnMvZ3B1L2RybS9pOTE1 L2ludGVsX2Rpc3BsYXkuaAo+ID4gQEBAIC0xMjYsMjQgLTEyNiwzMCArMTI2LDQ4IEBAQCBlbnVt IHBvcnQKPiA+Cj4gPiAgICNkZWZpbmUgcG9ydF9uYW1lKHApICgocCkgKyAnQScpCj4gPgo+ID4g KyAvKgo+ID4gKyAgKiBQb3J0cyBpZGVudGlmaWVyIHJlZmVyZW5jZWQgZnJvbSBvdGhlciBkcml2 ZXJzLgo+ID4gKyAgKiBFeHBlY3RlZCB0byByZW1haW4gc3RhYmxlIG92ZXIgdGltZQo+ID4gKyAg Ki8KPiA+ICsgc3RhdGljIGlubGluZSBjb25zdCBjaGFyICpwb3J0X2lkZW50aWZpZXIoZW51bSBw b3J0IHBvcnQpCj4gPiArIHsKPiA+ICsgICAgIHN3aXRjaCAocG9ydCkgewo+ID4gKyAgICAgY2Fz ZSBQT1JUX0E6Cj4gPiArICAgICAgICAgICAgIHJldHVybiAiUG9ydCBBIjsKPiA+ICsgICAgIGNh c2UgUE9SVF9COgo+ID4gKyAgICAgICAgICAgICByZXR1cm4gIlBvcnQgQiI7Cj4gPiArICAgICBj YXNlIFBPUlRfQzoKPiA+ICsgICAgICAgICAgICAgcmV0dXJuICJQb3J0IEMiOwo+ID4gKyAgICAg Y2FzZSBQT1JUX0Q6Cj4gPiArICAgICAgICAgICAgIHJldHVybiAiUG9ydCBEIjsKPiA+ICsgICAg IGNhc2UgUE9SVF9FOgo+ID4gKyAgICAgICAgICAgICByZXR1cm4gIlBvcnQgRSI7Cj4gPiArICAg ICBjYXNlIFBPUlRfRjoKPiA+ICsgICAgICAgICAgICAgcmV0dXJuICJQb3J0IEYiOwo+ID4gKyAg ICAgZGVmYXVsdDoKPiA+ICsgICAgICAgICAgICAgcmV0dXJuICI8aW52YWxpZD4iOwo+ID4gKyAg ICAgfQo+ID4gKyB9Cj4gPiArCj4gPiAgK2VudW0gdGNfcG9ydCB7Cj4gPiAgKyAgICBQT1JUX1RD X05PTkUgPSAtMSwKPiA+ICArCj4gPiAgKyAgICBQT1JUX1RDMSA9IDAsCj4gPiAgKyAgICBQT1JU X1RDMiwKPiA+ICArICAgIFBPUlRfVEMzLAo+ID4gICsgICAgUE9SVF9UQzQsCj4gPiAgKwo+ID4g ICsgICAgSTkxNV9NQVhfVENfUE9SVFMKPiA+ICArfTsKPiA+ICArCj4gPiAgK2VudW0gdGNfcG9y dF90eXBlIHsKPiA+ICArICAgIFRDX1BPUlRfVU5LTk9XTiA9IDAsCj4gPiAgKyAgICBUQ19QT1JU X1RZUEVDLAo+ID4gICsgICAgVENfUE9SVF9UQlQsCj4gPiAgKyAgICBUQ19QT1JUX0xFR0FDWSwK PiA+ICArfTsKPiA+ICArCj4gPiAgIGVudW0gZHBpb19jaGFubmVsIHsKPiA+ICAgICAgIERQSU9f Q0gwLAo+ID4gICAgICAgRFBJT19DSDEKPgo+IFRoaXMgaXMgbm93IGEgY29uZmxpY3QgYmV0d2Vl biBMaW51cycgdHJlZSBhbmQgdGhlIG1mZCB0cmVlLgoKRlRSLCBpdCdzIG5vdCB0aGlzIG9uZSwg YnV0IHRoZSBzaW1pbGFyIG9uZSByZXBvcnRlZCBvbiBKdWwgMTksIHdoaWNoIGRvZXMgbm90CmFk ZCB0aGUgdGNfcG9ydF90eXBlIGVudW0uCgpHcntvZXRqZSxlZXRpbmd9cywKCiAgICAgICAgICAg ICAgICAgICAgICAgIEdlZXJ0CgotLSAKR2VlcnQgVXl0dGVyaG9ldmVuIC0tIFRoZXJlJ3MgbG90 cyBvZiBMaW51eCBiZXlvbmQgaWEzMiAtLSBnZWVydEBsaW51eC1tNjhrLm9yZwoKSW4gcGVyc29u YWwgY29udmVyc2F0aW9ucyB3aXRoIHRlY2huaWNhbCBwZW9wbGUsIEkgY2FsbCBteXNlbGYgYSBo YWNrZXIuIEJ1dAp3aGVuIEknbSB0YWxraW5nIHRvIGpvdXJuYWxpc3RzIEkganVzdCBzYXkgInBy b2dyYW1tZXIiIG9yIHNvbWV0aGluZyBsaWtlIHRoYXQuCiAgICAgICAgICAgICAgICAgICAgICAg ICAgICAgICAgLS0gTGludXMgVG9ydmFsZHMKX19fX19fX19fX19fX19fX19fX19fX19fX19fX19f X19fX19fX19fX19fX19fX18KSW50ZWwtZ2Z4IG1haWxpbmcgbGlzdApJbnRlbC1nZnhAbGlzdHMu ZnJlZWRlc2t0b3Aub3JnCmh0dHBzOi8vbGlzdHMuZnJlZWRlc2t0b3Aub3JnL21haWxtYW4vbGlz dGluZm8vaW50ZWwtZ2Z4Cg==