From patchwork Mon Jan 1 23:52:23 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Stephen Rothwell X-Patchwork-Id: 13508735 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 C643AC4706F for ; Mon, 1 Jan 2024 23:52:34 +0000 (UTC) Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id E791910E091; Mon, 1 Jan 2024 23:52:33 +0000 (UTC) Received: from gandalf.ozlabs.org (mail.ozlabs.org [IPv6:2404:9400:2221:ea00::3]) by gabe.freedesktop.org (Postfix) with ESMTPS id 4E3AB10E091 for ; Mon, 1 Jan 2024 23:52:32 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=canb.auug.org.au; s=201702; t=1704153147; bh=fT41D17aS053xSaBSdZ3kdXTNCwLSGWr3ETa4koZxS8=; h=Date:From:To:Cc:Subject:From; b=P8mvohA+p/ebDhIvw/T9nlWkUTd4qKsZrS1kZ9xSZHdCPrD2x8VU2+Y2ULHn3xIS7 5RZRSn0M7HvtfLGubOmmZEntUqUwtg3IIDSgPZhbQBKxCkRgomKYRlpuDMil2EWRsy KZ6++jVYDmBN7kfBA5s3pHnVMQTgC79zU4UUlrLh71Wc9DU4TFwZCN5Znb3DmTkiyj 8tLf8LNIS2KxQdPH/Q8MgQpMNJ6JBN1UNQW1N5aUfG4nqQ0p8prZHrHQsKB+4B/drI TZE/qIQM2qoimJfB6TZShNhxJeFqBpBGmu5203dgW484W0rvzQjm5aV1DBiqmQSa6d siM3uTWu4yLXw== 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) (No client certificate requested) by mail.ozlabs.org (Postfix) with ESMTPSA id 4T3t7s510tz4wny; Tue, 2 Jan 2024 10:52:25 +1100 (AEDT) Date: Tue, 2 Jan 2024 10:52:23 +1100 From: Stephen Rothwell To: Dave Airlie , Andrew Morton Subject: linux-next: manual merge of the drm tree with the mm tree Message-ID: <20240102105223.7634699d@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: Linux Next Mailing List , Jeffrey Hugo , "Kirill A. Shutemov" , DRI , Linux Kernel Mailing List Errors-To: dri-devel-bounces@lists.freedesktop.org Sender: "dri-devel" Hi all, Today's linux-next merge of the drm tree got a conflict in: drivers/accel/qaic/qaic_data.c between commit: 78f5d33f3dd4 ("mm, treewide: rename MAX_ORDER to MAX_PAGE_ORDER") from the mm tree and commit: 47fbee5f27ed ("accel/qaic: Update MAX_ORDER use to be inclusive") 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/qaic/qaic_data.c index 24e886f857d5,cf2898eda7ae..000000000000 --- a/drivers/accel/qaic/qaic_data.c