From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S966190AbdGUALv (ORCPT ); Thu, 20 Jul 2017 20:11:51 -0400 Received: from ozlabs.org ([103.22.144.67]:50601 "EHLO ozlabs.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S964809AbdGUALu (ORCPT ); Thu, 20 Jul 2017 20:11:50 -0400 Date: Fri, 21 Jul 2017 10:11:48 +1000 From: Stephen Rothwell To: Daniel Vetter , Intel Graphics , DRI , Dave Airlie Cc: Linux-Next Mailing List , Linux Kernel Mailing List Subject: Re: linux-next: manual merge of the drm-misc tree with the drm-intel tree Message-ID: <20170721101148.4b20f55e@canb.auug.org.au> In-Reply-To: <20170720112333.010b9ac8@canb.auug.org.au> References: <20170720112333.010b9ac8@canb.auug.org.au> MIME-Version: 1.0 Content-Type: text/plain; charset=US-ASCII Content-Transfer-Encoding: 7bit Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Hi all, The following conflict now exists between the drm and drm-intel trees. On Thu, 20 Jul 2017 11:23:33 +1000 Stephen Rothwell wrote: > > Today's linux-next merge of the drm-misc tree got a conflict in: > > drivers/gpu/drm/i915/i915_drv.c > > between commit: > > 99c539bef538 ("drm/i915: unregister interfaces first in unload") > > from the drm-intel tree and commit: > > baf54385af78 ("drm/i915: Drop drm_vblank_cleanup") > > from the drm-misc tree. > > I fixed it up (see below) and can carry the fix as necessary. This > is now fixed as far as linux-next is concerned, but any non trivial > conflicts should be mentioned to your upstream maintainer when your tree > is submitted for merging. You may also want to consider cooperating > with the maintainer of the conflicting tree to minimise any particularly > complex conflicts. > > -- > Cheers, > Stephen Rothwell > > diff --cc drivers/gpu/drm/i915/i915_drv.c > index f406aec8a499,04d9bd84ee43..000000000000 > --- a/drivers/gpu/drm/i915/i915_drv.c > +++ b/drivers/gpu/drm/i915/i915_drv.c > @@@ -1386,8 -1367,8 +1384,6 @@@ void i915_driver_unload(struct drm_devi > > intel_gvt_cleanup(dev_priv); > > - drm_vblank_cleanup(dev); > - i915_driver_unregister(dev_priv); > -- > intel_modeset_cleanup(dev); > > /* -- Cheers, Stephen Rothwell From mboxrd@z Thu Jan 1 00:00:00 1970 From: Stephen Rothwell Subject: Re: linux-next: manual merge of the drm-misc tree with the drm-intel tree Date: Fri, 21 Jul 2017 10:11:48 +1000 Message-ID: <20170721101148.4b20f55e@canb.auug.org.au> References: <20170720112333.010b9ac8@canb.auug.org.au> Mime-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: base64 Return-path: In-Reply-To: <20170720112333.010b9ac8@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: Daniel Vetter , Intel Graphics , DRI , Dave Airlie Cc: Linux-Next Mailing List , Linux Kernel Mailing List List-Id: linux-next.vger.kernel.org SGkgYWxsLAoKVGhlIGZvbGxvd2luZyBjb25mbGljdCBub3cgZXhpc3RzIGJldHdlZW4gdGhlIGRy bSBhbmQgZHJtLWludGVsIHRyZWVzLgoKT24gVGh1LCAyMCBKdWwgMjAxNyAxMToyMzozMyArMTAw MCBTdGVwaGVuIFJvdGh3ZWxsIDxzZnJAY2FuYi5hdXVnLm9yZy5hdT4gd3JvdGU6Cj4KPiBUb2Rh eSdzIGxpbnV4LW5leHQgbWVyZ2Ugb2YgdGhlIGRybS1taXNjIHRyZWUgZ290IGEgY29uZmxpY3Qg aW46Cj4gCj4gICBkcml2ZXJzL2dwdS9kcm0vaTkxNS9pOTE1X2Rydi5jCj4gCj4gYmV0d2VlbiBj b21taXQ6Cj4gCj4gICA5OWM1MzliZWY1MzggKCJkcm0vaTkxNTogdW5yZWdpc3RlciBpbnRlcmZh Y2VzIGZpcnN0IGluIHVubG9hZCIpCj4gCj4gZnJvbSB0aGUgZHJtLWludGVsIHRyZWUgYW5kIGNv bW1pdDoKPiAKPiAgIGJhZjU0Mzg1YWY3OCAoImRybS9pOTE1OiBEcm9wIGRybV92YmxhbmtfY2xl YW51cCIpCj4gCj4gZnJvbSB0aGUgZHJtLW1pc2MgdHJlZS4KPiAKPiBJIGZpeGVkIGl0IHVwIChz ZWUgYmVsb3cpIGFuZCBjYW4gY2FycnkgdGhlIGZpeCBhcyBuZWNlc3NhcnkuIFRoaXMKPiBpcyBu b3cgZml4ZWQgYXMgZmFyIGFzIGxpbnV4LW5leHQgaXMgY29uY2VybmVkLCBidXQgYW55IG5vbiB0 cml2aWFsCj4gY29uZmxpY3RzIHNob3VsZCBiZSBtZW50aW9uZWQgdG8geW91ciB1cHN0cmVhbSBt YWludGFpbmVyIHdoZW4geW91ciB0cmVlCj4gaXMgc3VibWl0dGVkIGZvciBtZXJnaW5nLiAgWW91 IG1heSBhbHNvIHdhbnQgdG8gY29uc2lkZXIgY29vcGVyYXRpbmcKPiB3aXRoIHRoZSBtYWludGFp bmVyIG9mIHRoZSBjb25mbGljdGluZyB0cmVlIHRvIG1pbmltaXNlIGFueSBwYXJ0aWN1bGFybHkK PiBjb21wbGV4IGNvbmZsaWN0cy4KPiAKPiAtLSAKPiBDaGVlcnMsCj4gU3RlcGhlbiBSb3Rod2Vs bAo+IAo+IGRpZmYgLS1jYyBkcml2ZXJzL2dwdS9kcm0vaTkxNS9pOTE1X2Rydi5jCj4gaW5kZXgg ZjQwNmFlYzhhNDk5LDA0ZDliZDg0ZWU0My4uMDAwMDAwMDAwMDAwCj4gLS0tIGEvZHJpdmVycy9n cHUvZHJtL2k5MTUvaTkxNV9kcnYuYwo+ICsrKyBiL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2k5MTVf ZHJ2LmMKPiBAQEAgLTEzODYsOCAtMTM2Nyw4ICsxMzg0LDYgQEBAIHZvaWQgaTkxNV9kcml2ZXJf dW5sb2FkKHN0cnVjdCBkcm1fZGV2aQo+ICAgCj4gICAJaW50ZWxfZ3Z0X2NsZWFudXAoZGV2X3By aXYpOwo+ICAgCj4gLSAJZHJtX3ZibGFua19jbGVhbnVwKGRldik7Cj4gIC0JaTkxNV9kcml2ZXJf dW5yZWdpc3RlcihkZXZfcHJpdik7Cj4gLS0KPiAgIAlpbnRlbF9tb2Rlc2V0X2NsZWFudXAoZGV2 KTsKPiAgIAo+ICAgCS8qCgotLSAKQ2hlZXJzLApTdGVwaGVuIFJvdGh3ZWxsCl9fX19fX19fX19f X19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fCkludGVsLWdmeCBtYWlsaW5nIGxp c3QKSW50ZWwtZ2Z4QGxpc3RzLmZyZWVkZXNrdG9wLm9yZwpodHRwczovL2xpc3RzLmZyZWVkZXNr dG9wLm9yZy9tYWlsbWFuL2xpc3RpbmZvL2ludGVsLWdmeAo=