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: 13109019 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from gabe.freedesktop.org (gabe.freedesktop.org [131.252.210.177]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.lore.kernel.org (Postfix) with ESMTPS id C7108C46467 for ; Fri, 20 Jan 2023 00:32:57 +0000 (UTC) Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id 84DD610E0BE; Fri, 20 Jan 2023 00:32:56 +0000 (UTC) Received: from gandalf.ozlabs.org (mail.ozlabs.org [IPv6:2404:9400:2221:ea00::3]) by gabe.freedesktop.org (Postfix) with ESMTPS id 98B3310E0BE; Fri, 20 Jan 2023 00:32:54 +0000 (UTC) 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 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-BeenThere: dri-devel@lists.freedesktop.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: Direct Rendering Infrastructure - Development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Krystian Pradzynski , Intel Graphics , Linux Kernel Mailing List , DRI , Linux Next Mailing List , Jacek Lawrynowicz Errors-To: dri-devel-bounces@lists.freedesktop.org Sender: "dri-devel" 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