From patchwork Wed Nov 22 00:29:30 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Stephen Rothwell X-Patchwork-Id: 168044 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a05:612c:2b07:b0:403:3b70:6f57 with SMTP id io7csp1006330vqb; Tue, 21 Nov 2023 16:29:47 -0800 (PST) X-Google-Smtp-Source: AGHT+IHumycPc38F7SuR6f4KUzim+euQ5f6iUtU3TcuSpMHcYkVpJWUh8PyRpg4Jx+cH5rlKeXRZ X-Received: by 2002:a05:6a21:360e:b0:18b:2710:d729 with SMTP id yg14-20020a056a21360e00b0018b2710d729mr569147pzb.31.1700612986683; Tue, 21 Nov 2023 16:29:46 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1700612986; cv=none; d=google.com; s=arc-20160816; b=kHheKNBFTDqixoIlr0mWF8hn/ZQIBpo3LqLDFlxL4YCxwUObvslcEHD+aMUemZsQu0 5gGsLwTnJ/57GjHjndTp1cSuNaNFeujQusr8WmdwLfpDPKdMJGNbtwBuVQJmfcMuMuqU mRlNPcKoFQEs0L1CbPtXvPo3pTAJtFM+6ZOfrufRKo0LWgJJThwbzS7bkoUJwR6F4IeO G2bizC+84Kdb0agF6/KfvkG0WBs63grK+pXxv88a2bYLOOjedV4n5syoI8Urut5gbWmh RU6tqkf52jErEK9oHEY8pH+qhKRXBKSwhBruia/clPDCmxG9OTNkrpBxE6zkjlpZgCeZ jMhQ== 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=NavejzRn6aIoSlrOplrfI6W3+q6tZqXpfcPZH5NPdKU=; fh=aJdcEOaOjefoCtfDNo9RotFYY0YIIvPE4vEiU6X/Mrs=; b=aGsDe0rVKSmd8UlXJtIe4O5ln0vPTz7h89WJdYVuN2WfGMG46WWTQ/SkdQTyenDWXG UVin0uH3DsiREM+x4mkZfwMPK1no5z3j2nh0tlwxWpQTLmev8TV5UXyQQ0L9+QIaqLtH lOdPQAD8hgzS4vrRYi/uFPK2Zgdpl4vbFFd8ae/JKkUz6lAKMzq4B+GWh/ZWXIJS83Zf 1Mckwv9dUjzOeBwHufdLFdazqEW3XHQwnLAq4rs+XBLkb0qH7lkPvv+jGDjyGI3Ls9Ab FRq2XLClEjWXPiHfQaePeTLGQ46zdOy7Frd5/SAg18gHvBzi4vHxxjVquFSgqJiXNX8Z ajxA== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@canb.auug.org.au header.s=201702 header.b=pD+oHtCr; 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 s10-20020a056a00194a00b006c33a1be028si11744831pfk.87.2023.11.21.16.29.46 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 21 Nov 2023 16:29:46 -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=pD+oHtCr; 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 E81DB8183ED7; Tue, 21 Nov 2023 16:29:41 -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 S229379AbjKVA3n (ORCPT + 99 others); Tue, 21 Nov 2023 19:29:43 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:52350 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229684AbjKVA3m (ORCPT ); Tue, 21 Nov 2023 19:29:42 -0500 Received: from gandalf.ozlabs.org (mail.ozlabs.org [IPv6:2404:9400:2221:ea00::3]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 4A42E1AA; Tue, 21 Nov 2023 16:29:38 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=canb.auug.org.au; s=201702; t=1700612973; bh=NavejzRn6aIoSlrOplrfI6W3+q6tZqXpfcPZH5NPdKU=; h=Date:From:To:Cc:Subject:From; b=pD+oHtCrUImQFRms4jGN1oJD4HmI7hFhQCcQ/4Bqwr/XNEcwmHGc0z4vE+ZnTa2iV +4ekaqby84xho2zDZlgML0C9SLZfOcwSB0DBzvNdG02ExK0fEFBFR0+nWUnq91Go8R bxAT3BIBXi5hZOcmfqMMBwO+JhkHXnhGC9WYCnI7UHUYcQqyR4Y2z/3XjRAMhDqhXI rKSU4cQv/7k3VmbrFdlyH/JqORxxI95hO3OX5eej7VZj8RbsY9oMS10WmRwMrLJBBd 70MJfLidjjvbMvr/kPWFuXTzH+tlWeKgBYqChmCu0g0moa+ov8Y8lkicrNzWTWnTpo 7RwSqLlvaqnvw== 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 4SZhvc0cHDz4x7q; Wed, 22 Nov 2023 11:29:31 +1100 (AEDT) Date: Wed, 22 Nov 2023 11:29:30 +1100 From: Stephen Rothwell To: Dave Airlie , Daniel Vetter Cc: Intel Graphics , DRI , Andrzej Kacprowski , Jacek Lawrynowicz , Linux Kernel Mailing List , Linux Next Mailing List , Stanislaw Gruszka Subject: linux-next: manual merge of the drm tree with the drm-misc-fixes tree Message-ID: <20231122112930.5e7c7bcd@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]); Tue, 21 Nov 2023 16:29:42 -0800 (PST) X-getmail-retrieved-from-mailbox: INBOX X-GMAIL-THRID: 1783221963011164859 X-GMAIL-MSGID: 1783221963011164859 Hi all, Today's linux-next merge of the drm tree got a conflict in: drivers/accel/ivpu/ivpu_hw_37xx.c between commit: 3f7c0634926d ("accel/ivpu/37xx: Fix hangs related to MMIO reset") from the drm-misc-fixes tree and commits: 3de6d9597892 ("accel/ivpu: Pass D0i3 residency time to the VPU firmware") cc19fedab8bd ("accel/ivpu/37xx: Print warning when VPUIP is not idle during power down") from the drm 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_hw_37xx.c index 4ccf1994b97a,4ab1f14cf360..000000000000 --- a/drivers/accel/ivpu/ivpu_hw_37xx.c