From patchwork Fri Jul 21 01:51: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: 123514 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a59:c923:0:b0:3e4:2afc:c1 with SMTP id j3csp3505156vqt; Thu, 20 Jul 2023 19:19:41 -0700 (PDT) X-Google-Smtp-Source: APBJJlHq4PNdob0h2FZrSXtaZK5Cuf949py4Ecc/PtNyIYaQ0MKF4qf6A2FxbGfzRp8yRIE7pyg2 X-Received: by 2002:a05:6870:f60c:b0:1b0:1a20:7e34 with SMTP id ek12-20020a056870f60c00b001b01a207e34mr595480oab.48.1689905980876; Thu, 20 Jul 2023 19:19:40 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1689905980; cv=none; d=google.com; s=arc-20160816; b=JmG7y44jKO3nXovC/aUH2Rwb8xaRsSXdfVcHh1sVK3/R1mJjVle+bZ1xrUnrOqoq6M Zj2uz7z9OwI7SUnXxecrYoiGzEMo+36wvEMz5DwA9wQ22mHWei6eYci91sLZrx5533zb aEUhNFafPZazuFfOaTI2LQHHBxy4wzIRwVExP3TP59eAXw0ogJkJNVdzhubbBfY71V0U ToTCbUYxp5LQ1ciMjc8wJvntHHMSAzGLDY4gBsP56jPlx2hC9AHfxCCU3jjSL48tZo2D vbOdIYOzMOG7pLTCmDWHsLa2Kry50yEKsT2DffkebK4zlKuewMiD4eKrYVcQtiKlgphs OveA== 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=+F9Do2iPt8eaNfQKYFsnAMNyDwy1yHR6Xpybwtn95uI=; fh=swqwh/nvKw35i5oQJn19oidi7Mrvev+qQSzmhq/XauE=; b=DPTHrZ6qhHM9smxYoRNaDvmKxksw/8ufR3aULUH7/sW+3Xtp9kPFlyXJoGx4f3ublG u4u4lgDyxj8lgSDEjfsudvGp162ETFlsvfbcY8SCFXFJA+bx3cPouHSHvv/MFN1u2Or1 3tgo9tcBR/ZhjNPyvokJnptdLDSLcEU4YRUrg7ax0UvQrSlna/9Zyw59FRNG3Wuwmx1L bjY8cLeFIN4CvBqK9FY2hSjl+qMDUawyB9DoEbd9I24nu0DWHfgcF+K1otQVp0jq+ASu zODBVZfjIwu56Ma9jT9M3pRYTJ5syK2mU/XVC0wI6gb3cvBfpGy9s6FNddj9NuU3vpqR nxAg== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@canb.auug.org.au header.s=201702 header.b=e+KEDlEB; 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; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=canb.auug.org.au Received: from out1.vger.email (out1.vger.email. [2620:137:e000::1:20]) by mx.google.com with ESMTP id j5-20020a056a00174500b0067de347ee12si2119221pfc.164.2023.07.20.19.19.27; Thu, 20 Jul 2023 19:19:40 -0700 (PDT) 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=e+KEDlEB; 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; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=canb.auug.org.au Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S229868AbjGUCLR (ORCPT + 99 others); Thu, 20 Jul 2023 22:11:17 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:32798 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229703AbjGUCLP (ORCPT ); Thu, 20 Jul 2023 22:11:15 -0400 Received: from gandalf.ozlabs.org (gandalf.ozlabs.org [150.107.74.76]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 512DB1711; Thu, 20 Jul 2023 19:11:13 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=canb.auug.org.au; s=201702; t=1689905468; bh=+F9Do2iPt8eaNfQKYFsnAMNyDwy1yHR6Xpybwtn95uI=; h=Date:From:To:Cc:Subject:From; b=e+KEDlEBUOjoXbz3y46/lQGEc8g3q3c9Z7yg2vKWxWmzXc0qimJT5g73yhm1o/ZPr 85KZ+/b9JmHrBPJj/VCji8iWkboBGS7KNHSNoUqwPDpzvBIw7gWHAY2jb0ZK5yH3Sj xO6iasddA3kQ29qG8RMkmbG6Fa8q673NPizT5f/VQnc121cf/YjFAtxnhKUKIzv+N9 O/Uu1S331lSNmOKTgrAGAnkvWkHDBvi0ZIJY8la+M+M6SgVMc5uoVtWKTFO9rLnKnl mzb2PZl949batyA4fSHY67RczhccCj14NYXOAvAyUNLPiAN9t0ob7FP1dpzQQ11Su3 0FWQ/yeNm2uYA== 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 (prime256v1) server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by mail.ozlabs.org (Postfix) with ESMTPSA id 4R6Y20612Mz4wxn; Fri, 21 Jul 2023 12:11:04 +1000 (AEST) Date: Fri, 21 Jul 2023 11:51:50 +1000 From: Stephen Rothwell To: Oded Gabbay , Dave Airlie Cc: DRI , Arnd Bergmann , Daniel Vetter , Linux Kernel Mailing List , Linux Next Mailing List , Tomer Tayar Subject: linux-next: manual merge of the accel tree with the drm-fixes tree Message-ID: <20230721115150.39142d89@canb.auug.org.au> MIME-Version: 1.0 X-Spam-Status: No, score=-2.0 required=5.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,SPF_HELO_PASS,SPF_PASS,T_SCC_BODY_TEXT_LINE, URIBL_BLOCKED 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: INBOX X-GMAIL-THRID: 1771994853718558228 X-GMAIL-MSGID: 1771994853718558228 Hi all, Today's linux-next merge of the accel tree got a conflict in: drivers/accel/habanalabs/common/habanalabs.h between commit: 78e9b217d78e ("accel/habanalabs: add more debugfs stub helpers") from the drm-fixes tree and commit: 32055d39a2bb ("accel/habanalabs: register compute device as an accel device") from the accel 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/habanalabs/common/habanalabs.h index 2f027d5a8206,834f8cbf080a..000000000000 --- a/drivers/accel/habanalabs/common/habanalabs.h