From patchwork Fri Apr 14 12:59:12 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Mark Brown X-Patchwork-Id: 13211471 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 090D0C77B72 for ; Fri, 14 Apr 2023 12:59:25 +0000 (UTC) Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id C190C10E170; Fri, 14 Apr 2023 12:59:23 +0000 (UTC) Received: from dfw.source.kernel.org (dfw.source.kernel.org [IPv6:2604:1380:4641:c500::1]) by gabe.freedesktop.org (Postfix) with ESMTPS id DE0B410E150; Fri, 14 Apr 2023 12:59:21 +0000 (UTC) Received: from smtp.kernel.org (relay.kernel.org [52.25.139.140]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by dfw.source.kernel.org (Postfix) with ESMTPS id 978F2637D8; Fri, 14 Apr 2023 12:59:19 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id 3FCE8C433D2; Fri, 14 Apr 2023 12:59:17 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1681477159; bh=BaN8i5TpFQuSHnQB44TUL3cxmY9lLmJo2EoDj/fQwSE=; h=From:To:Cc:Subject:Date:From; b=Eq/W4LJPPzfaEzWEHTg4TSccaMQdALsmfcK1HXCq/iuCFTsaOVxUFZMMlBB1fGxNT J5HyWmj1v+169ian2toHXF5acIcX/fa9FLOjUuI5Kw++vHqXe4JGabJeOi+WzHWeFW V7IQWentx/iEPehmjiJljw+UwVPexVHuYMhfePz8VlrZ7ePJT/+lzx+3cOYN63vw2Y PyMh2V5j0a3kHh3j5QHN+R91kEdnAPhe7mxQC5HVqLImWxkHk/Ixl+W2DEV12U+lXg oTY0rWCap2wi2DKCsdSF4IrbsgMifBTi7TOOmNJNCVbUhz/rcmDF68kL7P3+4Kpdkl LiJYE4GP7x10w== From: broonie@kernel.org To: Daniel Vetter , Intel Graphics , DRI Subject: linux-next: manual merge of the drm-misc tree with the mm-stable tree Date: Fri, 14 Apr 2023 13:59:12 +0100 Message-Id: <20230414125913.851920-1-broonie@kernel.org> X-Mailer: git-send-email 2.30.2 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: Andrew Morton , Linux Next Mailing List , =?utf-8?q?Christian_K?= =?utf-8?q?=C3=B6nig?= , "Kirill A . Shutemov" , 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-misc tree got a conflict in: drivers/gpu/drm/ttm/ttm_pool.c between commit: 23baf831a32c0 ("mm, treewide: redefine MAX_ORDER sanely") from the mm-stable tree and commit: 56e51681246e5 ("drm/ttm: revert "Reduce the number of used allocation orders for TTM pages"") 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. +++ b/drivers/gpu/drm/ttm/ttm_pool.c [Just the version in mm] diff --cc drivers/gpu/drm/ttm/ttm_pool.c index 4db3982057be8,dfce896c4baeb..0000000000000 --- a/drivers/gpu/drm/ttm/ttm_pool.c