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=-6.5 required=3.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,HEADER_FROM_DIFFERENT_DOMAINS, MAILING_LIST_MULTI,SPF_HELO_NONE,SPF_PASS 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 EB6CAC4338F for ; Thu, 29 Jul 2021 14:46:29 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id CF76B6069E for ; Thu, 29 Jul 2021 14:46:29 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S237253AbhG2Oq3 (ORCPT ); Thu, 29 Jul 2021 10:46:29 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:36526 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S237587AbhG2On1 (ORCPT ); Thu, 29 Jul 2021 10:43:27 -0400 Received: from mail-io1-xd2f.google.com (mail-io1-xd2f.google.com [IPv6:2607:f8b0:4864:20::d2f]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 5A49BC0613D3 for ; Thu, 29 Jul 2021 07:43:21 -0700 (PDT) Received: by mail-io1-xd2f.google.com with SMTP id y200so7491218iof.1 for ; Thu, 29 Jul 2021 07:43:21 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=chromium.org; s=google; h=mime-version:references:in-reply-to:from:date:message-id:subject:to :cc:content-transfer-encoding; bh=+UmWBFJr8CZCCI6Hv7anKl8N5XnEyboqlsB/Azk7Fvk=; b=W+WSgTckYxDJ3PQIAJIDPz/acxCKtOF3UQEmscCBjbTVF+6lpvtt8UOJK8ynV23PZ1 j9QnsuAj2AWqhPxI+3PzpkoxiVZJlZChGmwNLM9UPY90l4nIbw7cj2PA3PB8dFpDfStp U3WPeV0K/7yCEuYriitsRxR95iKeNneDOGEQ4= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:mime-version:references:in-reply-to:from:date :message-id:subject:to:cc:content-transfer-encoding; bh=+UmWBFJr8CZCCI6Hv7anKl8N5XnEyboqlsB/Azk7Fvk=; b=d5+2/X8qhU5mlA9v1HDDvlCP3lxtMI7zhmS3I+kXI8TpoeBRMm+E4N3ArIS60srOTc Rrs6Bz5yhe4QWWGFbXm2rK1yOKVSFFFyLcZoEQvwwiooU/9kcHEaI5JVDDIQvwCucKm0 7FeCiAPA03GztPqR2Ct3wqLuuDOpvi7c7nlyOD+EE+X4QMj+roPUHdGubML/60JqB4i2 2NKKKGxcJt7HXHecDQmfxLpJ5d6uL4DOY0pqSrtBJ41+8p9vwvU1O+m8KDaSFGjA4o9n A5OH4ILP3+1cUCkEAitVw6zQ18oInF8k5IJcKqOHn1w7GXgIAQSYcDFqK79MCfNdzY14 jnqg== X-Gm-Message-State: AOAM530o2cNneLINYWU0eLETDzZwOBIeGpYBgv5MPfPvuGTyNeLEAcFL qPkGRxzgnpeC3UP0a7PAy2JiWKUsZb/JtS/AoX8rCw== X-Google-Smtp-Source: ABdhPJwba+RJ3lGvRq+rfCLLiBleSyA4hT5CDS5/+FuNgREumvyYcfbJdG3n5wXq+ZPnCXxCjmaGneDkyAT917tyH+E= X-Received: by 2002:a5d:87cc:: with SMTP id q12mr4403406ios.131.1627569800780; Thu, 29 Jul 2021 07:43:20 -0700 (PDT) MIME-Version: 1.0 References: <20210729111027.33028-1-broonie@kernel.org> <2306c0c4-1312-fcc7-1ed3-406fbd72cf63@amd.com> <20210729122521.GM4670@sirena.org.uk> In-Reply-To: <20210729122521.GM4670@sirena.org.uk> From: Rob Clark Date: Thu, 29 Jul 2021 07:47:31 -0700 Message-ID: Subject: Re: linux-next: manual merge of the drm-msm tree with the drm-next tree To: Mark Brown Cc: =?UTF-8?Q?Christian_K=C3=B6nig?= , Rob Clark , Sean Paul , Linux Kernel Mailing List , Linux Next Mailing List Content-Type: text/plain; charset="UTF-8" Content-Transfer-Encoding: quoted-printable Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org On Thu, Jul 29, 2021 at 5:25 AM Mark Brown wrote: > > On Thu, Jul 29, 2021 at 01:44:42PM +0200, Christian K=C3=B6nig wrote: > > Am 29.07.21 um 13:10 schrieb Mark Brown: > > > 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 t= ree > > > is submitted for merging. You may also want to consider cooperating > > > with the maintainer of the conflicting tree to minimise any particula= rly > > > 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 > > > > thanks for the fixup, but something went wrong here. The diff is just e= mpty. > > > > Any idea what's going on? > > The change modified a function that is simply deleted so the resulting > diff was empty. That is the correct resolution, that commit switched to drm_gem_fence_array_add_implicit() as part of the conversion BR, -R