From mboxrd@z Thu Jan 1 00:00:00 1970 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 vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id 569A2C77B61 for ; Tue, 11 Apr 2023 02:24:44 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S229785AbjDKCYn (ORCPT ); Mon, 10 Apr 2023 22:24:43 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:59352 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229571AbjDKCYl (ORCPT ); Mon, 10 Apr 2023 22:24:41 -0400 Received: from gandalf.ozlabs.org (gandalf.ozlabs.org [150.107.74.76]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 57FFF26AC; Mon, 10 Apr 2023 19:24:38 -0700 (PDT) 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 4PwV6C3L5Xz4x84; Tue, 11 Apr 2023 12:24:35 +1000 (AEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=canb.auug.org.au; s=201702; t=1681179876; bh=Tm3RwaWe4McpI5/vEhrd2G7tKXDeJ9T+zUbSJ25a6DM=; h=Date:From:To:Cc:Subject:From; b=PWTSwz/e0TOsNFgbGUT9G6LKOqfsCACJ/o8UjKUrx1wCTzwos9bgBgjG9JQQMh5my XsWnZwUZ7tijO3GpvXLqWvGPOKO2jgeor1hxsg7MoN+GYEgYEoh6WHtkYNihntN0l0 YkUf475czrISZkSZJv7rrjLXoBOEdhEUpHABQnS/CH42B7Z1XZyQWGFkFN/I7QwCGv sPwj3sxsYOvPSdoQN0uusSfL95RK4dw+ZdUFdEKFVLGKkZsnE79QPhpZrhrtFZAR6u TsgJutx4tWLFhTeT985rQNF671B+l8O3NsxMjSqPxmgsUgcrCZCP7cVFQVedPPrrR1 dhqcEV6fn/A5g== Date: Tue, 11 Apr 2023 12:24:32 +1000 From: Stephen Rothwell To: Dave Airlie , Andrew Morton Cc: DRI , "Kirill A. Shutemov" , Linux Kernel Mailing List , Linux Next Mailing List , Thomas =?UTF-8?B?SGVsbHN0csO2bQ==?= Subject: linux-next: manual merge of the drm tree with the mm-stable tree Message-ID: <20230411122432.1d2b3ccb@canb.auug.org.au> MIME-Version: 1.0 Content-Type: multipart/signed; boundary="Sig_/B9uPXz1BZw3.PqgdhoFlJ0u"; protocol="application/pgp-signature"; micalg=pgp-sha256 Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org --Sig_/B9uPXz1BZw3.PqgdhoFlJ0u Content-Type: text/plain; charset=US-ASCII Content-Transfer-Encoding: quoted-printable Hi all, Today's linux-next merge of the drm tree got a conflict in: drivers/gpu/drm/ttm/ttm_pool.c between commit: 23baf831a32c ("mm, treewide: redefine MAX_ORDER sanely") from the mm-stable tree and commit: 322458c2bb1a ("drm/ttm: Reduce the number of used allocation orders for T= TM pages") from the drm tree. I fixed it up (I just used the latter version - though I may have missed something) 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. --=20 Cheers, Stephen Rothwell --Sig_/B9uPXz1BZw3.PqgdhoFlJ0u Content-Type: application/pgp-signature Content-Description: OpenPGP digital signature -----BEGIN PGP SIGNATURE----- iQEzBAEBCAAdFiEENIC96giZ81tWdLgKAVBC80lX0GwFAmQ0xOAACgkQAVBC80lX 0GzuCgf/U3h7H0zq5aXOOPwZqA+fKakw+tdI8bVp32J0CGVkv5pP5mR7/l6vOjql DWpqnZlPp3/uCm+AJdtVTBzaxUf5jpGmZnh78KFuwvCMu5uxJv9tR28vzXjP7/fA 3+tFMq5UitpgUJW6ku6ENPdA5v957ukFl1MOLcyVH04Qs+/r+vSjvSGMSFhLfXfa uZs+qNd3i58ixZVWQ/Hoz5A5yrAMjBAbw/eoKtwLTwF4L/79Mf2Sd1eUynNVu6Ca T7ciwltpvUIZhnnt5ZKeYoNZ0J2jD6KR1YulIBMDMw1NIiESPw1IVFtZLYI5m/ie e2g1XCUwy8A9WVIhUuwj92ew8mtshw== =Iyp2 -----END PGP SIGNATURE----- --Sig_/B9uPXz1BZw3.PqgdhoFlJ0u--