From patchwork Tue Nov 14 00:31:15 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Stephen Rothwell X-Patchwork-Id: 164690 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a59:b909:0:b0:403:3b70:6f57 with SMTP id t9csp1563633vqg; Mon, 13 Nov 2023 16:31:50 -0800 (PST) X-Google-Smtp-Source: AGHT+IHvTiro1OwpZ/yoycOGNZGNDL0ZGGuhIqi6hTWEiQck7w2c6Xb9GPTSMmZtIfE2K8rF/sCm X-Received: by 2002:a05:6a20:e124:b0:17b:2f9:4146 with SMTP id kr36-20020a056a20e12400b0017b02f94146mr9109340pzb.43.1699921910354; Mon, 13 Nov 2023 16:31:50 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1699921910; cv=none; d=google.com; s=arc-20160816; b=lEfSMwPm7/Je1p9GwGbqwaYtnUSIPuJDE1lg2zZI2JsPuZpKsz1szOCsuALuw8VSK4 uDiPEiLgkK7ET2MWPHvh5pezlFAE/fA00+SUHjbEmSntqIjh7S39dXNa21Oqc4YexIbG oX2VPfSemEG2zcPO/vxWd+27xBo4Vc8fpYKj1PElH4eOA7WrwhtoUZPChNs+VVBCNfel OtcIbL4gJ3ibKU4sOfIpf4Yay7TZu+07jJpRtVC1TxYF4lN0kvg2mKjdG7DnSLvKMvFw Qtn+he9JIVLhsZBt8he4dwYVUsG0tYxCzKnuS8q7opmkyrUY2NgazRlroUXD4ulnR+VH Rdqg== 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=VyI7R1XJebV+RTSJaiiX2a3dm6cnIzCQjDXJv9HV42Q=; fh=ipADGfZn8Rj4HJjf2OfjYZwmNBclPbs/VdmBHOY1Fsk=; b=k5JeCYSi14zzNun7Ay0Qe2HKf4cx/nK1sea+7Cg0GK+IN7YcWjuhjqA0xPd5zUly+R UsRnwssLHc1RiK4+kpEkAm+9XTIBiwsRTIn46WPn8UkZ5A7EjFNsNL0r1vCPlX8m6+Ma PvmrkSpYp7D+H4fAt2KV7FXnbF4JyCBrMIBo7VRGE5yLOIRcOlu/eSdFi6eIMWs9AQJm sytpeShBXMh9fvHyWKgBK95A4DOkBCr6EGp5yOL05o2c5noP+lS5BJOx/atalKYvQfrO +wzncUCm0AEzfq/TAOjOsFuxwhasV5suSJ1yvHChqp35WdhZZi3GNiOOcDxqnWCjoqtK DNEQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@canb.auug.org.au header.s=201702 header.b="KfjQUAm/"; 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 q13-20020a056a00084d00b0069341622984si6930054pfk.147.2023.11.13.16.31.50 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 13 Nov 2023 16:31:50 -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="KfjQUAm/"; 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 34176809F888; Mon, 13 Nov 2023 16:31:48 -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 S229962AbjKNAb2 (ORCPT + 30 others); Mon, 13 Nov 2023 19:31:28 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:42988 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229511AbjKNAbZ (ORCPT ); Mon, 13 Nov 2023 19:31:25 -0500 Received: from gandalf.ozlabs.org (mail.ozlabs.org [IPv6:2404:9400:2221:ea00::3]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 3C16FD48; Mon, 13 Nov 2023 16:31:21 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=canb.auug.org.au; s=201702; t=1699921876; bh=VyI7R1XJebV+RTSJaiiX2a3dm6cnIzCQjDXJv9HV42Q=; h=Date:From:To:Cc:Subject:From; b=KfjQUAm/j8b26226HhYFrqRDhEhRMFsiOfQlNa14l3DL2upMwkBJn+MP3XzrKmWJX 077K+WpFGUd2ldtXrCGvEnzzpBbn/Ti7PQPhGCX91Bhf0y6VFafmqdZp49Ir1MhdQO xxMUbwFq/biTmwBJ92O0Zxx3Z4uad/hEb36yU9tSp3aCLOdKDlH8OuWhkai4Xmygmk By2g9PHF/xXSl9vAjNaY8fhMiy6qj1zfvHVJaoAWRyE/dHcggC+qTVFtGo7ev6/WQJ U8/0c0ctTd8TWd6HlNoYIFGW7X/Bc4ft+HEN/x5sxf+rMA8fygv3UXh8KJZM1DS8gp F9BBYsD1uxGbA== 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 4STnKH6wJdz4xPf; Tue, 14 Nov 2023 11:31:15 +1100 (AEDT) Date: Tue, 14 Nov 2023 11:31:15 +1100 From: Stephen Rothwell To: Daniel Vetter , Intel Graphics , DRI Cc: 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: <20231114113115.50d8897b@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:31:48 -0800 (PST) X-getmail-retrieved-from-mailbox: INBOX X-GMAIL-THRID: 1782496990038955553 X-GMAIL-MSGID: 1782497317478587944 Hi all, Today's linux-next merge of the drm-misc tree got a conflict in: drivers/accel/ivpu/ivpu_ipc.c between commit: b0873eead1d1 ("accel/ivpu: Do not use wait event interruptible") from Linus' tree and commit: 57c7e3e4800a ("accel/ivpu: Stop job_done_thread on suspend") from the drm-misc 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/accel/ivpu/ivpu_ipc.c index a4ca40b184d4,618dbc17df80..000000000000 --- a/drivers/accel/ivpu/ivpu_ipc.c