From patchwork Tue Nov 14 00:25:03 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Stephen Rothwell X-Patchwork-Id: 164688 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a59:b909:0:b0:403:3b70:6f57 with SMTP id t9csp1561604vqg; Mon, 13 Nov 2023 16:26:39 -0800 (PST) X-Google-Smtp-Source: AGHT+IEfxBBDsu+rBNHY09TNc1BVeZdUEFHFsIB41meXH9/64pYE7DfBSLfVM1p4EQdE1tNoYnEb X-Received: by 2002:a05:6a20:9147:b0:16b:74bb:e57e with SMTP id x7-20020a056a20914700b0016b74bbe57emr6275929pzc.12.1699921598955; Mon, 13 Nov 2023 16:26:38 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1699921598; cv=none; d=google.com; s=arc-20160816; b=g8kpUg/DBAR5iOhR5hhnYt3mqw25Fi1Qs+qaTBuTaCmSBMPAzlvB2zU+8/C5etEAok QJuJEnxtR2uL8SQVCIRwwpsqpQpMlGEfm43f4k48IH/2HSCnpWxPZxG/S8pKodnFbItu MkN0QzmuUC75xCyw2vfOZr2EYsKF9qnruTEnsBs6YluAsN+wnR1jjx2Zaht3BmkuHjy3 pA44ZdW/BORjRiCVYouiV/dKOEjYayGO/oaFT9TI3EgPNYJPN0WKgCwGeGSuOTqIx+7j YN7AsV4/dT6kWo3Nv2Q3KbV5fcGFqYmsjnLsa8HS5E4KJgg7Q8evcR5pyrmmGLo7s8wq A7QA== 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=0OLCvVOkYstpdcz9x3Fniksg/NrhBMGEfgtUuBgeYaU=; fh=lw9fJ/X68AyedS35beX7gAtD5TNvUiOCSp1567L9oZ0=; b=bnuKnkcIFD7rQMowwG5mwK+oJd1O14C++I9GZ9TrozxhZxenHARYThfKjYXhA5d1ks 4/+9Lg5OvcGGsLK0IcpGmvxrTuR5ByJcmT4WGr2MLKNojEJZFpfvFZ3TcaICh+KxaWWy Gx4a77fR3WYhn/Uz/vPAXMm7UM1q3JaRLm5Od+Plz/jj0FinNq6aU6LWmt/XgBJScd16 l+VAyIcIjra1rN72NCyJGfcQY0T/WIrFqIdC5s2e6CkgNOvLwc5/fWkd2PjebNRfKuhi krf0CDBqig+z67r/hF39hsCrG3CVKwfFQxa1MQf2e4z67GYnxFtv6QUDvQJfK5MhWHBi ruUw== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@canb.auug.org.au header.s=201702 header.b=ZgFK4Z5x; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.33 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=canb.auug.org.au Received: from lipwig.vger.email (lipwig.vger.email. [23.128.96.33]) by mx.google.com with ESMTPS id a8-20020a17090a8c0800b0027d27512cd4si6820654pjo.81.2023.11.13.16.26.38 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 13 Nov 2023 16:26:38 -0800 (PST) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.33 as permitted sender) client-ip=23.128.96.33; Authentication-Results: mx.google.com; dkim=pass header.i=@canb.auug.org.au header.s=201702 header.b=ZgFK4Z5x; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.33 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=canb.auug.org.au Received: from out1.vger.email (depot.vger.email [IPv6:2620:137:e000::3:0]) by lipwig.vger.email (Postfix) with ESMTP id ED4BE807C572; Mon, 13 Nov 2023 16:25:32 -0800 (PST) X-Virus-Status: Clean X-Virus-Scanned: clamav-milter 0.103.11 at lipwig.vger.email Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S230366AbjKNAZO (ORCPT + 30 others); Mon, 13 Nov 2023 19:25:14 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:52470 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229511AbjKNAZN (ORCPT ); Mon, 13 Nov 2023 19:25:13 -0500 Received: from gandalf.ozlabs.org (gandalf.ozlabs.org [150.107.74.76]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 3E28CD50; Mon, 13 Nov 2023 16:25:09 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=canb.auug.org.au; s=201702; t=1699921507; bh=0OLCvVOkYstpdcz9x3Fniksg/NrhBMGEfgtUuBgeYaU=; h=Date:From:To:Cc:Subject:From; b=ZgFK4Z5xVWHQiwE9Oh0UIAxGoBI5/cW9TvTJoBUCYs4y/QxMuemzRn2O2B8ePGiDS AU/8q2L9iSAf+kDi6U3j7dLuQzAhzD0UCEq8x33MOc8Jahe8dOgs1+2zcy8Z8l1Mrg dhWivIpdxLehYAdu0o1PgxrEkm5hzrrxjGlsLscU0nBjZJSX0yEa2mJK/hnOGA6bWH xluDfos+akAfuQaw3UlWyrDKtcbRGlUcUnKiH2gQHYYk/n0cqqQIs7iLLZo9zmdTsY PERkah7OjrnSS7zPnjVziouwRT78MLvlLVSX7WhRW9UKRKfWs/Q5qQFhqRxbOEn6iy Kku4rkXUKDmrg== 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 X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by mail.ozlabs.org (Postfix) with ESMTPSA id 4STnBB2v1Zz4xQZ; Tue, 14 Nov 2023 11:25:05 +1100 (AEDT) Date: Tue, 14 Nov 2023 11:25:03 +1100 From: Stephen Rothwell To: Daniel Vetter , Intel Graphics , DRI Cc: Jacek Lawrynowicz , Linux Kernel Mailing List , Linux Next Mailing List , Stanislaw Gruszka Subject: linux-next: manual merge of the drm-misc tree with Linus' tree Message-ID: <20231114112503.6e098829@canb.auug.org.au> MIME-Version: 1.0 X-Spam-Status: No, score=-0.9 required=5.0 tests=DKIM_SIGNED,DKIM_VALID, DKIM_VALID_AU,HEADER_FROM_DIFFERENT_DOMAINS,MAILING_LIST_MULTI, SPF_HELO_NONE,SPF_PASS,T_SCC_BODY_TEXT_LINE autolearn=unavailable autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on lipwig.vger.email Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org X-Greylist: Sender passed SPF test, not delayed by milter-greylist-4.6.4 (lipwig.vger.email [0.0.0.0]); Mon, 13 Nov 2023 16:25:33 -0800 (PST) X-getmail-retrieved-from-mailbox: INBOX X-GMAIL-THRID: 1782496990038955553 X-GMAIL-MSGID: 1782496990038955553 Hi all, Today's linux-next merge of the drm-misc tree got a conflict in: drivers/accel/ivpu/ivpu_drv.c between commit: 828d63042aec ("accel/ivpu: Don't enter d0i3 during FLR") from Linus' tree and commit: 57c7e3e4800a ("accel/ivpu: Stop job_done_thread on suspend") from the drm-misc tree. I fixed it up (I think - 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/accel/ivpu/ivpu_drv.c index 790603017653,51fa60b6254c..000000000000 --- a/drivers/accel/ivpu/ivpu_drv.c