From patchwork Fri Sep 18 03:07:10 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Stephen Rothwell X-Patchwork-Id: 11783943 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 C5392746 for ; Fri, 18 Sep 2020 03:07:22 +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 D2CB22083B for ; Fri, 18 Sep 2020 03:07:21 +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="ub528vZ8" DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org D2CB22083B 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=dri-devel-bounces@lists.freedesktop.org Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id 2428E6EC8D; Fri, 18 Sep 2020 03:07:19 +0000 (UTC) X-Original-To: dri-devel@lists.freedesktop.org Delivered-To: dri-devel@lists.freedesktop.org Received: from ozlabs.org (ozlabs.org [203.11.71.1]) by gabe.freedesktop.org (Postfix) with ESMTPS id 3A7B46EC8D for ; Fri, 18 Sep 2020 03:07:16 +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 4BszJv65FpzB3vJ; Fri, 18 Sep 2020 13:07:11 +1000 (AEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=canb.auug.org.au; s=201702; t=1600398434; bh=jY+10yJmYJ3kdSdFgZdAN0Xv69kt3UN2C8TV6HNN/HI=; h=Date:From:To:Cc:Subject:From; b=ub528vZ8lrn0PXGMfjXAd3k1iQvDRcQbEto+2Fxaq9atjs19rCWMrAxcjmcOWGy+D VoE1FQ/qKcLKYOZGQIh4wI2nHMVSbEZHlFzQJJs8znfsPYRsJn3f6AsLdh0WKDtEpC osj8etrZN028OuKsdiroJ0SH5IKvbIpxTRmzMz9tDJGIx22OR2NieL8oAX+ib8w3rA MNTDGToTEvYLLeJnrO928g0Y2Y0RR1FUOU6kscBAPBTuLjTWfYX9j0k65E3MypD3AP KcPWUKIIjMr1mVwRmzVrsmMjyYtow1Fsbna2PXOy4npt4Ka8IjfMy6bSZzpsn84akh yN+KTEtb5E1iA== Date: Fri, 18 Sep 2020 13:07:10 +1000 From: Stephen Rothwell To: Rob Clark , Sean Paul , Dave Airlie , DRI Subject: linux-next: manual merge of the drm-msm tree with the drm tree Message-ID: <20200918130710.3a9b1ed4@canb.auug.org.au> MIME-Version: 1.0 X-BeenThere: dri-devel@lists.freedesktop.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: Direct Rendering Infrastructure - Development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Linux Next Mailing List , Linux Kernel Mailing List , Marek Szyprowski Errors-To: dri-devel-bounces@lists.freedesktop.org Sender: "dri-devel" Hi all, Today's linux-next merge of the drm-msm tree got a conflict in: drivers/gpu/drm/msm/msm_gem.c between commit: 7690a33f22ab ("drm: msm: fix common struct sg_table related issues") from the drm tree and commit: e1bf29e022fb ("drm/msm: drop cache sync hack") from the drm-msm 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/msm/msm_gem.c index e47958c3704a,3cb7aeb93fd3..000000000000 --- a/drivers/gpu/drm/msm/msm_gem.c