From patchwork Thu Sep 28 02:05:59 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Stephen Rothwell X-Patchwork-Id: 145684 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a59:cae8:0:b0:403:3b70:6f57 with SMTP id r8csp3020310vqu; Wed, 27 Sep 2023 19:06:34 -0700 (PDT) X-Google-Smtp-Source: AGHT+IG8UmaGhfbtX2Hwud1L5SOuJYyUS00jXNNgOwC1aGjbGc/NiSqkXM20A2JH4pILalfVH1cm X-Received: by 2002:a05:6830:150:b0:6b9:9288:613c with SMTP id j16-20020a056830015000b006b99288613cmr4035804otp.13.1695866793765; Wed, 27 Sep 2023 19:06:33 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1695866793; cv=none; d=google.com; s=arc-20160816; b=s76Lv9Q08j+UapmSKXuoa1dyFJo61bZpe6pDXGU0E9CnCa9I0Vd5T2KtgyKIj5kVtS tBQZLVCM6tPmHKNzFOB42NlQpWm1sob93tJndICiqZh7h/YvOyn+12MwK9jQnaH9U4SO z7TSzctEVjVYlD7C5qM0j3RXIRoaajDi63zkWGjMUIOvOpBH7G5rWzxoBUaVERTU804I az0MMZ2w5gNAq/Qf3MyUd+8mXiKh7jUeZKLpH+UQjWZzpYfrlyYxxtMJ4y9AeSJvFrw2 QtZJiwWK+zVqC6R80+l7DKnyamdw/yLGw/z0qu++DiYKODJ1cDJvHsXaRslY+fNaDoIx 2HMQ== 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=PiZdKhrE/o3h0tGaT8pGddKF7rJCeQnVsW/gwwhnafM=; fh=CvEp4k75Na74oV34lz5TYWMjRMsRfTJP2AqH3nzDtvA=; b=Tr0txrT5DZDySa+E7q2B0rkYo9qAXNR7GZxdvg4/zakfmVdtb9slt+ejWbULuUraFV MhZlnk6cP73aHrsouoKCjOel/5ryPd16B0NZ1BNnQ1lL3cWmSycY0RBn73zP7N81gDp/ A7VRG1lGHrETEqbqoW799cpzs2eCMEZYyzwg/0snyycKcABxMyo5MbLF1HkKvXHt+cCZ Ro2U3GouBCyfkWH0Fb1m0tnwLpUbgHn9iLNFFcFneoeSMVkuvlnGADDqrFODevrGAGVW 2NbChFMAcTshPk7gxPuAXFjTLjEhKazuRq42VYZQb1siTVaVdhIHPdPStgDn13hclyLv teCg== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@canb.auug.org.au header.s=201702 header.b=GRMuyIVD; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::3:5 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 groat.vger.email (groat.vger.email. [2620:137:e000::3:5]) by mx.google.com with ESMTPS id f5-20020a056a0022c500b0068fbdfa7379si17485599pfj.311.2023.09.27.19.06.33 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 27 Sep 2023 19:06:33 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::3:5 as permitted sender) client-ip=2620:137:e000::3:5; Authentication-Results: mx.google.com; dkim=pass header.i=@canb.auug.org.au header.s=201702 header.b=GRMuyIVD; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::3:5 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 groat.vger.email (Postfix) with ESMTP id 52BFD832DA5B; Wed, 27 Sep 2023 19:06:25 -0700 (PDT) X-Virus-Status: Clean X-Virus-Scanned: clamav-milter 0.103.10 at groat.vger.email Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S229987AbjI1CGK (ORCPT + 20 others); Wed, 27 Sep 2023 22:06:10 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:34308 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229437AbjI1CGJ (ORCPT ); Wed, 27 Sep 2023 22:06:09 -0400 Received: from gandalf.ozlabs.org (mail.ozlabs.org [IPv6:2404:9400:2221:ea00::3]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 0AB76B3; Wed, 27 Sep 2023 19:06:07 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=canb.auug.org.au; s=201702; t=1695866761; bh=PiZdKhrE/o3h0tGaT8pGddKF7rJCeQnVsW/gwwhnafM=; h=Date:From:To:Cc:Subject:From; b=GRMuyIVD7OFAFCN42aro0PDyuSEH9y73kCbLx2Kq6Gj6YZz4fO3K+tOC6mLZAOhKi m4nmF7UufaQ0RlTPep1UXZWa94nbczGGUx+6VIh/1qkcjaLqKPqevlSYsHeyg3V4xb 4FQMc7VvWSVDzuMglgD01IYfcECrX235HYTArXiql3omR+Aa216X0yud7VKulNojCa WDTxP01s19bHFCdmeI/q1BHVAVpWO1PjwbcET0J/9znllzN0TTBwh7WiaK6hNCbr2t geCDMMumUAFDJoyQdAyZOSXYqdBYDgEgAAAiSAHL+uVo1inIgzExsZ/YukqwA+bsew AS3DEUAWHkpqA== 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 4RwxfJ5ksWz4xQb; Thu, 28 Sep 2023 12:06:00 +1000 (AEST) Date: Thu, 28 Sep 2023 12:05:59 +1000 From: Stephen Rothwell To: Dave Airlie , Daniel Vetter Cc: Intel Graphics , DRI , Jacek Lawrynowicz , Karol Wachowski , 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: <20230928120559.485eecd7@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 autolearn=unavailable autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on groat.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 (groat.vger.email [0.0.0.0]); Wed, 27 Sep 2023 19:06:25 -0700 (PDT) X-getmail-retrieved-from-mailbox: INBOX X-GMAIL-THRID: 1778245218897592430 X-GMAIL-MSGID: 1778245218897592430 Hi all, Today's linux-next merge of the drm tree got a conflict in: drivers/accel/ivpu/ivpu_fw.c between commit: 645d694559ca ("accel/ivpu: Use cached buffers for FW loading") from the drm-misc-fixes tree and commit: 53d98420f5f9 ("accel/ivpu: Move ivpu_fw_load() to ivpu_fw_init()") 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_fw.c index 0191cf8e5964,d57e103aae1c..000000000000 --- a/drivers/accel/ivpu/ivpu_fw.c