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.9 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 F0D38ECE58C for ; Tue, 8 Oct 2019 23:33:24 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id C905021721 for ; Tue, 8 Oct 2019 23:33:24 +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="kNyrXxEE" Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1729778AbfJHXdX (ORCPT ); Tue, 8 Oct 2019 19:33:23 -0400 Received: from ozlabs.org ([203.11.71.1]:57931 "EHLO ozlabs.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1726068AbfJHXdX (ORCPT ); Tue, 8 Oct 2019 19:33:23 -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 46ntvJ56D9z9sPL; Wed, 9 Oct 2019 10:33:15 +1100 (AEDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=canb.auug.org.au; s=201702; t=1570577600; bh=fCLq555CwsBdqSzNieFbT3yrcFvZ41mOJHpYKXLuEEk=; h=Date:From:To:Cc:Subject:From; b=kNyrXxEEy+s6GUEsPHqrCt1SsWqkv2V8WnRI98eGaBKtXJLJdtrHpaijx4vD32OH+ tBCU/BXR6DCnkCBzMejqLrvWOmYLU4CwjQRkUD47HJbkHyy3dZhbl8KDVu4EzqhPRg DuHvY1usvbNtiojl78qd0leCOnXgMWrtKRJFW54bXxSZQv6eUBQ4mltZxtk3LGUUA+ XMk3ZxX4Ue0tvTlO5YuZIsUI0NidWXtu/FseB+igHF9CJ62nAdrIwAi5pqgZ1s/GXz /pJUkNodm3Qmuxdlt0sWAl629X/ghl5RNWXG2SvT4XcrfFRJIejyjxkw/all4oJH5r viVf/on8Sne+A== Date: Wed, 9 Oct 2019 10:33:15 +1100 From: Stephen Rothwell To: Daniel Vetter , Intel Graphics , Dave Airlie , DRI Cc: Linux Next Mailing List , Linux Kernel Mailing List , Daniele Ceraolo Spurio , Chris Wilson Subject: linux-next: manual merge of the drm-misc tree with the drm tree Message-ID: <20191009103315.2f51e079@canb.auug.org.au> MIME-Version: 1.0 Content-Type: multipart/signed; boundary="Sig_/17ltTepqDW3c3omnX4kN7Pe"; 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_/17ltTepqDW3c3omnX4kN7Pe 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: 8a9a982767b7 ("drm/i915: use a separate context for gpu relocs") from the drm tree and commit: 4ee92c7149da ("drm/mm: Convert drm_mm_node booleans to bitops") 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. --=20 Cheers, Stephen Rothwell diff --cc drivers/gpu/drm/i915/gem/i915_gem_execbuffer.c index e8ddc2320efa,493f07806b08..000000000000 --- a/drivers/gpu/drm/i915/gem/i915_gem_execbuffer.c +++ b/drivers/gpu/drm/i915/gem/i915_gem_execbuffer.c @@@ -908,8 -902,7 +908,8 @@@ static void reloc_cache_init(struct rel cache->use_64bit_reloc =3D HAS_64BIT_RELOC(i915); cache->has_fence =3D cache->gen < 4; cache->needs_unfenced =3D INTEL_INFO(i915)->unfenced_needs_alignment; - cache->node.allocated =3D false; + cache->node.flags =3D 0; + cache->ce =3D NULL; cache->rq =3D NULL; cache->rq_size =3D 0; } --Sig_/17ltTepqDW3c3omnX4kN7Pe Content-Type: application/pgp-signature Content-Description: OpenPGP digital signature -----BEGIN PGP SIGNATURE----- iQEzBAEBCAAdFiEENIC96giZ81tWdLgKAVBC80lX0GwFAl2dHLsACgkQAVBC80lX 0GyUDwf8DQY+OK3S0jTEKtPrN9FJni3BxWGnlJpZVm9VEKhrVjMKXG3jyvRf/td5 FkO8KaQA0Xp0wzpW3aa3fkX7upqcay0MUtW1UVbGmujGJm7puWf34caBRYVUv8uZ KLANW8GNcfY7t+SiB4HGr0pKRXH3FI5dDCEIlvmpb18Lrvv8bubQIuWyarn43+Oh 0Ie/366XKJJhT/tZPCVgwk6UKEEHDXenh3KeAzNhf43/JTZA1NytPqovvLGsr7ls 2mikO2tfzWAs4jxXCcXday5JP3HF+OBOO18SrNuPMbZMwGT1XDSb32kqE1uzuMHu NhKK/OIaUOBBsq4txKSGWdmc6qyjqQ== =xhhf -----END PGP SIGNATURE----- --Sig_/17ltTepqDW3c3omnX4kN7Pe--