Received: by 2002:a05:6a10:1287:0:0:0:0 with SMTP id d7csp6005986pxv; Thu, 29 Jul 2021 04:12:50 -0700 (PDT) X-Google-Smtp-Source: ABdhPJxloIhHSPgevBLQHye6ojl3GwwiPWs/qDFEish/4MJ5KP8CnH+X1MKVLIgllhHWkKrDopCT X-Received: by 2002:a05:6e02:6cc:: with SMTP id p12mr3360241ils.13.1627557170781; Thu, 29 Jul 2021 04:12:50 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1627557170; cv=none; d=google.com; s=arc-20160816; b=pL+Cmnl1MTLyib5gyMzYiPFpqkgNiioiGlSl5KslIwIcpRwsuHbi8FHLMsROTQtJzH 0s0wQBFGBqeMo2CMYzctVd/yr/6Xy5MDC6DPhB1cUOdo6e05jjbOdSsa4HoEKEwoK/x3 25ZOIpwwfYcuO+ptkJrRMaFr3Xz5C7qCdRnVgAnmc6TI64t2+vf8o1ux6vvNkxfQDUGO F2VFcAcBiIrIM/mOq1+XexHfrD9JG/0JgIicIClAUKE0Rpc/2JTcMFUBjMWZhWKWEsy8 ZDbzVRthw0y1XOsxghNdEmTCqOlcPWSm2spmIzTdyl8IFVgKgNVX9i0pV1RkIS9U+70K VHbw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:content-transfer-encoding:mime-version :message-id:date:subject:cc:to:from:dkim-signature; bh=PveswwP0xDGK+WN8Aza+wOJ9aDvQS4Y2HGFib6SSusQ=; b=Yl+eIdG7uX2mcdplSwd5ORDXB7Sl2sb822YAAt955Aw95a9wJV1L4vbM9Vo2bnTb1N 0LWWDDTQglTH/o/9PduOn6iA4U4koyXcPG+ORLFR0tk/r7O9+qprBwilIVVClx4h2mhG iWYb5zLq4VWOIY+WzlmRq9Pm9lGRVgoeVbN2qktTfcHz8CUZ5DV01q4g2w393pCawrEN d2RNQKjnNoEMqaZ2PDRthE0pi6mi8zAh+/uz1tV/JXXY4F3nnDAiT8GCPd2qUahSIgY3 f05YZs85n3ekbNf49X65SOj4ZgzDrWtcY/3sJAYGuOS498zT+0ue+TzHjlgEUS3t5E+n q3ng== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@kernel.org header.s=k20201202 header.b=eyIIHSLu; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=kernel.org Return-Path: Received: from vger.kernel.org (vger.kernel.org. [23.128.96.18]) by mx.google.com with ESMTP id d14si2902540ilq.43.2021.07.29.04.12.39; Thu, 29 Jul 2021 04:12:50 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) client-ip=23.128.96.18; Authentication-Results: mx.google.com; dkim=pass header.i=@kernel.org header.s=k20201202 header.b=eyIIHSLu; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S236430AbhG2LKq (ORCPT + 99 others); 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