From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mail-qt1-f171.google.com (mail-qt1-f171.google.com [209.85.160.171]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 1E65A3A9D96 for ; Mon, 9 Mar 2026 13:48:53 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.160.171 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1773064135; cv=none; b=EEuVnpzyefXGAfICwp9qNe5rF/RocIlNE6JTmAbFs8aCvjzZqWG/oRUbCCY5P/dmzTtTez+v7kyzqZVCUyx2H/C4vCZjNBAI2tCE5wLHiqA7ssaKM3ZagNAF0a0UU+Omu14GIAOQqg1wjRnXg46iWGcMXzHP8PoA+YtXxA1ktM0= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1773064135; c=relaxed/simple; bh=GSFXjUB+m390vt7Z3IvZQhfiMTYRluDhgK/zA2/rw6o=; h=Message-ID:Date:MIME-Version:Subject:From:To:Cc:References: In-Reply-To:Content-Type; b=RXr7/2qcxpQE5ICq8HT1Wn5ms5zpRmfTiLoViOUMK94XH99vrv+hBl98FusZ7O9MRyLXVpvDRodWmn6lsXO1GIe3ELwX9MpB0gTDpsJ+CwyH7foLhvk+RtJjEICFijjsCWOErSzwQzEX70+SqbR/9pKnZ3/oAW/SBjCAba28tqw= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dmarc=none (p=none dis=none) header.from=kernel.dk; spf=pass smtp.mailfrom=kernel.dk; dkim=pass (2048-bit key) header.d=kernel-dk.20230601.gappssmtp.com header.i=@kernel-dk.20230601.gappssmtp.com header.b=KSnSUTZx; arc=none smtp.client-ip=209.85.160.171 Authentication-Results: smtp.subspace.kernel.org; dmarc=none (p=none dis=none) header.from=kernel.dk Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=kernel.dk Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel-dk.20230601.gappssmtp.com header.i=@kernel-dk.20230601.gappssmtp.com header.b="KSnSUTZx" Received: by mail-qt1-f171.google.com with SMTP id d75a77b69052e-50919fc3a14so12453371cf.2 for ; Mon, 09 Mar 2026 06:48:53 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=kernel-dk.20230601.gappssmtp.com; s=20230601; t=1773064133; x=1773668933; darn=vger.kernel.org; h=content-transfer-encoding:in-reply-to:content-language:references :cc:to:from:subject:user-agent:mime-version:date:message-id:from:to :cc:subject:date:message-id:reply-to; bh=YsYlOiaNs1y5LexayiBUguDYXpzcPBMKJuX1K8m2N14=; b=KSnSUTZx5h+BBJ0rlHP+l8D3trvGOmOdq3QWdCk5JbHctqUObMQndcI/QpGCF0qxgb YbMfwBAqbAPU6IuRqr+2jg2Fz20V48/q4tVS78NR4dCtfuf5JQt4oaTnAI2XJKm6Tpu+ G2bBmEjxCfB26XCG65TFqOekmeru1fSMsneQl0gF0y/dPd8c1W0TYsj3o3+cXm8TyG/q gmFBcgwU3C4tuk6ZSapOfH+tOgaD7k0hY/fJbLcsfIK7t2xuOIaiclIYtSUThWojGamo FC0smmGGbgq7Ba/F9JEhNWuhgCqCVCqqVMp7PqOk3p+K2MrDSl2UqKAHxs/8UCiAPa1J i/kw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1773064133; x=1773668933; h=content-transfer-encoding:in-reply-to:content-language:references :cc:to:from:subject:user-agent:mime-version:date:message-id:x-gm-gg :x-gm-message-state:from:to:cc:subject:date:message-id:reply-to; bh=YsYlOiaNs1y5LexayiBUguDYXpzcPBMKJuX1K8m2N14=; b=Hf5Szz/UK0vhwyxOV/wRlEprFVnCimZwjMUL5/UGCJ+EEgkh5SwBu80g2ejrE1xXFB eAEEWN206kUUq9gSDz5OVYPwubA9LleTSDthqQp8FIQzu2ZC9yo25NKIFBdvbwAjTCox Ov5nZ+W1dxGP5w2z12idgBgxFYvukf8b9ARTA6/dIV+v/vMIlTxD9d6ZpV/EtXk141Qk DJ/W/KGEmx8WcnIgg4MfOvRnjdIMaEhnpWz9u6PPbSO7KpgLx7l04qbZ+x9LCj2axjtj /2nnV/Kxe5a7m1qZjjXycnvnXQDQuutfWdGEy83HxWwwkmEx/e1sHFEii0FWQME9yaWw oJeg== X-Forwarded-Encrypted: i=1; AJvYcCVrJGlWIWsn82g0h6CaI+GDZZ6KEFmsD1yYGU6e1/rBeGaIQSPuEItIF4Ca09icO8LicI+9C16s7pFJPHM=@vger.kernel.org X-Gm-Message-State: AOJu0Yxtn0eoiuLdCwRrr4m6c1K923hR5uQFgPVwcMYyjeEIshTJ6e4t x6mIJyAPI3IsrSrZKYXWVui0CF8TDUW6meWG1I3P+hdg2j17DrOwXUlndGtD95F7VoXmrugNXTY E4xl6ut4= X-Gm-Gg: ATEYQzzAqps9JFcEnlzKXcdoUgm3TtOz09CwQvQI7TG1AN7vh6K4htrLjteglpp+v5v D06+tWPgi+0T9tfhEz03mbNXJEdJBlfm6j7wZwlCVhH/oEi0UAtQUvxLTYcveC14/eeFpzaCJvN Wbb16xrSWdELFNJS/62VpfSo/3f21WUbe55+BHoax7noB7eBeOZCiCd1f85Ve/CxkLVa8OHow0h bLayEbUBHthUp3zBQi/HHANWfA1VE8Y8RWnPuwyILMyTouUKldEiUBtck79fm2bAf0ckfYWS5uf GyWkt1LO/7kQgZTVyIdH+0vJWRscOHv3BDAzwm/nhWjIJJN+Xi4QzOF97E839WsGYDMzPHekFpz EFNg6jlTW3R+zwJntyKlWPCl75YLRpB+yFPgNCf5Is89KO5dVFbLmn+7OLNzCemRtRPPNntZ1n7 Xdz41tKsWXm6yagu5T5ju+YoH0IJeXfQl+uJrbArKdS4DPf3xZBw== X-Received: by 2002:a05:622a:1a86:b0:509:d0a:564d with SMTP id d75a77b69052e-5090d0a6076mr85237281cf.54.1773064132737; Mon, 09 Mar 2026 06:48:52 -0700 (PDT) Received: from [172.19.0.48] ([99.196.133.212]) by smtp.gmail.com with ESMTPSA id d75a77b69052e-509177723e6sm23225241cf.0.2026.03.09.06.48.46 (version=TLS1_3 cipher=TLS_AES_128_GCM_SHA256 bits=128/128); Mon, 09 Mar 2026 06:48:52 -0700 (PDT) Message-ID: <1f9467c8-6982-498e-ba4b-7a16ccdb4dc2@kernel.dk> Date: Mon, 9 Mar 2026 07:48:41 -0600 Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 User-Agent: Mozilla Thunderbird Subject: Re: linux-next: manual merge of the block tree with the vfs-brauner tree From: Jens Axboe To: Christoph Hellwig , Keith Busch Cc: Mark Brown , Christian Brauner , Linux Kernel Mailing List , Linux Next Mailing List References: <20260305145428.GA17884@lst.de> <20260306142257.GA16612@lst.de> Content-Language: en-US In-Reply-To: Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 7bit On 3/9/26 7:45 AM, Jens Axboe wrote: > On 3/6/26 7:22 AM, Christoph Hellwig wrote: >> On Thu, Mar 05, 2026 at 10:34:02AM -0700, Keith Busch wrote: >>> Yeah, one of us should have to rebase to the other. Since mine is just a >>> single patch on the one colliding file, I think it easiest if I just >>> rebase my data alignment updates to the vfs integrity branch, then send >>> upstream through there. Let me know if there's an alternate preference. >> >> Yes, I think that would work best. >> >> Jens: is this okay with you? > > I think the mistake here is the fact that the integrity stuff got > ingested wholesale on the VFS side. That should've been split. So > why don't we redo that part? I stage the first 7 in a branch off > -rc1, Christian pulls those in, and stages the ntfs3/iomap/xfs > on top. That's how it should've been done so let's please just do > that now, rather than make an even bigger mess of this. Done: for-7.1/block-integrity then I can either drop Keith's patch from for-7.1/block (rebasing that tree), and then Keith can send a new one on top of for-7.1/block which can pull in the above branch as well. -- Jens Axboe