From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mail-ot1-f54.google.com (mail-ot1-f54.google.com [209.85.210.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 B34A03BE156 for ; Wed, 25 Mar 2026 15:56:59 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.210.54 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1774454222; cv=none; b=WpRlDJy8StOSeLWOawJ6lTmGjoAdZGUEoGpbalyjoxDp9N4uBDhDH2/GnwcQXLowhJKJ+r18/lNwASBoeoOqWduhUa6Ja+LAolp5nb1lyzk5zdt9DFzdubC04O1Ch9b+8VColQ327G7wteEztJ1VgyrZSV2MYzLAURRFJk+A9fo= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1774454222; c=relaxed/simple; bh=DKN8i8jOf5NuUa1gZlgxBbn2Fc5ZKuuYcSXkGO0mlbk=; h=Message-ID:Date:MIME-Version:Subject:To:Cc:References:From: In-Reply-To:Content-Type; b=QLUH6y88/K+EcVs0aF+6a80apqirLPLVOCLIT5taMjflMcGdV3kl1OLuJrwO72eMcwaQTqlozm72Tfxry7VFKQbkYbqHYGia+4DXt7TcHCfD6BdkkSFFG1o2Cr+aC/ix/rGW+MNHs+tdvqLkFcsOd986XLQemiDJ6+JtxU/s7Kw= 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=2TP18ePm; arc=none smtp.client-ip=209.85.210.54 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="2TP18ePm" Received: by mail-ot1-f54.google.com with SMTP id 46e09a7af769-7d7653db148so3916274a34.2 for ; Wed, 25 Mar 2026 08:56:59 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=kernel-dk.20230601.gappssmtp.com; s=20230601; t=1774454219; x=1775059019; 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=Mr0E5mH6E+HB2qNXgv+E+FIaRdPop+SyDUYPeWja64M=; b=2TP18ePm0okfSEz1T1KAxBve4TOO5DFC8xUwYKVvgBVnWHaqSek2/jMr4DVp8za1XN 2ZeV9kn3klGXopV51tBi0vIbTxo7SG2rwBw32uRUS2RI7MwpcEhTQvD5vBnYLzDfHYyN uuO+sAcpjTMGDsKwOv5cWnivP+Ubs0me3EA+X3S1o1XNyRrtCAhJDxELUwdd2YwATTeg eVi0BzXDWeGZHtSc3CTa/md/ZaMk1FYCvR1toMsXI0hS/ekhd3YBGpqwr7A8pPEZ11kt m3lhMOWEEZb3DD73dbpFmy6y1pXR4KXGhLtE2r2YUbCo1NQyrGuZJzRT4pvnQqpXlBom HPQA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1774454219; x=1775059019; 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=Mr0E5mH6E+HB2qNXgv+E+FIaRdPop+SyDUYPeWja64M=; b=P5A3BxhlwFHLj7wltHjDe9wDewpDwBoCvVwwlp/5RRY+p9yksxkdM1OCI4E+tx8G8y NBY1AqrOAHj/gvMxoZU8PINjWNvODnkNGY+TyjPMfEi7mlsEXeyJj+jZ4fDOV2UGP16d jzNLCE9tlun6hq3F9gNyE14S3U8xuLO+ZttLH8Z/1koHD+NPP9WQfieuh6vwWrq1iSHU 4AcJGq+iPdL7d0+nLcylQKY56aCbbbbc8/cOiuaexcjCVUYpuRU3xJAQ4cec8blDVSyl hCs2p66fcQBCGBE9PvihrYuHRF3yRgGWyD3taHlkDqbX+3aGVt9AoPSz49fr6Ip4Qoeg oG5A== X-Forwarded-Encrypted: i=1; AJvYcCWWTWLGiF3RMlx1OGhzO+ASIOrmf81DIP6P2s8pd8xsBc+qNWzv5Kxt0mlrxYlfLKbYgoodiCR2LZeO1KQ=@vger.kernel.org X-Gm-Message-State: AOJu0Yw0GnejurCMCsDp3nS458oZPO4mQYcOqgdnbD5oDO9cSoh5FEba pyTgTySoWNLcsz534EjWnrM64yEFZdqoI/ERIJzKMp157OO2j8saN/hfIzoniMW06OyQyAHnnmK yaxDOBUI= X-Gm-Gg: ATEYQzxrWBWe8GT9W+AVDNLhBQRPccgiwt/qpbOXovuF5uIaecCrtU55lx2xUxmF/1z P/zO+YYOUoBP2xMjNRuC6uP5eEQiTZRwyU4iz00UgGFVms4ylbrVbwP0+VRPb38XiGJXZd/mGFy nTNj4frC9rba/9XKe7gQhNUxLYFLmxJx2ARRYUCulqToIVom97SzKOCCzOi0pa1HiqWmTPXIupg brZEPKoRd4U9Miz82zmiD7OmBGcNES1sPGygEP8xq5tdQE1g36ri9uv5KNHxtya1W8zyNENQApU 3HaMWsbUMbIlXsmO9SQLn1aMrNQfBkUDycMtovVZkDxAN9UrVYzbK2vX74fYpK4y68kXF1kqvdT teF0tuL3a7dEp+xhqkuZLzQTeFyzuWfCyZx+L3zMTwnrsUNE9Nn80sF5MBz66DM4nG5DBABCnSG UH18hPdOTubox0tG1aJcS6Yf4fwVy7YSBisB65ySXNg1sW0bhyq3hcFJN3s0hoomGtWsZr86Qgo wkoNORP X-Received: by 2002:a05:6830:3698:b0:7d7:dfc6:e1d1 with SMTP id 46e09a7af769-7d9d662b9admr1937890a34.3.1774454218635; Wed, 25 Mar 2026 08:56:58 -0700 (PDT) Received: from [192.168.1.102] ([96.43.243.2]) by smtp.gmail.com with ESMTPSA id 46e09a7af769-7d9e6fb2e11sm57802a34.3.2026.03.25.08.56.57 (version=TLS1_3 cipher=TLS_AES_128_GCM_SHA256 bits=128/128); Wed, 25 Mar 2026 08:56:58 -0700 (PDT) Message-ID: <1fdb5cbf-fd41-456b-a2cb-c270353cb871@kernel.dk> Date: Wed, 25 Mar 2026 09:56:57 -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 drbd tree To: Mark Brown Cc: =?UTF-8?Q?Christoph_B=C3=B6hmwalder?= , Philipp Reisner , Lars Ellenberg , Linux Kernel Mailing List , Linux Next Mailing List References: Content-Language: en-US From: Jens Axboe In-Reply-To: Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 7bit On 3/25/26 9:41 AM, Mark Brown wrote: > Hi all, > > Today's linux-next merge of the block tree got a conflict in: > > drivers/block/drbd/drbd_nl.c > > between commit: > > ffa847f8ff11d ("drbd: rework netlink interface for DRBD 9 multi-peer config") > > from the drbd tree and commit: > > 630bbba45cfd3 ("drbd: use genl pre_doit/post_doit") > > from the block tree. Christian... See previous reply on this. > These changes are both quite large and the conflicts substantial, > ffa847f8ff11d ("drbd: rework netlink interface for DRBD 9 multi-peer > config") in particular has a diffstat of: > > drivers/block/drbd/drbd_nl.c | 7260 ++++++++++++++++++++++++++++++------------ > 1 file changed, 5167 insertions(+), 2093 deletions(-) > > which would be enormous even for a non-mechanical change, based on the > size and a glance over the changelog it seems clear to me that it should > be split up into a series of patches. This would make resolving the > conflicts much more tractable as it would be clearer what each change is > trying to accomplish. > > 630bbba45cfd3 ("drbd: use genl pre_doit/post_doit") is much less of a > concern as while it's fairly large it is mostly mechanical. > > Since I've got no confidence in my ability to do so rather than > resolving this I have marked the DRBD driver as BROKEN for today > (there's a half completed merge in the tree which shows how far I got) > and I will reorder the drbd tree after the block tree going forward > since it seems to feed into there. It _should_ feed into there, for some reason their tree got added to -next rather than go the usual route. -- Jens Axboe