From patchwork Sun Mar 1 23:43:21 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Stephen Rothwell X-Patchwork-Id: 11414589 Return-Path: Received: from mail.kernel.org (pdx-korg-mail-1.web.codeaurora.org [172.30.200.123]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id 9D2A914E3 for ; Sun, 1 Mar 2020 23:43:39 +0000 (UTC) Received: from gabe.freedesktop.org (gabe.freedesktop.org [131.252.210.177]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id 7B6F321775 for ; Sun, 1 Mar 2020 23:43:39 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=fail reason="signature verification failed" (2048-bit key) header.d=canb.auug.org.au header.i=@canb.auug.org.au header.b="JwLHxczl" DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 7B6F321775 Authentication-Results: mail.kernel.org; dmarc=none (p=none dis=none) header.from=canb.auug.org.au Authentication-Results: mail.kernel.org; spf=none smtp.mailfrom=intel-gfx-bounces@lists.freedesktop.org Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id AFBA06E433; Sun, 1 Mar 2020 23:43:34 +0000 (UTC) X-Original-To: intel-gfx@lists.freedesktop.org Delivered-To: intel-gfx@lists.freedesktop.org Received: from ozlabs.org (ozlabs.org [203.11.71.1]) by gabe.freedesktop.org (Postfix) with ESMTPS id C0DD76E52C for ; Sun, 1 Mar 2020 23:43:33 +0000 (UTC) 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 48W0G76Sfqz9sSQ; Mon, 2 Mar 2020 10:43:27 +1100 (AEDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=canb.auug.org.au; s=201702; t=1583106208; bh=gIZXNiNPVslt627TKckA0B3yIPamJysGD6GIC0Ae2QI=; h=Date:From:To:Cc:Subject:From; b=JwLHxczlDseMQdo8piauim84SpJyz9o0/zXn+L9P1vjrw5erU6ycw3BrIZGNa98wS yVYq9XU2UmIKMw4D0RZekbjiID4eieeqSdNoAcTkYlkmRUUY6c2ffrrtEtStkSMOM4 JAxgNloLTTTVqcnIXiIjGzWgmUvGV5qcQrfTomDCtyCEG5HApLJsqe64+ej6K0Lpe9 82+/gTpSC6scjci8AL36ArZboinHyaZXjBVxwf7rQx+jewFwKdGeHR9slbQRrBwImo uakjvyIrOfzW+hsdwtUMO8n57qb4jrcyLRvcYZDdNXarHyqbpq5cgi7rjAtqDNrAW0 Z7rKKmPDs4YUg== Date: Mon, 2 Mar 2020 10:43:21 +1100 From: Stephen Rothwell To: Dave Airlie , Daniel Vetter , Intel Graphics , DRI Message-ID: <20200302104321.26803fb6@canb.auug.org.au> MIME-Version: 1.0 Subject: [Intel-gfx] linux-next: manual merge of the drm tree with the drm-misc-fixes tree X-BeenThere: intel-gfx@lists.freedesktop.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: Intel graphics driver community testing & development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Linux Next Mailing List , Gurchetan Singh , Linux Kernel Mailing List , Gerd Hoffmann Errors-To: intel-gfx-bounces@lists.freedesktop.org Sender: "Intel-gfx" Hi all, Today's linux-next merge of the drm tree got a conflict in: drivers/gpu/drm/virtio/virtgpu_object.c between commit: 6be7e0733548 ("drm/virtio: fix mmap page attributes") from the drm-misc-fixes tree and commit: 18b39fb975b7 ("drm/virtio: add virtio_gpu_is_shmem helper") from the drm 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. diff --cc drivers/gpu/drm/virtio/virtgpu_object.c index 3af7ec80c7da,c5cad949eb8d..000000000000 --- a/drivers/gpu/drm/virtio/virtgpu_object.c