From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mail-qk1-f172.google.com (mail-qk1-f172.google.com [209.85.222.172]) (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 4C3BC3B531B for ; Mon, 9 Mar 2026 13:45:38 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.222.172 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1773063940; cv=none; b=oWvnYVx3Pi1c/8OUqXtWvjKUMSqX8I3e/RCjJHOTMkD6kvQumZB6sEdOeZFC9GRuEB0RlU+KyLYpjIx5gMCApPAE0bygJKjLCkD8bLZzdPjAwuDifLqt0NezVcPwTwMMxiz7YBQZ7T49UFlTPlY5RXpC0ct9+RYYC55r18ff/iU= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1773063940; c=relaxed/simple; bh=uddqbxl+vm4INHVDsFZDsfOhahpG3Eg12WAFVmI6R5w=; h=Message-ID:Date:MIME-Version:Subject:To:Cc:References:From: In-Reply-To:Content-Type; b=lS/RPYQ4N5fewrrQCQyRXxnYmu5rsyAfwpBV63WwLRyIDBLryXyHmXRNTm4na1X4KSjrN6Tn960cZ0izwmM6HHIo8CU+Ezm53PHBhDRUZniJFNMtAPa2O4EBKcfWd2bOE69M67ivOIPZHWaXkpBYyy3+m+Im3OFD11t61iH/fOs= 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=DHm4m0LH; arc=none smtp.client-ip=209.85.222.172 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="DHm4m0LH" Received: by mail-qk1-f172.google.com with SMTP id af79cd13be357-8cd7a75c680so164918785a.1 for ; Mon, 09 Mar 2026 06:45:38 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=kernel-dk.20230601.gappssmtp.com; s=20230601; t=1773063937; x=1773668737; darn=vger.kernel.org; h=content-transfer-encoding:in-reply-to:from:content-language :references:cc:to:subject:user-agent:mime-version:date:message-id :from:to:cc:subject:date:message-id:reply-to; bh=/Uw8s+Lr/i/CCt0GHJ4/G9MAiFOqPy0SXBt0sEu4lXE=; b=DHm4m0LHBVZmvmjAWxaZ2Fvb5gyxKspySCOsxsDuh34DMi8gng88dxJ/rek6VWUhlV huODpjPVIhVaRucCVbwTTxlG7vS0NEL+ocncsBm1a/JXN8DH1kgwivrnlUZtdEZViVnQ MgS19b575+AhLtWTh/hr4W6wg47klwxhkX1hDbuWBMBtviJY+AvAET5K/HgDhJt/IL71 k3merj5MqOgBCxpDTHscbWREv8DbBhmr6rZ4YmumaOw5NaYUQxX4rzmVhs5qwj0OVmL9 +vytZY3kGvx7t3zl7k3r0DKeYN5q3bKvKb1vJDYvdVYJMJ0YgmukP1pEfmN8vsYHbViC wptg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1773063937; x=1773668737; h=content-transfer-encoding:in-reply-to:from:content-language :references:cc:to: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=/Uw8s+Lr/i/CCt0GHJ4/G9MAiFOqPy0SXBt0sEu4lXE=; b=GKSWY4uTyJkVukIqQwAXFGWxc0OL9z3C4PhCivPrvilKpaiTAAqt2nkQSM1WLioZHA ebh/6CU14AFNo+R/TQEau9K/v56cffkWgJc8Cbb17Uy/eo6yiVWuMsz8hlx11nXnIWJL BhZ5vibVvyauLqhwj4fC7lH88n0rKq5qkjmfIbtEIRE8id3UIjjFHC+qc2qsuOcN0wNI 0dlD9imEWXIOuttYNJqfsC0uEhJhiEaWThOWje9TIg5BwL6BpQ9XzAUN6XcArwQ+1X5T qxCmNt4x90kBsgJic+WqcubQ4Rle0ZeWGXCkb0kGLGsSagVX0Iz/gmmn45NHubZuqLQp GSgA== X-Forwarded-Encrypted: i=1; AJvYcCXxtUleSEZZ2ne582YK+ZO1ARhwrLy2XAcLUtnhOAgIy8oLyTBcVUEZB99Fd4RSvvHPAqW87lAbe6rMqL0=@vger.kernel.org X-Gm-Message-State: AOJu0YxryEGYhVGm2caJC+Gd9DXV8XGp75cWfYcV3RKbOgxO5zbLb2zA 9NGJNr+Ha7PbdlHKs8h8dry3nT9oAc8eB2ryFaHRDdlCaJspQH0F0Sd+ldJF8vfW3so= X-Gm-Gg: ATEYQzya5JnlkG0gW1/aitcFKq1dn3ZLg2wp2s5ZPAT1ARxxMyIX6JIk/zkHzF7btgN W2TSjZOJkh+qBGsugLeZHEcYqvlpmu9egy7JJha+NeXSgDYxfLIADRfsqMvtbpeesWnoW6HUYsf mDSTpl5HXt1ooWU/Qqm/rLB6GaslB8XiYC+PQkZcWfNIMGyQSMfv5cZcHN/679gL1PjYuAgtAlq 2PNQlLrKQgUQPEDEY8C9Djrt7NWuYM0wfFaNA2Cw/dnOaBpFfnJ0on2gTbcFGptU8drZXAdW/4H xBhAITsYwMoNPohD1LmQJLHYqCX7DEsxuTfjBN7DVEHDQXWMZQFkngFknuH0am+5LpfnT9KTZnb QKr7j93yo6+b9tEHMLz6GxAIrUo8rYzpCTJ88C3p44JynEciKGXZGXp2n1I2mi0Epuhp8h6w4R5 Y+ZHhgrphyt1VKUaFVselze2eMUs2x4YJpXB0P6bQqluzb4+KvXQ== X-Received: by 2002:a05:6214:21e7:b0:894:5d38:2e38 with SMTP id 6a1803df08f44-89a246da7c8mr222716366d6.18.1773063937291; Mon, 09 Mar 2026 06:45:37 -0700 (PDT) Received: from [172.19.0.48] ([99.196.133.212]) by smtp.gmail.com with ESMTPSA id 6a1803df08f44-89a316d8936sm83547586d6.28.2026.03.09.06.45.30 (version=TLS1_3 cipher=TLS_AES_128_GCM_SHA256 bits=128/128); Mon, 09 Mar 2026 06:45:36 -0700 (PDT) Message-ID: Date: Mon, 9 Mar 2026 07:45:25 -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 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 From: Jens Axboe In-Reply-To: <20260306142257.GA16612@lst.de> Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 7bit 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. -- Jens Axboe