From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751737AbbLNBGx (ORCPT ); Sun, 13 Dec 2015 20:06:53 -0500 Received: from ozlabs.org ([103.22.144.67]:33321 "EHLO ozlabs.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751383AbbLNBGv (ORCPT ); Sun, 13 Dec 2015 20:06:51 -0500 Date: Mon, 14 Dec 2015 12:06:49 +1100 From: Stephen Rothwell To: Daniel Vetter , , Cc: linux-next@vger.kernel.org, linux-kernel@vger.kernel.org, Ville =?UTF-8?B?U3lyasOkbMOk?= , Sudip Mukherjee Subject: linux-next: manual merge of the drm-misc tree with the drm-intel tree Message-ID: <20151214120649.00a5ee7b@canb.auug.org.au> X-Mailer: Claws Mail 3.13.0 (GTK+ 2.24.28; x86_64-pc-linux-gnu) 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, Today's linux-next merge of the drm-misc tree got a conflict in: drivers/gpu/drm/i915/intel_dp.c between commit: 893da0c9bcb2 ("drm/i915: check for return value") from the drm-intel tree and commit: 13a3d91f17a5 ("drm: Pass 'name' to drm_encoder_init()") from the drm-misc tree. I fixed it up (see below) and can carry the fix as necessary (no action is required). -- Cheers, Stephen Rothwell sfr@canb.auug.org.au diff --cc drivers/gpu/drm/i915/intel_dp.c index ae4c21febbb5,9b10526cc6dd..000000000000 --- a/drivers/gpu/drm/i915/intel_dp.c +++ b/drivers/gpu/drm/i915/intel_dp.c @@@ -6009,9 -5976,8 +6009,9 @@@ intel_dp_init(struct drm_device *dev intel_encoder = &intel_dig_port->base; encoder = &intel_encoder->base; - drm_encoder_init(dev, &intel_encoder->base, &intel_dp_enc_funcs, - DRM_MODE_ENCODER_TMDS, NULL); + if (drm_encoder_init(dev, &intel_encoder->base, &intel_dp_enc_funcs, - DRM_MODE_ENCODER_TMDS)) ++ DRM_MODE_ENCODER_TMDS, NULL)) + goto err_encoder_init; intel_encoder->compute_config = intel_dp_compute_config; intel_encoder->disable = intel_disable_dp; From mboxrd@z Thu Jan 1 00:00:00 1970 From: Stephen Rothwell Subject: linux-next: manual merge of the drm-misc tree with the drm-intel tree Date: Mon, 14 Dec 2015 12:06:49 +1100 Message-ID: <20151214120649.00a5ee7b@canb.auug.org.au> Mime-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: base64 Return-path: 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-gfx@lists.freedesktop.org, dri-devel@lists.freedesktop.org Cc: linux-next@vger.kernel.org, linux-kernel@vger.kernel.org, Sudip Mukherjee List-Id: linux-next.vger.kernel.org SGkgYWxsLAoKVG9kYXkncyBsaW51eC1uZXh0IG1lcmdlIG9mIHRoZSBkcm0tbWlzYyB0cmVlIGdv dCBhIGNvbmZsaWN0IGluOgoKICBkcml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF9kcC5jCgpiZXR3 ZWVuIGNvbW1pdDoKCiAgODkzZGEwYzliY2IyICgiZHJtL2k5MTU6IGNoZWNrIGZvciByZXR1cm4g dmFsdWUiKQoKZnJvbSB0aGUgZHJtLWludGVsIHRyZWUgYW5kIGNvbW1pdDoKCiAgMTNhM2Q5MWYx N2E1ICgiZHJtOiBQYXNzICduYW1lJyB0byBkcm1fZW5jb2Rlcl9pbml0KCkiKQoKZnJvbSB0aGUg ZHJtLW1pc2MgdHJlZS4KCkkgZml4ZWQgaXQgdXAgKHNlZSBiZWxvdykgYW5kIGNhbiBjYXJyeSB0 aGUgZml4IGFzIG5lY2Vzc2FyeSAobm8gYWN0aW9uCmlzIHJlcXVpcmVkKS4KCi0tIApDaGVlcnMs ClN0ZXBoZW4gUm90aHdlbGwgICAgICAgICAgICAgICAgICAgIHNmckBjYW5iLmF1dWcub3JnLmF1 CgpkaWZmIC0tY2MgZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50ZWxfZHAuYwppbmRleCBhZTRjMjFm ZWJiYjUsOWIxMDUyNmNjNmRkLi4wMDAwMDAwMDAwMDAKLS0tIGEvZHJpdmVycy9ncHUvZHJtL2k5 MTUvaW50ZWxfZHAuYworKysgYi9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF9kcC5jCkBAQCAt NjAwOSw5IC01OTc2LDggKzYwMDksOSBAQEAgaW50ZWxfZHBfaW5pdChzdHJ1Y3QgZHJtX2Rldmlj ZSAqZGV2CiAgCWludGVsX2VuY29kZXIgPSAmaW50ZWxfZGlnX3BvcnQtPmJhc2U7CiAgCWVuY29k ZXIgPSAmaW50ZWxfZW5jb2Rlci0+YmFzZTsKICAKIC0JZHJtX2VuY29kZXJfaW5pdChkZXYsICZp bnRlbF9lbmNvZGVyLT5iYXNlLCAmaW50ZWxfZHBfZW5jX2Z1bmNzLAogLQkJCSBEUk1fTU9ERV9F TkNPREVSX1RNRFMsIE5VTEwpOwogKwlpZiAoZHJtX2VuY29kZXJfaW5pdChkZXYsICZpbnRlbF9l bmNvZGVyLT5iYXNlLCAmaW50ZWxfZHBfZW5jX2Z1bmNzLAotIAkJCSAgICAgRFJNX01PREVfRU5D T0RFUl9UTURTKSkKKysJCQkgICAgIERSTV9NT0RFX0VOQ09ERVJfVE1EUywgTlVMTCkpCiArCQln b3RvIGVycl9lbmNvZGVyX2luaXQ7CiAgCiAgCWludGVsX2VuY29kZXItPmNvbXB1dGVfY29uZmln ID0gaW50ZWxfZHBfY29tcHV0ZV9jb25maWc7CiAgCWludGVsX2VuY29kZXItPmRpc2FibGUgPSBp bnRlbF9kaXNhYmxlX2RwOwpfX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19f X19fX19fXwpJbnRlbC1nZnggbWFpbGluZyBsaXN0CkludGVsLWdmeEBsaXN0cy5mcmVlZGVza3Rv cC5vcmcKaHR0cDovL2xpc3RzLmZyZWVkZXNrdG9wLm9yZy9tYWlsbWFuL2xpc3RpbmZvL2ludGVs LWdmeAo=