From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from smtp.kernel.org (aws-us-west-2-korg-mail-alma10-1.taild15c8.ts.net [100.103.45.18]) (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 549091F09A5; Sat, 13 Jun 2026 00:44:44 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=100.103.45.18 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1781311485; cv=none; b=K7jD+9IgWpO3vgxfjLjy+l+JTrfAfOjL/zvROED1Hmyn2QGgVKYAlxEUl2ORisRRkRS5KKhZrP36qHhcFNQ47IvDmGfwE5lVzB9prP5jhEpScP06GZjmZOcmHo7jkw4dOqCAImd9CE/s01ielI8Hovm1ondirmodXL+0RPXeoe8= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1781311485; c=relaxed/simple; bh=c1HPFZsU0eRnti37RMqtFvZSiXq6k8XdGi4re0c8Tvg=; h=Date:From:To:Cc:Subject:Message-ID:In-Reply-To:References: MIME-Version:Content-Type; b=gvfxTbzQmHcQBx/oApc209EWmd74jF+0gzKzZuiGCunJRMar2IapTrI6XbvRCf4s0bxM8hqj+WwigpptSBkhLQYPy3aAV3vsnWEwWtmr5C7GCS+CC1zmdr3WkyVX6K5roxsX3CgAM814CWn8VvDbdyoA3duJ6k24k9qdOyrbVIo= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b=gpv9Es7L; arc=none smtp.client-ip=100.103.45.18 Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b="gpv9Es7L" Received: by smtp.kernel.org (Postfix) with ESMTPSA id 380611F000E9; Sat, 13 Jun 2026 00:44:43 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=kernel.org; s=k20260515; t=1781311484; bh=OEt29oeVnp0fgMWbhtQ94bxVYk/Oo9ifrXVMeaXuFzE=; h=Date:From:To:Cc:Subject:In-Reply-To:References; b=gpv9Es7L/BeqibIroIT8p3V1n1+Gt1mbGSw1xvwrzNHD6OPA7YN0OfyDJkCpAaFSb iKHkLydxyWt506995rgIfgy9VFtTp3xIuQQMnXKfUI/zxpKUzj4NWE3B0rBRca5SlZ fGShz+S0CZoYZJlXde3e/30gkMc7dRDL1iF8jw9VLuy+M+gVbhmhD89wpU8PNH5iz9 /Joc5xaLRYgqXPiTDTZ3bPJ19O+eASLINo1H/tErCzMsD7skHuF8JlqzZ7ngXMe+66 1ZoQ8ZMhDHycHQiz5KNpO/ashtahKg22+px+FuGlPZpieM02vWjaE3xkoWUUGQlzfe UoB0dvnIxAZRw== Date: Fri, 12 Jun 2026 17:44:42 -0700 From: Jakub Kicinski To: Matthieu Baerts Cc: Breno Leitao , Allison Henderson , linux-kernel@vger.kernel.org, netdev@vger.kernel.org, linux-rdma@vger.kernel.org, rds-devel@oss.oracle.com, linux-kselftest@vger.kernel.org, kernel-team@meta.com, "David S. Miller" , Eric Dumazet , Paolo Abeni , Simon Horman , Shuah Khan , Andy Grover , Mark Brown , Linux Next Mailing List Subject: Re: [PATCH net-next v3 2/2] rds: convert to getsockopt_iter: manual merge Message-ID: <20260612174442.5fe54656@kernel.org> In-Reply-To: References: <20260608-getsock_more-v3-0-706ecf2ea332@debian.org> <20260608-getsock_more-v3-2-706ecf2ea332@debian.org> <2e1b0534-a1a0-4eb1-a5e2-d42fcf991188@kernel.org> Precedence: bulk X-Mailing-List: linux-rdma@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Type: text/plain; charset=US-ASCII Content-Transfer-Encoding: 7bit On Fri, 12 Jun 2026 13:41:00 +0200 Matthieu Baerts wrote: > > I was aware of the conflict but didn't realize a note would be helpful > > for the merge. I should have included one. > > > > Could you point me to an example commit/patch that contains such a note so I > > can understand the expected format and procedure? > > In this particular example, I think it would have been easier to have > waited for the fix to land in net-next -- after the weekly sync with net > -- and then send the net-next patches. > > When this cannot be avoided, then you can mention the conflict, and > ideally share a diff of the resolution, plus a description, especially > when it is not obvious, when simply saying "take the version from X" is > helpful, when extra modifications are needed, etc. e.g. [1]. Something > similar to what Mark is usually doing on the linux-next ML, or what I > did here. Thanks for explaining! This conflict was avoidable but I didn't find the appropriately polite explanation within me :) When conflicting code is _already committed_ to net-next we can deal with the conflict. If there's a patch only posted but not commited and we notice a bug - the net-next patch should be explicitly withdrawn and reposted once the fix has propagated.