From patchwork Tue Oct 27 01:26:28 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Stephen Rothwell X-Patchwork-Id: 11859215 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=-3.5 required=3.0 tests=BAYES_00,DKIM_INVALID, DKIM_SIGNED,HEADER_FROM_DIFFERENT_DOMAINS,MAILING_LIST_MULTI,SPF_HELO_NONE, SPF_PASS,URIBL_BLOCKED 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 DA1ACC2D0A3 for ; Tue, 27 Oct 2020 01:26:37 +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 5E4952080A for ; Tue, 27 Oct 2020 01:26:37 +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="DSzs3E4y" DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 5E4952080A 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 69BCF6EAB7; Tue, 27 Oct 2020 01:26:33 +0000 (UTC) Received: from ozlabs.org (ozlabs.org [203.11.71.1]) by gabe.freedesktop.org (Postfix) with ESMTPS id 5BF5D6EAB4; Tue, 27 Oct 2020 01:26:31 +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 4CKvDh5MJ1z9sSs; Tue, 27 Oct 2020 12:26:28 +1100 (AEDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=canb.auug.org.au; s=201702; t=1603761989; bh=xJK4s5+Fq4J95fHuYwEaGr9RLSssEmH01jmBaMhYu64=; h=Date:From:To:Cc:Subject:From; b=DSzs3E4y79+TznZdAoPBqPe3rI32YZew8wAGwNizz2H1rkgJoAOB/GKZScXUdlpbO g4MSsSSvErQKi4eYd68Oiwh534Ix1LKk0UCiNnmskO/zfJ0s2/2ioS567GEKU9gG2c froIPEP6QeSOF2pyLfeEj8EmggzwRqi5t/nEQ1D5NZPdrsHM7afxQnv3sNqBFwVwOE tR8J1ZZnluaR5hUUpPr59OP1Z8Wt2+ROuP8bQPP216oA4Gz+lqAyzsSTK00Rq5AAMh UBieqZSJDjByo2OO54eNpPynzKzDR8yAr5ypCAGvNtfbzECrSho39zuKWx81cw7bnw 1Rj4el/jk6EWg== Date: Tue, 27 Oct 2020 12:26:28 +1100 From: Stephen Rothwell To: Daniel Vetter , Intel Graphics , DRI Message-ID: <20201027122628.18babff3@canb.auug.org.au> MIME-Version: 1.0 Subject: [Intel-gfx] linux-next: manual merge of the drm-misc tree with Linus' 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: Dave Airlie , Linux Kernel Mailing List , Gurchetan Singh , Linux Next Mailing List , Gerd Hoffmann , Marek Szyprowski Errors-To: intel-gfx-bounces@lists.freedesktop.org Sender: "Intel-gfx" Hi all, Today's linux-next merge of the drm-misc tree got a conflict in: drivers/gpu/drm/virtio/virtgpu_vq.c between commit: 75ef337bdba4 ("drm: virtio: fix common struct sg_table related issues") from Linus' tree and commit: 50c3d1938ee3 ("drm/virtio: implement blob resources: fix stride discrepancy") 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. diff --cc drivers/gpu/drm/virtio/virtgpu_vq.c index 07945ca238e2,c1824f536936..000000000000 --- a/drivers/gpu/drm/virtio/virtgpu_vq.c