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=-0.8 required=3.0 tests=DKIM_SIGNED,DKIM_VALID, DKIM_VALID_AU,HEADER_FROM_DIFFERENT_DOMAINS,MAILING_LIST_MULTI,SPF_HELO_NONE, SPF_PASS autolearn=no 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 ADA8BC3A5A2 for ; Tue, 20 Aug 2019 02:20:01 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 8211A20644 for ; Tue, 20 Aug 2019 02:20:01 +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="LBfxPa5R" Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1729053AbfHTCUA (ORCPT ); Mon, 19 Aug 2019 22:20:00 -0400 Received: from bilbo.ozlabs.org ([203.11.71.1]:36159 "EHLO ozlabs.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1728786AbfHTCUA (ORCPT ); Mon, 19 Aug 2019 22:20:00 -0400 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 (4096 bits) server-digest SHA256) (No client certificate requested) by mail.ozlabs.org (Postfix) with ESMTPSA id 46CDyh66bmz9s00; Tue, 20 Aug 2019 12:19:56 +1000 (AEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=canb.auug.org.au; s=201702; t=1566267597; bh=G3CcDYSV9aTwPBVzg4lK6cMgQnzXOfARUYQzz0uvdak=; h=Date:From:To:Cc:Subject:From; b=LBfxPa5RkvNqkYhoDMzW45uA1cXIjSVg2MO5WOIETH+ERJvDH3d1mT9f+aRkCNOsf cPkJZOsctR2Jpr6Jj36gMSlyH6z3t1aIYhjDsEJ2epRIKqb5//qd/VJQFc3cWY3/o8 e2tFgJwkr3DQgwOxuXPDPi/Iuw1u6QOG5Hcj7ClZEvaoDeNOKWpI1MIeDnt7H85RN/ FAKDSq8/H+yWBb6P+SjJ0oEheJZgSGmlo8u6OqfSUvYSO38VV1csqWYthLuKlGYzXV 2zMHYa8VuE+YfvksOKvqqjCYTWa73Yoy1ovP0c2Eompy5fHm9kVJy+hrBkg8DyKMsZ yMoG2ZDhCIPLQ== Date: Tue, 20 Aug 2019 12:19:55 +1000 From: Stephen Rothwell To: Daniel Vetter , Intel Graphics , DRI , Jani Nikula , Joonas Lahtinen , Rodrigo Vivi Cc: Linux Next Mailing List , Linux Kernel Mailing List , Christian =?UTF-8?B?S8O2bmln?= , Chris Wilson Subject: linux-next: manual merge of the drm-misc tree with the drm-intel tree Message-ID: <20190820121955.55c9b9f1@canb.auug.org.au> MIME-Version: 1.0 Content-Type: multipart/signed; boundary="Sig_/Bzvt5qLq9P9NLVxxhaIymc="; protocol="application/pgp-signature"; micalg=pgp-sha256 Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org --Sig_/Bzvt5qLq9P9NLVxxhaIymc= Content-Type: text/plain; charset=US-ASCII Content-Transfer-Encoding: quoted-printable Hi all, Today's linux-next merge of the drm-misc tree got a conflict in: drivers/gpu/drm/i915/gem/i915_gem_execbuffer.c between commit: 70d6894d1456 ("drm/i915: Serialize against vma moves") from the drm-intel tree and commit: 52791eeec1d9 ("dma-buf: rename reservation_object to dma_resv") from the drm-misc tree. I fixed it up (the former removed the code changed by the latter) 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_/Bzvt5qLq9P9NLVxxhaIymc= Content-Type: application/pgp-signature Content-Description: OpenPGP digital signature -----BEGIN PGP SIGNATURE----- iQEzBAEBCAAdFiEENIC96giZ81tWdLgKAVBC80lX0GwFAl1bWMsACgkQAVBC80lX 0Gz+Ngf5AdkyGgbLri4kc0dpaxwEYeoK+87N+hxcF62nF0lwnU6cYfWLTgOHP3kI +xKxdf+3ZhsPlIACcucM6LvRhzLK6nD7Ka2m6OS7GmSx+Hd9eDVayrWUQ6D0JNFC HveEU/ktdUol6wuDYDWtNydLajq3CNEYB/YMo/YMP90KGbOxbaR1XV2+DYjIdHT9 egmT3HcWWBl7uCQ+oXJS5VHg5H9QPTJj8Sfy1IpmsWVr7U1PdQPSaiw6BiKDfff5 5U3vs8u/lsoPUx73FXSuwIVKfqOS5bei3boaUe+B2Wtl+nkOrA5uzsAN9T8kNr3n 7YDsadtq6GAJk2/UCkRqKgowSnGzlw== =W4Hi -----END PGP SIGNATURE----- --Sig_/Bzvt5qLq9P9NLVxxhaIymc=--