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 232A8C77B72 for ; Sun, 16 Apr 2023 07:58:58 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S230327AbjDPH65 (ORCPT ); Sun, 16 Apr 2023 03:58:57 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:46250 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S230305AbjDPH64 (ORCPT ); Sun, 16 Apr 2023 03:58:56 -0400 Received: from mail-ed1-x534.google.com (mail-ed1-x534.google.com [IPv6:2a00:1450:4864:20::534]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 1D648171C for ; Sun, 16 Apr 2023 00:58:54 -0700 (PDT) Received: by mail-ed1-x534.google.com with SMTP id 4fb4d7f45d1cf-505050c7217so516436a12.0 for ; Sun, 16 Apr 2023 00:58:54 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=ffwll.ch; s=google; t=1681631932; x=1684223932; h=in-reply-to:content-disposition:mime-version:references :mail-followup-to:message-id:subject:cc:to:from:date:from:to:cc :subject:date:message-id:reply-to; bh=Pi4LPZudUdSoCu6KWlPIQF+AbKkt6/8uc15eezFygLc=; b=gbaZCiFMGCe9loT30w7umP+CThUXjdVCEFxcRwI+N4fbyxQnNz+xwoGwm5mgVOdu4T 0pJglngxJ/TBDuzi0RrtYA5Z1DhQCluhT4KEv2B/LE+/OgkFxjxZW2EDT3yLOuiideIh Pbl/s9xnH9h1rnUzbHIB86dLG8OOcdaCzJOHg= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1681631932; x=1684223932; h=in-reply-to:content-disposition:mime-version:references :mail-followup-to:message-id:subject:cc:to:from:date :x-gm-message-state:from:to:cc:subject:date:message-id:reply-to; bh=Pi4LPZudUdSoCu6KWlPIQF+AbKkt6/8uc15eezFygLc=; b=U8kMByltV+nv7Y5BsSomIZcpSG16P4uxNgI/cE2nfPrssMK/5y4hzaVvPCdRV6ZL8k +5UYc8DD2eK2Q+6LpteiyLbPkv12cXEKykzT/Yyx9ktGLzDpLKxrsURq9p4NsPW9D14y YFun1plx1dllLaaXRzLLiTSrVwyQTW9+En69lV3SJKp71LGoztXRnTMRXCLkA/Jw86V9 TOeRgG6ElKgDS+6lx5PkCje4lp9u951v5xzavG9SkrIpwTqRWuNCiUuM0/m+a54Ji0vX mfnmSaHAOSPP5r0k1bNWGIWH8n4aZGlW3dHGRMQncHGQGL00ZC8a9K9MhiWCeMHFfJTd kSOg== X-Gm-Message-State: AAQBX9cN+jDgOWuovKfngdmyoZojJOCHu4wMkSTH4E333PL2NUp9h+NH tlEYHhoxJ291Szk3pupgZhaz0Q== X-Google-Smtp-Source: AKy350bGuHVE6drEP2IMOElAil6tvl9C8/Gdd1sqZMHmULsjuwzXyNFK0kGZyhHfzLj0CpCrxIeamw== X-Received: by 2002:a05:6402:5253:b0:502:92d:4f50 with SMTP id t19-20020a056402525300b00502092d4f50mr7819327edd.1.1681631932504; Sun, 16 Apr 2023 00:58:52 -0700 (PDT) Received: from phenom.ffwll.local (212-51-149-33.fiber7.init7.net. [212.51.149.33]) by smtp.gmail.com with ESMTPSA id j23-20020aa7de97000000b0050432d2b443sm4307664edv.48.2023.04.16.00.58.51 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 16 Apr 2023 00:58:52 -0700 (PDT) Date: Sun, 16 Apr 2023 09:58:50 +0200 From: Daniel Vetter To: broonie@kernel.org Cc: Daniel Vetter , Intel Graphics , DRI , Andrew Morton , Christian =?iso-8859-1?Q?K=F6nig?= , "Kirill A . Shutemov" , Linux Kernel Mailing List , Linux Next Mailing List Subject: Re: linux-next: manual merge of the drm-misc tree with the mm-stable tree Message-ID: Mail-Followup-To: broonie@kernel.org, Intel Graphics , DRI , Andrew Morton , Christian =?iso-8859-1?Q?K=F6nig?= , "Kirill A . Shutemov" , Linux Kernel Mailing List , Linux Next Mailing List References: <20230414125913.851920-1-broonie@kernel.org> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <20230414125913.851920-1-broonie@kernel.org> X-Operating-System: Linux phenom 6.1.0-7-amd64 Precedence: bulk List-ID: X-Mailing-List: linux-next@vger.kernel.org On Fri, Apr 14, 2023 at 01:59:12PM +0100, broonie@kernel.org wrote: > 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] Note there was a ppc compile fail, which is why we pushed the ttm revert. That /should/ be fixed now, but would be good if you can confirm? Thanks, Daniel -- Daniel Vetter Software Engineer, Intel Corporation http://blog.ffwll.ch