From patchwork Mon Aug 26 03:12:36 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Stephen Rothwell X-Patchwork-Id: 11113875 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 3CFEF912 for ; Mon, 26 Aug 2019 03:12:44 +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 1DD472070B for ; Mon, 26 Aug 2019 03:12:44 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 1DD472070B 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 E17396E0B9; Mon, 26 Aug 2019 03:12:41 +0000 (UTC) X-Original-To: dri-devel@lists.freedesktop.org Delivered-To: dri-devel@lists.freedesktop.org Received: from ozlabs.org (bilbo.ozlabs.org [203.11.71.1]) by gabe.freedesktop.org (Postfix) with ESMTPS id 46E766E0B9 for ; Mon, 26 Aug 2019 03:12:40 +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 46Gxrj3ZCtz9sMr; Mon, 26 Aug 2019 13:12:37 +1000 (AEST) Date: Mon, 26 Aug 2019 13:12:36 +1000 From: Stephen Rothwell To: Dave Airlie , DRI Subject: linux-next: manual merge of the drm tree with Linus' tree Message-ID: <20190826131236.441e6c9f@canb.auug.org.au> MIME-Version: 1.0 X-Mailman-Original-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=canb.auug.org.au; s=201702; t=1566789157; bh=25Ggdo2oL/qJme2XUXxIElP5B2EGLpxpgnHNn9sLCBg=; h=Date:From:To:Cc:Subject:From; b=LeCeM/tERM3irPiFcF9K7Y4kfW5rJicrZrtcX1jbFeZ89VWWveQ4V3BzbP0Gyi+Zk aHCoMTjZmja+UvQBz6btHiw2SpXHYZLx0H1nurBkxqujybHmAMkgKlvQUnBQDfE4ls BQOrDvoASSq1nC6F4reh6CQ+KYPM7bwIF6Ay6My71d5dGyQdQCcxfYS2q+o6Uaj4iq ig3SnmczOFrOhp/kiBinw+ucu9KABdzRh/++cgqf+nbs/KFvH8fhRY4mQX5tMBsGGp GZcvGwnr2Gt4KmcC6ATLnNHaxr0jUfQKJNGvKtwQMivUobsWRhlig8Bx5VN7TxsT+H xYw+vFTrLktkQ== X-BeenThere: dri-devel@lists.freedesktop.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: Direct Rendering Infrastructure - Development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Linux Next Mailing List , Sam Ravnborg , Linux Kernel Mailing List Errors-To: dri-devel-bounces@lists.freedesktop.org Sender: "dri-devel" Hi all, Today's linux-next merge of the drm tree got a conflict in: drivers/gpu/drm/mediatek/mtk_drm_drv.c between commit: 7837951a12fd ("drm/mediatek: include dma-mapping header") from Linus' tree and commit: 9aef5867c86c ("drm/mediatek: drop use of drmP.h") 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/mediatek/mtk_drm_drv.c index 945bc20f1d33,2ee809a6f3dc..000000000000 --- a/drivers/gpu/drm/mediatek/mtk_drm_drv.c