From patchwork Wed Apr 9 00:46:18 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Stephen Rothwell X-Patchwork-Id: 14043904 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 896DBC369A4 for ; Wed, 9 Apr 2025 00:46:37 +0000 (UTC) Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id 8170710E7AA; Wed, 9 Apr 2025 00:46:34 +0000 (UTC) Authentication-Results: gabe.freedesktop.org; dkim=pass (2048-bit key; secure) header.d=canb.auug.org.au header.i=@canb.auug.org.au header.b="GVs/iIyO"; dkim-atps=neutral Received: from mail.ozlabs.org (gandalf.ozlabs.org [150.107.74.76]) by gabe.freedesktop.org (Postfix) with ESMTPS id D30E010E7A9; Wed, 9 Apr 2025 00:46:28 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=canb.auug.org.au; s=202503; t=1744159580; bh=fj4z+jwqUz9HAkrp3iXCm4kGifaxbWJ+n8E7OIJrNTg=; h=Date:From:To:Cc:Subject:From; b=GVs/iIyOhOEWBjz5ExtZd4IasR1JkT8R/gCQdsUGwKlin6hZSq9Icrkp5fAgTtLqZ n0rRjlZRdqtkL1OzHEz8vlzfN6WcQBzbyq57c9rs3Uu7hxrdagASkAtmP4OmTzvSgH lt3uP/oEUASpzvsEY5fnK3lp/YFfDbRCtwXGXOjDxN57BElv/m72aphJXK5Mx86xFg StnQ63YUB1Ru3O1QQHO60cn4OCyErDnqzNywNU6oIzPAPLW0J5ycZOn1ItKxpqSz2K TqOODcOswJhftEr1svTCIbwe7eB/hTQ2xt7pijVykFKNSQmKOs5h/7pTPZceS0XkY9 vDLSt/7KkqvAw== 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) (Client did not present a certificate) by mail.ozlabs.org (Postfix) with ESMTPSA id 4ZXPQN0qRcz4wbv; Wed, 9 Apr 2025 10:46:19 +1000 (AEST) Date: Wed, 9 Apr 2025 10:46:18 +1000 From: Stephen Rothwell To: Simona Vetter Cc: Intel Graphics , DRI , Linux Kernel Mailing List , Linux Next Mailing List , Maxime Ripard Subject: linux-next: manual merge of the drm-misc tree with the drm-misc-fixes tree Message-ID: <20250409104618.55387b4b@canb.auug.org.au> MIME-Version: 1.0 X-BeenThere: intel-gfx@lists.freedesktop.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: Intel graphics driver community testing & development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: intel-gfx-bounces@lists.freedesktop.org Sender: "Intel-gfx" Hi all, Today's linux-next merge of the drm-misc tree got a conflict in: include/drm/drm_kunit_helpers.h between commit: 13c1d5f3a7fa ("drm/tests: helpers: Create kunit helper to destroy a drm_display_mode") from the drm-misc-fixes tree and commit: e4e3de631d14 ("drm/tests: helpers: Create new helper to enable output") from the drm-misc 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 include/drm/drm_kunit_helpers.h index 1c62d1d4458c,1cda7281f300..000000000000 --- a/include/drm/drm_kunit_helpers.h