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 7A22CC6FD18 for ; Wed, 19 Apr 2023 16:32:34 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S233601AbjDSQcd (ORCPT ); Wed, 19 Apr 2023 12:32:33 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:41736 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S233366AbjDSQcb (ORCPT ); Wed, 19 Apr 2023 12:32:31 -0400 Received: from mail-ej1-x634.google.com (mail-ej1-x634.google.com [IPv6:2a00:1450:4864:20::634]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id EE5853C06 for ; Wed, 19 Apr 2023 09:32:23 -0700 (PDT) Received: by mail-ej1-x634.google.com with SMTP id a640c23a62f3a-94ea38c90ccso93216266b.1 for ; Wed, 19 Apr 2023 09:32:23 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=ffwll.ch; s=google; t=1681921942; x=1684513942; 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=vjXbDQrMTlMveGgpzjaxOqJ4MX3Zc3PuAQFculrIp90=; b=Bzjp+BeQnrAKzIJWTEfUAa+W3pdspTEwqQF0Pa3tbP0lt3pW+mEMdyjsxr7XKzQxxM mIrFsanjX96nzba8usxtgUNN+uUHN5AaScdGV3qyXuEIojvImSDkRl/zXstTSqiLG9qS 2jZ2SMzLHM11Ly9g09B0B0ONvetjkk3kMyy5Y= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1681921942; x=1684513942; 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=vjXbDQrMTlMveGgpzjaxOqJ4MX3Zc3PuAQFculrIp90=; b=TCHOJId67QRWMT11rPmxOJfYxWggZGd6EmK5UAOwpKnNKfM/8bp1NMNMdtVYD9k/BA fie+B1CJEULSU91QEZkLEwgEoqWxhEnS8vdZn7fEZJtUzj7uXlMdCjl++LUBiVKY33/i PhlZBT0C2Y4EJM7z1rWhuoKkXk40zXywBIztTCSf97ceYwvukJ4/YZUPYUcqCpfALDTs QnHIJRzltJJK7X0rPRqncYGiHpGS5d1Fy7u2qcbFd8t7qgaB3EnWcOGkCaJqsukmWM9b k3ufH8GVly0BM0sD0/w2B9nJMEn2UbQU3NxcKg/YGT0HX/9eam+Tos8lTfRXIalX9IlB cpTQ== X-Gm-Message-State: AAQBX9e5yb59B4j0bo4vwMTuhJWDI5CpQp5KDLaZJwwPXVnVwHFqrRRv 7sEawURgBz1l+93X0tJQz0Dp7w== X-Google-Smtp-Source: AKy350aENGpODhst1P2SnjiQJvzhoC9GSkVgTOh9e3yM/mzLGea3xasoYck5TN1My/5JEkEvmKDOSQ== X-Received: by 2002:a17:906:5d:b0:94e:d688:fc92 with SMTP id 29-20020a170906005d00b0094ed688fc92mr16825594ejg.0.1681921942431; Wed, 19 Apr 2023 09:32:22 -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 t16-20020a170906269000b00932ba722482sm9754722ejc.149.2023.04.19.09.32.21 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 19 Apr 2023 09:32:22 -0700 (PDT) Date: Wed, 19 Apr 2023 18:32:20 +0200 From: Daniel Vetter To: Nathan Chancellor Cc: Daniel Vetter , Mark Brown , Dave Airlie , 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: Nathan Chancellor , Mark Brown , Dave Airlie , 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> <8c90b4db-3075-4275-bea8-01f501b00885@sirena.org.uk> <20230419163011.GA1865368@dev-arch.thelio-3990X> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <20230419163011.GA1865368@dev-arch.thelio-3990X> X-Operating-System: Linux phenom 6.1.0-7-amd64 Precedence: bulk List-ID: X-Mailing-List: linux-next@vger.kernel.org On Wed, Apr 19, 2023 at 09:30:11AM -0700, Nathan Chancellor wrote: > On Wed, Apr 19, 2023 at 06:24:37PM +0200, Daniel Vetter wrote: > > On Tue, Apr 18, 2023 at 07:34:44PM +0100, Mark Brown wrote: > > > On Sun, Apr 16, 2023 at 09:58:50AM +0200, Daniel Vetter wrote: > > > > > > > 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? > > > > > > According to Nathan (CCed) there's still issues with the interaction > > > with the PowerPC tree. > > > > So this revert was supposed to fix this: 56e51681246e ("drm/ttm: revert > > "Reduce the number of used allocation orders for TTM pages"") > > > > If there's anything left then I need to chase that asap since the merge > > window will open soon. > > I think we are talking about two different issues here. My issue is not > a compilation failure, it is an incorrect merge resolution that is > happening in -next because of two independent changes in the drm and > powerpc tree, the thread below should have more information. > > https://lore.kernel.org/20230413184725.GA3183133@dev-arch.thelio-3990X/ > > I do not think this is something that either tree can solve > independently of each other, -next has to resolve the conflict correctly > (which is what I point out in the message above) and a note of it should > be passed along to Linus so it can be resolved correctly in mainline > when the time comes. Ah yes that's a different one. I think we have a note about this one already, but I'll double-check with Dave Airlie. -Daniel -- Daniel Vetter Software Engineer, Intel Corporation http://blog.ffwll.ch