Received: by 2002:a05:6358:53a8:b0:117:f937:c515 with SMTP id z40csp482351rwe; Fri, 14 Apr 2023 06:00:35 -0700 (PDT) X-Google-Smtp-Source: AKy350YbQFSWYuK7jNgLKLZlOEcNyVkc2lmKNr8/Lx8qguq1Eus2lYVjbOcvDRckbMrAWG5Xmu5Z X-Received: by 2002:a17:90a:9d88:b0:247:3c8e:dc1f with SMTP id k8-20020a17090a9d8800b002473c8edc1fmr2252875pjp.19.1681477234022; Fri, 14 Apr 2023 06:00:34 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1681477234; cv=none; d=google.com; s=arc-20160816; b=vZIt7qvuxXjbWwzQOfawx7UNXkZKfNRbB/0rQvaOxJNPMA+04nedg1MBma3ogGPCdl lK7cV4F5UMsoegy6jYDgu8ANw4y518rZ2hbXn8r6DJr5v5hMgZHX2DOM+pliJyjkGzPC FnHYtWbQ5XzpK5SMjPajMRgxhw806+U699rklhfzbEAFJObupRofWIOFGgLXpMPpj/OB wQrcfnEJgSc+w/b0pfvMuoozFRPtVKSi29MbMJog0t9GTWJ9FA9yARfy817SYtuu62u3 +06Ox1uEAjk8TrEO61vXVGYBnKbiEQHoKEL50jk742XOeHSz6NOV5YnLnRU+TwlGrJKx JFGg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:content-transfer-encoding:mime-version :message-id:date:subject:cc:to:from:dkim-signature; bh=XzqkzZC23E5goZMJDCFCBngD4R2he5f0WAr0QLxWdfI=; b=PHNdZw288IQKQDs9shrzBUPXvf7+RRUrqkxX/RumWq79i/JNme8y0fLghYv3xDkxBs odT3WzQZRcUGHX3ns1A2mD+goGfq2QMfTE184apOlPMYjavQBn4wIQa/73hni/rryvD2 XkLy7PThje0/qyklWcuT5sp+apMl04VvSa2wbLfAmnPbjCKwuPO8kP7EzT8QH7VxeZfb 6Ws+ppBElasm7Arkfau7gaLF7Mlkw07qfjxOGZESgkPWwn2lJ6W6kwSzu3OPPwZbCWVA HLEq+E3x5laV6qEE50iCpxLDA9hq3R8VVxPQx6mZgBfiMuXUCNWe1GNIFqVHQAAXpH2c +MlQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@kernel.org header.s=k20201202 header.b="Eq/W4LJP"; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=kernel.org Return-Path: Received: from out1.vger.email (out1.vger.email. [2620:137:e000::1:20]) by mx.google.com with ESMTP id nh15-20020a17090b364f00b002369d39671fsi4514872pjb.160.2023.04.14.06.00.19; Fri, 14 Apr 2023 06:00:34 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) client-ip=2620:137:e000::1:20; Authentication-Results: mx.google.com; dkim=pass header.i=@kernel.org header.s=k20201202 header.b="Eq/W4LJP"; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S229992AbjDNM75 (ORCPT + 99 others); Fri, 14 Apr 2023 08:59:57 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:44512 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229752AbjDNM7y (ORCPT ); Fri, 14 Apr 2023 08:59:54 -0400 Received: from dfw.source.kernel.org (dfw.source.kernel.org [IPv6:2604:1380:4641:c500::1]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 87C97B470; Fri, 14 Apr 2023 05:59:21 -0700 (PDT) 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 9C36E637DB; 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 Cc: Andrew Morton , =?UTF-8?q?Christian=20K=C3=B6nig?= , "Kirill A . Shutemov" , Linux Kernel Mailing List , Linux Next Mailing List 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 Content-Transfer-Encoding: 8bit X-Spam-Status: No, score=-4.4 required=5.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,RCVD_IN_DNSWL_MED, SPF_HELO_NONE,SPF_PASS,T_SCC_BODY_TEXT_LINE autolearn=ham autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on lindbergh.monkeyblade.net Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org 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. diff --cc drivers/gpu/drm/ttm/ttm_pool.c index 4db3982057be8,dfce896c4baeb..0000000000000 --- a/drivers/gpu/drm/ttm/ttm_pool.c +++ b/drivers/gpu/drm/ttm/ttm_pool.c [Just the version in mm]