From patchwork Fri Jan 20 00:32:46 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Stephen Rothwell X-Patchwork-Id: 46077 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:adf:eb09:0:0:0:0:0 with SMTP id s9csp622662wrn; Thu, 19 Jan 2023 16:37:49 -0800 (PST) X-Google-Smtp-Source: AMrXdXuIHTax6EUGtKs+NsgFJpVCN3CyJSv75iYilziCOGcSmwk0Z7PzAT7EeooEkmtzp7EejrkQ X-Received: by 2002:a05:6a20:8b0f:b0:af:ac38:911a with SMTP id l15-20020a056a208b0f00b000afac38911amr12587035pzh.59.1674175068643; Thu, 19 Jan 2023 16:37:48 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1674175068; cv=none; d=google.com; s=arc-20160816; b=IUPO+yaalpmr87BrrXd5N+LmEN29wxdQM6CqyPhp05oOc4u323IBYk50d2wZKanArc 6lrXdh+3Y2E2TQ6Qv4sWqLz0GUHkm2lO4ukDAYa0Vdd7qkgyKq3yGCJmdCE04cVNA8h3 JrtyVoNxwasthu4w8rrRqT1a/pAFKEhLZNvxBCWIsXT5AoAodv6ZIaxnCgo98rhvf4ha sgISR00Cr0sSkx1v/bU4wMTbqWuWdFCTlhr/4oWGrvAI4H+cuTgSz9H+39BnsDOMe0/3 5bsjHlgb3RhZFvo/MZdcmvI1aH3UIHDwAs4z7eDAjbsQCeJML7P6EXSS4wqHcwTc6gzz 4Ytg== 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=iozW0jdRdMl3BAmRM1JsaFrEz8h8JaFEk5HzgDL0ZGw=; b=oEI2KJ5IZ81Nk30u2NAcLf3LHCkZBbh0eWyRjEEdcPi3TC6IlXvRs7FgbVIpfV1pdv 8mkok0QDmcY9bLwrcKUl1kERQTIz6yA9uI6DL9adbulsx4gG24I9Oo31u5qMJcb7mfrl U7QUknHyM5NmMJzdx23jlcMCFtUtseEQLs0QVMRl+rCVYIS6wy65mHCATGNPSQDAhiLX F2njAhWSScexBglwWA8DIo9j6Wm9QNwO7cjt+hTMiHAaSdll2EMm+9BrY0isTBrUUT9N 8VjEjVVhl/dD0RrgT31G51+7E5MA0BQDMMFztx2NDc30GAQ/U0Mr+6ExdTx+n9531TU8 X4rA== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@canb.auug.org.au header.s=201702 header.b=tEQK60aF; 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 Received: from out1.vger.email (out1.vger.email. [2620:137:e000::1:20]) by mx.google.com with ESMTP id s80-20020a632c53000000b00497e31916e1si40480144pgs.144.2023.01.19.16.37.36; Thu, 19 Jan 2023 16:37:48 -0800 (PST) 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=tEQK60aF; 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 Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S229493AbjATAdh (ORCPT + 99 others); Thu, 19 Jan 2023 19:33:37 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:42718 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229463AbjATAd3 (ORCPT ); Thu, 19 Jan 2023 19:33:29 -0500 Received: from gandalf.ozlabs.org (gandalf.ozlabs.org [150.107.74.76]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 9188BA5003; Thu, 19 Jan 2023 16:33:03 -0800 (PST) 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 (P-256) server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by mail.ozlabs.org (Postfix) with ESMTPSA id 4NygSb66w1z4xGM; Fri, 20 Jan 2023 11:32:47 +1100 (AEDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=canb.auug.org.au; s=201702; t=1674174769; bh=iozW0jdRdMl3BAmRM1JsaFrEz8h8JaFEk5HzgDL0ZGw=; h=Date:From:To:Cc:Subject:From; b=tEQK60aFpxxXeqmUdoO6X/YeFIU+epTWoi6S4ldcIob6W/gf8cgVvQlhd6f6YTjLM 44nZEwPZXrcMagiBSbNHtT3P3UXh2o7BSD2VzubO1tPdqhK5U9QwbFiIwUejX19mTT ykA+P2pk+VrA6MxwMirb2ru4E3APNO4BsQTFRFwPYtUg9UQ5czHO8T4ZuOVKlU0Z1T lzziv0tOjttzIxm2ZdgEaDhPpcWcNwQakxtDYsExcCVLUbVExfkdkMznuXhTDJFwdZ jWZcYR0J45V+jPMvikRIe3PRXJDmQFMDc3jpYxOu7fk5RCf7Cs1BE4qXKiQG0rYRPb 3NBnBEHeOorFg== Date: Fri, 20 Jan 2023 11:32:46 +1100 From: Stephen Rothwell To: Oded Gabbay , Daniel Vetter Cc: Intel Graphics , DRI , Jacek Lawrynowicz , Krystian Pradzynski , Linux Kernel Mailing List , Linux Next Mailing List Subject: linux-next: manual merge of the accel tree with the drm-misc tree Message-ID: <20230120113246.1a0a03fe@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 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: =?utf-8?q?INBOX?= X-GMAIL-THRID: =?utf-8?q?1755499796698068565?= X-GMAIL-MSGID: =?utf-8?q?1755499796698068565?= Hi all, Today's linux-next merge of the accel tree got conflicts in: drivers/Makefile drivers/accel/Kconfig drivers/accel/Makefile between commit: 35b137630f08 ("accel/ivpu: Introduce a new DRM driver for Intel VPU") from the drm-misc tree and commit: 45886b6fa0f1 ("habanalabs: move driver to accel subsystem") from the accel tree. I fixed it up (I used the latter version of Makefile and 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/Kconfig index 4989376e5938,a5989b55178a..000000000000 --- a/drivers/accel/Kconfig diff --cc drivers/accel/Makefile index b1036dbc0ba4,4df38885d6c6..000000000000 --- a/drivers/accel/Makefile