From patchwork Thu Jan 19 01:23:50 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Stephen Rothwell X-Patchwork-Id: 45560 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:adf:eb09:0:0:0:0:0 with SMTP id s9csp80219wrn; Wed, 18 Jan 2023 17:34:41 -0800 (PST) X-Google-Smtp-Source: AMrXdXsC82dlStfHtmQnQ0KCr6inDWH001tj35mwavkb3ftvPzByG9A4lvydBLbsyMCGnXT3wRze X-Received: by 2002:a17:907:7e9a:b0:7c1:27a:80ed with SMTP id qb26-20020a1709077e9a00b007c1027a80edmr12210729ejc.0.1674092081334; Wed, 18 Jan 2023 17:34:41 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1674092081; cv=none; d=google.com; s=arc-20160816; b=kbYO1QRdpZld64rN8CR34oYlwX+/MBmQa6/wU1FP61iI1mFmxMTGvqd2c3MXyjpL1H s2UHg5TBrXIt8WaYgC5IpQXRtQOqXbsYZR5k4S04ad2vH5h03GyVJKV9dmR70Bs4Sz5j cY7G5GgrZ0pCzfQMyeJIfVBDYDeyIGpWFE1xe9VR/s/cMJ1yh/unvID599udTsOhydZN Nd+PocalDyqt5yyLpSRIlqs5Eby34h6RmnsDZii6u9hFfuhaB6i9a8/CHeSaL7Hvg/As qdhQiaBXy9LlGS/xNUsBqGv0DRGPqeTxsK9wElu8hWNmBU2JbI/IUF3eKTqOtMXT+NA6 FGag== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:mime-version:message-id:subject:cc:to:from:date :dkim-signature; bh=ML4kAbp8gDGzHkL67TSuZfNbjMRm8HROHF4LGBWuSls=; b=BsMjTIsl0ucKmQtarwjmTeFIw6hgCQOwrApaxj3yI2EvbppgO8249SsEIUMcWMeMxV D+3FYqsYUeIRujOiwZTvIfB/jcRr/h4dh1bAVqdlalY4eXwFARmU0E+vL6/zc4LyqvBg dNrZ170/G5d3p7OZxAbZAqRrbzsEZwNz1U41CwMvXLnSwRBo7ghTrJNAolwxtDOym7GG rt0QEpbj5qdkukXy1FnSQ2B1apR1RqcojOUhln7Vu73koYK1qsD4rNEOsZDE86PpeAuK egdtujBOHGIqvYUJMVpuMaXc1mPF5MrkAK8QxtD/s1Oe3E9WH+6aZxeZzqIJz8a1JXB9 xnuQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@canb.auug.org.au header.s=201702 header.b=Tt8TSidQ; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Received: from out1.vger.email (out1.vger.email. [2620:137:e000::1:20]) by mx.google.com with ESMTP id go34-20020a1709070da200b00871969cddafsi10052691ejc.530.2023.01.18.17.34.17; Wed, 18 Jan 2023 17:34:41 -0800 (PST) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) client-ip=2620:137:e000::1:20; Authentication-Results: mx.google.com; dkim=pass header.i=@canb.auug.org.au header.s=201702 header.b=Tt8TSidQ; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S230241AbjASB3v (ORCPT + 99 others); Wed, 18 Jan 2023 20:29:51 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:44232 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229887AbjASB2z (ORCPT ); Wed, 18 Jan 2023 20:28:55 -0500 Received: from gandalf.ozlabs.org (mail.ozlabs.org [IPv6:2404:9400:2221:ea00::3]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 3E1DB6843B; Wed, 18 Jan 2023 17:23:54 -0800 (PST) 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 4Ny4dz3BLpz4x1D; Thu, 19 Jan 2023 12:23:51 +1100 (AEDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=canb.auug.org.au; s=201702; t=1674091432; bh=ML4kAbp8gDGzHkL67TSuZfNbjMRm8HROHF4LGBWuSls=; h=Date:From:To:Cc:Subject:From; b=Tt8TSidQSz80oc51K9zNp61EVW4Km0BGazflCstNHZVwnxnkq03+3BpcaDR/ylrXb +mIVaOGp0OqWglzSHz2kOPF9wAWcSutpDPKWmOTtD+al3k+MOT5jeZ9UtNroUu+HQS xamPtXGyk6Ob5gvRdSHeXqGlaKzQ/9orU7m4NRS9CdCBNILItOvQB9yROUw/nBBxK5 ngTLoZVFQPN70wi15ishK1+HmxrLKCl3lXhR2zFoRkIXiwfHT1T5lpORjbBxQjw2l9 ZNvfbkyzurIe/TiAbd+0d3NPvO+IcixV4vWwfC+4/IKDdtHckXfDEEaaEOdfwKFFLd TrW8VqAlinJhA== Date: Thu, 19 Jan 2023 12:23:50 +1100 From: Stephen Rothwell To: Dmitry Baryshkov , Rob Clark , Sean Paul Cc: Akhil P Oommen , Jiasheng Jiang , Linux Kernel Mailing List , Linux Next Mailing List , Rob Clark Subject: linux-next: manual merge of the drm-msm-lumag tree with Linus', drm-msm trees Message-ID: <20230119122350.2a767def@canb.auug.org.au> MIME-Version: 1.0 X-Spam-Status: No, score=-4.3 required=5.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,RCVD_IN_DNSWL_MED,SPF_HELO_PASS,SPF_PASS autolearn=ham autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on lindbergh.monkeyblade.net Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org X-getmail-retrieved-from-mailbox: =?utf-8?q?INBOX?= X-GMAIL-THRID: =?utf-8?q?1755412778389484881?= X-GMAIL-MSGID: =?utf-8?q?1755412778389484881?= Hi all, Today's linux-next merge of the drm-msm-lumag tree got a conflict in: drivers/gpu/drm/msm/msm_drv.c between commits: d73b1d02de08 ("drm/msm: Hangcheck progress detection") 8636500300a0 ("drm/msm: Fix failure paths in msm_drm_init()") from Linus', drm-msm trees and commit: 643b7d0869cc ("drm/msm: Add missing check and destroy for alloc_ordered_workqueue") from the drm-msm-lumag 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_drv.c index 0509e90d05e3,b052327181b2..000000000000 --- a/drivers/gpu/drm/msm/msm_drv.c