From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-1.1 required=3.0 tests=DKIM_SIGNED,DKIM_VALID, DKIM_VALID_AU,HEADER_FROM_DIFFERENT_DOMAINS,MAILING_LIST_MULTI,SPF_PASS autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 8F92DC43387 for ; Thu, 17 Jan 2019 01:59:53 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 56F32205C9 for ; Thu, 17 Jan 2019 01:59:53 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (2048-bit key) header.d=canb.auug.org.au header.i=@canb.auug.org.au header.b="EBt3L8hX" Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1726911AbfAQB7v (ORCPT ); Wed, 16 Jan 2019 20:59:51 -0500 Received: from ozlabs.org ([203.11.71.1]:36777 "EHLO ozlabs.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1725889AbfAQB7v (ORCPT ); Wed, 16 Jan 2019 20:59:51 -0500 Received: from authenticated.ozlabs.org (localhost [127.0.0.1]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange ECDHE (P-256) server-signature RSA-PSS (2048 bits) server-digest SHA256) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPSA id 43g6hc0wJwz9sBn; Thu, 17 Jan 2019 12:59:42 +1100 (AEDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=canb.auug.org.au; s=201702; t=1547690388; bh=OCsVCYc98KmSEndL4YyCCo49Om5hgiAQ1vWWAcoktd4=; h=Date:From:To:Cc:Subject:From; b=EBt3L8hXBI+JM3dgqLQuEbebusVC0iHV7tWUduznf12B0Y0xuq7MgZMXVMYyPXI02 1pzQo9+tUkozjgqOeuq4F3Sn19TR9/EUJ4JBpktowZFmCTLmdImYmZr9efo7PNT2HY NVBobC+95J2jipnHoTMHF4gq6Incmm3Ur+uN5lzgLO60zPb0lroeu9mWf0nasDgqoO 5959tdD488nyp90S8MWe+LVLRhr8iHtYSee1ppwqLWrrB4jUvCkp80UTBmwC+3wlb5 ZPc2MI0MZfwCI7oY3h1apWowENNHLq7dUyV/zJryBV5DJ4Aefik7KeXFySdIbOEY1e 7Q1RWeznL+yIA== Date: Thu, 17 Jan 2019 12:59:41 +1100 From: Stephen Rothwell To: Daniel Vetter , Jani Nikula , Joonas Lahtinen , Rodrigo Vivi , Intel Graphics , DRI , Dave Airlie Cc: Linux Next Mailing List , Linux Kernel Mailing List , Chris Wilson , Mika Kuoppala Subject: linux-next: manual merge of the drm-intel tree with the drm tree Message-ID: <20190117125941.53019a72@canb.auug.org.au> MIME-Version: 1.0 Content-Type: multipart/signed; micalg=pgp-sha256; boundary="Sig_/QWdf.w6GxP5QwXP1pMV+fc9"; protocol="application/pgp-signature" Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org --Sig_/QWdf.w6GxP5QwXP1pMV+fc9 Content-Type: text/plain; charset=US-ASCII Content-Transfer-Encoding: quoted-printable Hi all, Today's linux-next merge of the drm-intel tree got a conflict in: drivers/gpu/drm/i915/i915_gem.c between commit: dd847a706974 ("drm/i915: Compile fix for 64b dma-fence seqno") from the drm tree and commit: 9f58892ea996 ("drm/i915: Pull all the reset functionality together into i= 915_reset.c") from the drm-intel tree. I fixed it up (the latter moved the code updated by the former, and the fix has been already been applied to the moved code) 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. --=20 Cheers, Stephen Rothwell --Sig_/QWdf.w6GxP5QwXP1pMV+fc9 Content-Type: application/pgp-signature Content-Description: OpenPGP digital signature -----BEGIN PGP SIGNATURE----- iQEzBAEBCAAdFiEENIC96giZ81tWdLgKAVBC80lX0GwFAlw/4Y0ACgkQAVBC80lX 0Gy3KQf/cun/RYc5x5HTr9bxj3EsBlfFABGr3jeiUfwMHQ8+Pi1067vPfe6VpvZR FXeQs/0marfS98+887p2i34kD0DgeVWtTiQ0uJYGZwlI78/RAStTKF3DHQrhSM9P pCXEO448hejhxNMsZps4X9VfVZO92QrCNNlmxdk8+yWEoPRplvJg2AZWhqNV3QvI kabWV1u5IhMdBMlmzwqsSoOpXqhOQI7HjAw0DCAkzq31tG2HcGHnP9ZGvCZ9CYJj gb+CARQmVQAx4lRD/YwVJOhED6Kl65cahH1iyYVqdWXb9xMEIsdUCV+hH9hmuM0O /RfgwOmHC8wgNdG67CZ/huYs4GkuNA== =oo5X -----END PGP SIGNATURE----- --Sig_/QWdf.w6GxP5QwXP1pMV+fc9--