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=-9.7 required=3.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,MAILING_LIST_MULTI,SPF_HELO_NONE, SPF_PASS,USER_AGENT_GIT autolearn=unavailable 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 2426CC432BE for ; Thu, 29 Jul 2021 11:10:45 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 0B02260F0F for ; Thu, 29 Jul 2021 11:10:45 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S236558AbhG2LKq (ORCPT ); Thu, 29 Jul 2021 07:10:46 -0400 Received: from mail.kernel.org ([198.145.29.99]:56350 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S232135AbhG2LKp (ORCPT ); Thu, 29 Jul 2021 07:10:45 -0400 Received: by mail.kernel.org (Postfix) with ESMTPSA id 7502360F01; Thu, 29 Jul 2021 11:10:42 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1627557043; bh=6AqU7a9rl08gRBYUbq6F+fFWAGWmA5ea41X21vUy4Zw=; h=From:To:Cc:Subject:Date:From; b=eyIIHSLugjELWDryt0+Qe2+FjxRwKWJ7m0qCad9dQg269MF69+hZLtvhh44+IQFYj Lk+qD43GDJoF/BkFL9Emc9uw/bZDWtnpXazp8nmuYjwb8sV/YWsBK0ZUEzh9C788mf xWP1sLnBEEThghdmm+7/c6zIJ3z9huJXSIbfTwTauXvU0TrAf2oX5F4tFM2JQJQCWI iPaqfnjxVDs90SjMR10I3gvyjKZULhJC0Pv4DpYS3PExr8MH23UOU6KpNe2/zby3D/ wytVpBaoN1Fo3VzeAcDqPbHoUOEH/j0tRtdgPXNM+dHt6vgjHs8XC0Vb6ixaXkxN38 47/Kfl3/tVJRg== From: Mark Brown To: Rob Clark , Sean Paul Cc: =?UTF-8?q?Christian=20K=C3=B6nig?= , Linux Kernel Mailing List , Linux Next Mailing List , Rob Clark Subject: linux-next: manual merge of the drm-msm tree with the drm-next tree Date: Thu, 29 Jul 2021 12:10:27 +0100 Message-Id: <20210729111027.33028-1-broonie@kernel.org> X-Mailer: git-send-email 2.20.1 MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org 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: 60f800b2bdfa ("drm/msm: always wait for the exclusive fence") from the drm-next tree and commit: 1d8a5ca436ee ("drm/msm: Conversion to drm scheduler") 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 39c35414d7b5,5db07fc287ad..000000000000 --- a/drivers/gpu/drm/msm/msm_gem.c +++ b/drivers/gpu/drm/msm/msm_gem.c