Received: by 2002:ab2:6991:0:b0:1f7:f6c3:9cb1 with SMTP id v17csp782941lqo; Wed, 8 May 2024 15:05:11 -0700 (PDT) X-Forwarded-Encrypted: i=3; AJvYcCULO8gWmaUM0V0SHIoo/ZviLhuZXqGikyokuhmiyukViBsXwABuDkvqZyvnOr7U5csSuDa6EK9BRuMFGeTjHjs5UTefb4y4gi6jYcMPVw== X-Google-Smtp-Source: AGHT+IG38JFmaoknrYYy81/uXk032yUrMWDLHUKhmo8JFqNCP3R0Y1+EcsjJIPQdohxePFlr+KSO X-Received: by 2002:a50:9993:0:b0:56e:2ebc:5c4 with SMTP id 4fb4d7f45d1cf-5731d9db2f4mr2703596a12.20.1715205911614; Wed, 08 May 2024 15:05:11 -0700 (PDT) ARC-Seal: i=2; a=rsa-sha256; t=1715205911; cv=pass; d=google.com; s=arc-20160816; b=qNMb+8OluVgofIVJtGeANB+T6ZASxbod/HiROH8/5TehmrWRRKp2IloC+p2VUeUQER xHdBxP8YZbMbX8OLqGva5vRs8vuSQrz3AssaPKxwbrFbUb2E8N6J1zl7gKK6w/bVpQxl rqXwQu7cBgrKMUV9MmapZLRD0ObH9dN777TS6dN8V3C9BirrTy5psC2Tzedvggma4MVT kiNMywo5Mub3T19E8da3Ob6nXFa8nRb78SVbbCFj6VG2iusgdYXQBV8u1Iwcx1n8LsLS KBu+TfwJqX3XSlVzykMPTKsbnw5l3NP+k7MRowDVTWGFlTHovV5jc9rXkHz8raWkgnuo Ji6A== ARC-Message-Signature: i=2; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=in-reply-to:content-disposition:mime-version:list-unsubscribe :list-subscribe:list-id:precedence:references:message-id:subject:cc :to:from:date:dkim-signature; bh=5ypHmjNsTrYNX0vfbc84/6O6MkoCV0OFM+TJ+Bn/Er0=; fh=hTa52UIL6xVpXvq2ABCha+x7VSjE9wUm0COUoc48ebQ=; b=SMcbnQePDLqSTK5VASviWeK3CL6nPWR1cK/OpeSMd35zsS+5VX2QbRkhdLZ2s0odCX IkqM7uvoWiScCB5P9QEUtk5Lze/tvAEvlfZjleyUxOoru97n9e//UF8MfOSc5OfEByKO dhq5YoPgWBT8KQKrQeGaeGqgKnGlKjI56U6veFLq/b1pyYhAnnKCtNWhNF7Mqo/Lbi0/ AeMRns+GTp//TOIV+gRz8PFE8vM0f6Mk3Hhhf6i0G4guLUwx118l5iGD1fvcaAON9fRr ZzvvxL7ytTkHfcFnfSd1LWjrYL+Srx9kn0AjOXUw+y7Q3vsnyDRREZ3PNn4jdO5lHc4G XYSw==; dara=google.com ARC-Authentication-Results: i=2; mx.google.com; dkim=pass header.i=@mit.edu header.s=outgoing header.b=SGXSUbsf; arc=pass (i=1 spf=pass spfdomain=mit.edu dkim=pass dkdomain=mit.edu dmarc=pass fromdomain=mit.edu); spf=pass (google.com: domain of linux-kernel+bounces-173877-linux.lists.archive=gmail.com@vger.kernel.org designates 147.75.80.249 as permitted sender) smtp.mailfrom="linux-kernel+bounces-173877-linux.lists.archive=gmail.com@vger.kernel.org"; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=mit.edu Return-Path: Received: from am.mirrors.kernel.org (am.mirrors.kernel.org. [147.75.80.249]) by mx.google.com with ESMTPS id 4fb4d7f45d1cf-5733beaccfdsi41420a12.112.2024.05.08.15.05.11 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 08 May 2024 15:05:11 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel+bounces-173877-linux.lists.archive=gmail.com@vger.kernel.org designates 147.75.80.249 as permitted sender) client-ip=147.75.80.249; Authentication-Results: mx.google.com; dkim=pass header.i=@mit.edu header.s=outgoing header.b=SGXSUbsf; arc=pass (i=1 spf=pass spfdomain=mit.edu dkim=pass dkdomain=mit.edu dmarc=pass fromdomain=mit.edu); spf=pass (google.com: domain of linux-kernel+bounces-173877-linux.lists.archive=gmail.com@vger.kernel.org designates 147.75.80.249 as permitted sender) smtp.mailfrom="linux-kernel+bounces-173877-linux.lists.archive=gmail.com@vger.kernel.org"; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=mit.edu Received: from smtp.subspace.kernel.org (wormhole.subspace.kernel.org [52.25.139.140]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by am.mirrors.kernel.org (Postfix) with ESMTPS id 588261F236B3 for ; Wed, 8 May 2024 22:05:11 +0000 (UTC) Received: from localhost.localdomain (localhost.localdomain [127.0.0.1]) by smtp.subspace.kernel.org (Postfix) with ESMTP id 65E8D132C16; Wed, 8 May 2024 22:05:05 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=mit.edu header.i=@mit.edu header.b="SGXSUbsf" Received: from outgoing.mit.edu (outgoing-auth-1.mit.edu [18.9.28.11]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 5E507823B8 for ; Wed, 8 May 2024 22:05:01 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=18.9.28.11 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1715205904; cv=none; b=L1df7/7uxEfWChcPFdDrnJOugGkyU9s6/Q6NVtNhxxVTOR8tDw9h/hijGBUfYc4w5fSa/2VGeNiiH1pIUxb5jqwcTSHyRo+X2+3LI4gHdclZhrSDO5W9RHdqMzglVO/EpuhE1Wl84GHBMqm6ZqSUKqzqLgvdfp5XroA6MdVUa9s= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1715205904; c=relaxed/simple; bh=KABPgwE0pigLe/stqXFpNZgiPsJrHsm9MvrMXNC+AZ8=; h=Date:From:To:Cc:Subject:Message-ID:References:MIME-Version: Content-Type:Content-Disposition:In-Reply-To; b=hhHTlCJLq4JIQk7mYSB04/6LWRkbXaMuuQ0skfYvOBSXJYOlqRP/N9nWvKtG03TZh9H83pVg24PPNo0qYC0BQK7wYeCb9rSVCbEmXFzAgYCNE0lWtLV0ky9ee40p59FRH1vjOAg+Tk8uzDHaSeRiykPAWinInvCmvvPsHC1E9uI= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=mit.edu; spf=pass smtp.mailfrom=mit.edu; dkim=pass (2048-bit key) header.d=mit.edu header.i=@mit.edu header.b=SGXSUbsf; arc=none smtp.client-ip=18.9.28.11 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=mit.edu Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=mit.edu Received: from cwcc.thunk.org (pool-173-48-113-2.bstnma.fios.verizon.net [173.48.113.2]) (authenticated bits=0) (User authenticated as tytso@ATHENA.MIT.EDU) by outgoing.mit.edu (8.14.7/8.12.4) with ESMTP id 448M4Yxu009182 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT); Wed, 8 May 2024 18:04:38 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=mit.edu; s=outgoing; t=1715205879; bh=5ypHmjNsTrYNX0vfbc84/6O6MkoCV0OFM+TJ+Bn/Er0=; h=Date:From:Subject:Message-ID:MIME-Version:Content-Type; b=SGXSUbsfAWX9PZBN1Wmhw91h8AkspLeppUe2ntzmH7dlA4tjEx2P94eB0V3yxokdb lOLNEjIX73PsnmkM+olEPKEVl88ESylJ07cbUQJClm/x6l7dQQCrZkNnvJgtHLiXpx suKeE8ad4Z8+x9pzxdivKhGyI6ngbIPLvtNYTsX6uIOKSWQPTIyptkisjJJ/bUuwYa iAZBexG8CiWuch6KyVa225eByWszagaohwByLaPi5xdmKQCJXVcRHi2aPnUkVS4pnc 8kWf5cWTx4mPdg5Z2FK8MbuKPMTrfecaXkRCpQ5IxIrj4UlZHNUtVByTm6hrT/OmsO KW0LCCI6NPU0Q== Received: by cwcc.thunk.org (Postfix, from userid 15806) id 80CF015C026D; Wed, 08 May 2024 18:04:34 -0400 (EDT) Date: Wed, 8 May 2024 18:04:34 -0400 From: "Theodore Ts'o" To: Stephen Rothwell Cc: Christoph Hellwig , Christian Brauner , Linux Kernel Mailing List , Linux Next Mailing List , "Ritesh Harjani (IBM)" Subject: Re: linux-next: manual merge of the vfs-brauner tree with the ext4 tree Message-ID: <20240508220434.GA3620298@mit.edu> References: <20240508103436.589bb440@canb.auug.org.au> <20240508064700.GB10736@lst.de> <20240508165953.67afc064@canb.auug.org.au> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <20240508165953.67afc064@canb.auug.org.au> On Wed, May 08, 2024 at 04:59:53PM +1000, Stephen Rothwell wrote: > On Wed, 8 May 2024 08:47:00 +0200 Christoph Hellwig wrote: > > > > Ted, if you still can maybe just drop the ext4 patch for now? I can > > redo it for next merge window with the moved flag. > > If the resolution I did is fine, I am sure Linus will cope (but worth > mentioning it to him in the pull request). Its a simple enough conflict. I agree... but at the same time, the patch in question is a cleanup and there's not a lot of downside in dropping this for a cycle. Cristoph, is that right? Will not taking this cleanup block anything that you were hoping to land this cycle? I'm fine either way with either asking Linus to fix up the merge, or dropping it and picking it up later. In fact, I'd be fine just simply landing this post -rc1. So what do people think? Again, I don't have strong opinions one way or another. - Ted