From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1757257AbcIPAin (ORCPT ); Thu, 15 Sep 2016 20:38:43 -0400 Received: from ozlabs.org ([103.22.144.67]:60422 "EHLO ozlabs.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1755039AbcIPAim (ORCPT ); Thu, 15 Sep 2016 20:38:42 -0400 Date: Fri, 16 Sep 2016 10:38:38 +1000 From: Stephen Rothwell To: Daniel Vetter , Intel Graphics , DRI Cc: linux-next@vger.kernel.org, linux-kernel@vger.kernel.org, Deepak M , Jani Nikula , Lyude Subject: linux-next: manual merge of the drm-intel tree with Linus' tree Message-ID: <20160916103838.34a84b44@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, Today's linux-next merge of the drm-intel tree got a conflict in: drivers/gpu/drm/i915/intel_pm.c between commit: f403372658fc ("drm/i915/skl: Add support for the SAGV, fix underrun hangs") (which is also in the drm-intel tree) from Linus' tree and commit: 6f3fff602e81 ("drm/i915: Add ddb size field to device info structure") from the drm-intel tree. I fixed it up (I just used the drm-intel version) 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 From mboxrd@z Thu Jan 1 00:00:00 1970 From: Stephen Rothwell Subject: linux-next: manual merge of the drm-intel tree with Linus' tree Date: Fri, 16 Sep 2016 10:38:38 +1000 Message-ID: <20160916103838.34a84b44@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: dri-devel-bounces@lists.freedesktop.org Sender: "dri-devel" To: Daniel Vetter , Intel Graphics , DRI Cc: Deepak M , Jani Nikula , Lyude , linux-next@vger.kernel.org, linux-kernel@vger.kernel.org List-Id: linux-next.vger.kernel.org SGkgYWxsLAoKVG9kYXkncyBsaW51eC1uZXh0IG1lcmdlIG9mIHRoZSBkcm0taW50ZWwgdHJlZSBn b3QgYSBjb25mbGljdCBpbjoKCiAgZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50ZWxfcG0uYwoKYmV0 d2VlbiBjb21taXQ6CgogIGY0MDMzNzI2NThmYyAoImRybS9pOTE1L3NrbDogQWRkIHN1cHBvcnQg Zm9yIHRoZSBTQUdWLCBmaXggdW5kZXJydW4gaGFuZ3MiKQood2hpY2ggaXMgYWxzbyBpbiB0aGUg ZHJtLWludGVsIHRyZWUpCgpmcm9tIExpbnVzJyB0cmVlIGFuZCBjb21taXQ6CgogIDZmM2ZmZjYw MmU4MSAoImRybS9pOTE1OiBBZGQgZGRiIHNpemUgZmllbGQgdG8gZGV2aWNlIGluZm8gc3RydWN0 dXJlIikKCmZyb20gdGhlIGRybS1pbnRlbCB0cmVlLgoKSSBmaXhlZCBpdCB1cCAoSSBqdXN0IHVz ZWQgdGhlIGRybS1pbnRlbCB2ZXJzaW9uKSBhbmQgY2FuIGNhcnJ5IHRoZSBmaXgKYXMgbmVjZXNz YXJ5LiBUaGlzIGlzIG5vdyBmaXhlZCBhcyBmYXIgYXMgbGludXgtbmV4dCBpcyBjb25jZXJuZWQs IGJ1dAphbnkgbm9uIHRyaXZpYWwgY29uZmxpY3RzIHNob3VsZCBiZSBtZW50aW9uZWQgdG8geW91 ciB1cHN0cmVhbSBtYWludGFpbmVyCndoZW4geW91ciB0cmVlIGlzIHN1Ym1pdHRlZCBmb3IgbWVy Z2luZy4gIFlvdSBtYXkgYWxzbyB3YW50IHRvIGNvbnNpZGVyCmNvb3BlcmF0aW5nIHdpdGggdGhl IG1haW50YWluZXIgb2YgdGhlIGNvbmZsaWN0aW5nIHRyZWUgdG8gbWluaW1pc2UgYW55CnBhcnRp Y3VsYXJseSBjb21wbGV4IGNvbmZsaWN0cy4KCi0tIApDaGVlcnMsClN0ZXBoZW4gUm90aHdlbGwK X19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX18KZHJpLWRldmVs IG1haWxpbmcgbGlzdApkcmktZGV2ZWxAbGlzdHMuZnJlZWRlc2t0b3Aub3JnCmh0dHBzOi8vbGlz dHMuZnJlZWRlc2t0b3Aub3JnL21haWxtYW4vbGlzdGluZm8vZHJpLWRldmVsCg==