From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mail-wm1-f54.google.com (mail-wm1-f54.google.com [209.85.128.54]) (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 389E53E6DCD for ; Wed, 25 Mar 2026 17:33:13 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.128.54 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1774459994; cv=none; b=hGYavQXZGv0FtaSAh7lVEbOjvwEfIcQ6jPs5pqDHKygc1YgKg5kqP7uAKmSDP512EY3sYlur+wbKnzR3CY484o/EnpCdqfwmHdO8a+BGnzo2oybESStTAgeZtqPlIen+S95tjc8mloUAzYYDtQqGRGK0p/BSXJ1hbUj5uMA4eMw= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1774459994; c=relaxed/simple; bh=6mC6rnROd5UC1Xykedq/XYApI5Pw9LFgMLHdSq7X8X0=; h=Message-ID:Date:MIME-Version:Subject:To:Cc:References:From: In-Reply-To:Content-Type; b=qq2F/iYUPaY5CjX1xf569q9bJPoNt4GdbqM+5+VAvMDf+oPl9ne4V32nvqktxoaT8o5Wk8zulTb/rjwlfI/S7G2mlw2C1lLbowdehsea4XedOGe+YJbBIUzPHm0bE9WGNHHJHDhqEOuXN+QmFyRLsp088p3P0mQTAvSZVYqK1NQ= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=linbit.com; spf=pass smtp.mailfrom=linbit.com; dkim=pass (2048-bit key) header.d=linbit-com.20230601.gappssmtp.com header.i=@linbit-com.20230601.gappssmtp.com header.b=FW+Rdcof; arc=none smtp.client-ip=209.85.128.54 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=linbit.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=linbit.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=linbit-com.20230601.gappssmtp.com header.i=@linbit-com.20230601.gappssmtp.com header.b="FW+Rdcof" Received: by mail-wm1-f54.google.com with SMTP id 5b1f17b1804b1-48334ee0aeaso1254005e9.1 for ; Wed, 25 Mar 2026 10:33:13 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linbit-com.20230601.gappssmtp.com; s=20230601; t=1774459992; x=1775064792; darn=vger.kernel.org; h=content-transfer-encoding:in-reply-to:content-language:from :references:cc:to:subject:user-agent:mime-version:date:message-id :from:to:cc:subject:date:message-id:reply-to; bh=5sZ1KbtfZr+zgwPW/a767v1N740zE1aNzyInaMTvgi8=; b=FW+Rdcof60Rhq62Ojg5gycHGEFybdRqQf4jJuif5v7g7GzEy83Xa/V0syrFwsd9CVZ o9cdT1L2H7CvTjjjMHlHpUPKSjSDyJa/sIfFEYlfyJtMYqOL9Dgtj76gIN0KHuipZTe3 A/V78pPvvqvyrc2u+oT43qovTH/48CoJ5/ZlMVryAVEnAx2nm8RE6nyNlgRLHcgOttoS dTJClTfjFJSEfZJsC0VTtmfECXho+58pxbDP/b3C3P1c3LbnKVrckFLrVjC6f0lWiEbR 6HkDylfk9xhyrmgcESgu7TZjtaoZe9+OiyV09Q29G2T4YoaHnGitLSzF0CoZnjJZEKFk Kqvw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1774459992; x=1775064792; h=content-transfer-encoding:in-reply-to:content-language:from :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=5sZ1KbtfZr+zgwPW/a767v1N740zE1aNzyInaMTvgi8=; b=coIqNNoPkxCcqkIxwjMFbpp6/KmlLmUFpNCcTUA1x11BvvyKfsYVO6+5jAO76kAqQU a1fGvLiJqWGwty8jXQI4D3ODA0UNq5e1PgLYP7YUXfx3BY2tMvc0DkfdNnW6M6cuIlli shNfWDblX+rtNa5fhKnszIcnrQPboj6fBZ4Z1MfSvdvbOjgDSZ9qqiqUZpvhx0AsNUDe TZlMPNcNdRYHn0AblldLCvGBx/qU1ACGQjGadcIcQnBvR+SdJ37IpmkTu5CvmEXZfJc5 ac97uR4jnyqSqlSY/qB8elKLlPeQOJfbg/nCX2AsP9TzUfJYxUvIkYm/HZCHN8ArxbM3 8AMg== X-Forwarded-Encrypted: i=1; AJvYcCUuTevdFvDJDWDp6CaAHOjZw1qwQBgiAmRMM8PeGO6yvEUgw3YwVkaE8N9z2Kzx6qdyP66dZzmaQ/tQPec=@vger.kernel.org X-Gm-Message-State: AOJu0YyLAhGdftBZP1Lu86k4sQXeflUD7O9ZDvfj2Z8zaE8xpHipIzVn Mm1YaiTalM3SouJyJ6OvkLx0Uw/hZKS8+6B0zdzMZzzVbnb4tbeuVaU5euXbUn6pwrA= X-Gm-Gg: ATEYQzwvtK7iRUIBCBgPbbRUWWABb+jgmrswDOYQAU071qDXRgRbOtDIOLaqRoAKBFc ihZD450hOBCYd4ibicZUcsjTKhDguC1spNPfIUWE1yYqAwbb64o7s/3vAm4mqqGqTXy0FcACaz7 PnaTEJs/Ni7pTuSsXCOJe4Qred64o0UNHihKxGTXnUEPnOajSEWu/p+GM7cFE8FnkI+CParOsvY H65FLuvJ1IwEA0oYIebDYOeNEXOiDscKFDFNJSEZA2G8Pbk597YNY4iZX2us+deZUSFRVaC0YAK QBf5Sxkdsv798Ot9H4+qnYCXQkfBvngiRnMFnWSsJzxVutUob1bEUkzuggmClkeTTRYcjuu4KEx KNDcCX3Q+sIXqtu19zfPrlFP65CwJTghXZyeQlIF8mi5i9TMBWNtYOXrwC7tXOOcdgefIWfRlpb 6VMEoDQ8YG7mqxpyMsrsmVMXASYEdl2w0IJfvT1IkBjJo3b/n5u61fCiY7NhpGe1GnmVOEMixQq 4pdcLcSlWmTFiU= X-Received: by 2002:a05:600c:5296:b0:485:364e:9328 with SMTP id 5b1f17b1804b1-4871605ceb5mr68310965e9.16.1774459991563; Wed, 25 Mar 2026 10:33:11 -0700 (PDT) Received: from [192.168.178.55] (h082218028181.host.wavenet.at. [82.218.28.181]) by smtp.gmail.com with ESMTPSA id 5b1f17b1804b1-4871e5ec987sm8271955e9.4.2026.03.25.10.33.09 (version=TLS1_3 cipher=TLS_AES_128_GCM_SHA256 bits=128/128); Wed, 25 Mar 2026 10:33:10 -0700 (PDT) Message-ID: Date: Wed, 25 Mar 2026 18:33:09 +0100 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 drbd tree To: Mark Brown Cc: Jens Axboe , Philipp Reisner , Lars Ellenberg , Linux Kernel Mailing List , Linux Next Mailing List References: <899e0337-9642-4ca6-9050-aeab14fa22ef@kernel.dk> <9e8b388d-ca6d-4e78-bbb8-3b6cdd731777@linbit.com> From: =?UTF-8?Q?Christoph_B=C3=B6hmwalder?= Content-Language: en-US In-Reply-To: Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Am 25.03.26 um 17:57 schrieb Mark Brown: > On Wed, Mar 25, 2026 at 05:47:34PM +0100, Christoph Böhmwalder wrote: >> Am 25.03.26 um 17:30 schrieb Jens Axboe: > >>> I won't submit the changes in for-7.1/drbd, but just expect you to send >>> a new series against for-7.2/block when that is a thing. The 7.2 one >>> should be closer to going upstream, and so forth. Within a few revisions >>> of the mainline kernel, we'll get to the point where for-7.x/drbd can be >>> included in the merge window pull request as well, and we're done at >>> that point and future drbd changes will just get submitted against >>> for-7.x/block like any other block driver. > >> Sounds like a plan. I'll send the rebased series this week. >> We already have a few "get it closer to going upstream" patches in the >> pipeline targeted for the 7.1 and 7.2 merge windows, but none of them >> are truly ready yet. So this approach would fit very well. > >> Exactly, once we are done with all this we will adopt a "normal" >> upstream-first dev approach again. We've already discussed changes to >> our internal workflow to make sure we never digress this far from >> upstream again -- I think that's in all our interests :) > > So I should just drop the drbd tree entirely from tomorrow? I guess that would actually be the easiest path then, yes. Sorry for the churn on your side. -- Christoph Böhmwalder LINBIT | Keeping the Digital World Running DRBD HA — Disaster Recovery — Software defined Storage