From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mail-wm1-f41.google.com (mail-wm1-f41.google.com [209.85.128.41]) (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 CDF372E3AF1 for ; Sun, 1 Mar 2026 12:08:29 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.128.41 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1772366912; cv=none; b=QpDIYDxNgQ60A07moW24cjDZ/0oGA2tqJdtLxc1JDYBqjxl5TlkUBrqO2iD1/qS2UwWRX9oq2dtX53fXXR4r2sn3xCXrewWoF1nAmBzxltK2cWHoc2dJ2h5QAT1F2+mEKK0Qwgygs4BzysXljgEVmFD3vf8UJ9MUKrPgdy8gCsM= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1772366912; c=relaxed/simple; bh=8k2C0jPmWIaM9el8miNXWEkBgsxEkaRz5GqnZvFuqYE=; h=Date:From:To:Cc:Subject:Message-ID:References:MIME-Version: Content-Type:Content-Disposition:In-Reply-To; b=ukNwz2dlH8NNauWDCbySPelEB8iBT3tr09S8R6qWmnNy60FebwDkXMtCI+Vv0jJSvzWkszhj9i/BzQC9SISnCs8r+LthDxKjM98IRSedC3RXt2rQvwJtoW+iQmiVeNQ+L9x+DpLSBwMljvHHSLE1FkNudulUC0/Nq4QHJwsoNNg= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=gmail.com; spf=pass smtp.mailfrom=gmail.com; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b=mE+KhqJd; arc=none smtp.client-ip=209.85.128.41 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=gmail.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=gmail.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b="mE+KhqJd" Received: by mail-wm1-f41.google.com with SMTP id 5b1f17b1804b1-4830b67aa6bso3730295e9.0 for ; Sun, 01 Mar 2026 04:08:29 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1772366908; x=1772971708; darn=vger.kernel.org; h=in-reply-to:content-disposition:mime-version:references:message-id :subject:cc:to:from:date:from:to:cc:subject:date:message-id:reply-to; bh=UwOed2BoBm+IaxGS8G+Dca7DMJY6cOw/pE55KOFYvnI=; b=mE+KhqJdPGNgDpt0ltwFT/Nf/ALulrK1ZMPmVUKC7EvN0NOV315og+2LlBt+5lr0cE wlThYNEAQmjtQwvW+d3eyihuF6jLndaaoFSuII2de7OKYU+7KNf9Sj/OnntDXuk4Bq9k NAeVwqcpF8IsEHRNQGkreLaWd14NM94a61Yb2m2CvXtWgHoP/4dIL3NZLdVD1n7xMs8l xkHdA6mY/AVimfYT43m5r4Ruesn9nqpabmiTp46wB9qJyqHNW/1Y37/kJU1BPTlNadXN 9rBJqdRPUGU+k1mqQYY8+QWXNWfOfbOyzWAIk2kHBGFCQNw4g6nMqcQ55HkqKAfNuHc/ mQ0w== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1772366908; x=1772971708; h=in-reply-to:content-disposition:mime-version:references:message-id :subject:cc:to:from:date:x-gm-gg:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=UwOed2BoBm+IaxGS8G+Dca7DMJY6cOw/pE55KOFYvnI=; b=fIuRuw/zN9AevGp3LsR/EUDHDWbvNKZjgvIjrpm9slwV2BOQaHTh5jJCZYDmXTFPYm qwI6i9ct/USiBVwMzGh3TdMJcBQS/om0W7Oy4ukGEfJDp2zVJVbMvSVjUYdsz4AZwxPq caZdBVH+tv30IX1WWtBz5R2i01SBXV2mgIDtFRXyJrO7l649VVGZOrRZt2mHwy09hXBZ x//edx6UmeFBSXMSokO+tXTmPt0uF6YVxodwvxp5E3GYHk+fE3DYV0pbD6KKCKukdmFb 5QEmy1LmgLpUrsUYi7mVnf9uidIH16rcvwIKNacJuDadKLVA7wlqfa15Y6q0CcQ/Xsv2 P1mg== X-Forwarded-Encrypted: i=1; AJvYcCXfvNNI2/tv/o3EqbnChwnuQjwOOpzbzLpcRPnSO8QY5BTYHX9Ubqd0xg/YbK+6pZwh1fqUTl0=@vger.kernel.org X-Gm-Message-State: AOJu0YyhR/eikzLXhVEyP5ouhdJ73xiPTJBHqZLPXlSPFQ8/U7MBATEX HGYhkWsEvmtHjB2r71hP9zB1e2zSEf2ezZ2Uq+hhITYJUqOCC7W5Weio X-Gm-Gg: ATEYQzzEgAxJ9sO8Zim8i8VfvBrwLww3WakUV/9DYBAbvXrrmwsptAFQyErrirLJN16 zZDsbHINgYzwg3NFXqw9goso4PfLFepNSVnbmvt6R+xpe3nnEk1vNOH7+aYrRLahTuy9GEBGQqs E+kzWEiWtGiZwh6GBX4cibpE0qk2VJXUGzirzirrQzVN67O37lLqEPDqZWLers2K5240VnSb/E1 e5X6h60GbU5NfAfX7P8UXGQF5aQdM1asDe7hn+SfYqN+6gvZH532Onq4mPekjMaH9X7ULKxA5nu O7QXD9bDm9th66kj+DdCnDSbDrJPyCW9Zv5465rCo3Xy7eOOghwh9ZKOkWYpf+nqiQ6onnCBLDB Wq3Wdas/lilNvpO2GMcodGrJf+5M2tGpfwwwznBp3GcI4eS37oYsigkK1vH5w1xl0OcqH6XG3B9 MGN8nWplkOKYKnD/w12HY= X-Received: by 2002:a05:600c:828c:b0:47e:e20e:bbbc with SMTP id 5b1f17b1804b1-483c9ba6db4mr86494875e9.1.1772366907868; Sun, 01 Mar 2026 04:08:27 -0800 (PST) Received: from skbuf ([2a02:2f04:d608:3a00:8f4c:42a4:aebb:ef65]) by smtp.gmail.com with ESMTPSA id 5b1f17b1804b1-483bd7507adsm363973255e9.9.2026.03.01.04.08.26 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 01 Mar 2026 04:08:27 -0800 (PST) Date: Sun, 1 Mar 2026 14:08:24 +0200 From: Vladimir Oltean To: Jakub Kicinski Cc: "Russell King (Oracle)" , Andrew Lunn , Alexandre Torgue , Andrew Lunn , "David S. Miller" , Eric Dumazet , linux-arm-kernel@lists.infradead.org, linux-arm-msm@vger.kernel.org, linux-phy@lists.infradead.org, linux-stm32@st-md-mailman.stormreply.com, Mohd Ayaan Anwar , Neil Armstrong , netdev@vger.kernel.org, Paolo Abeni , Vinod Koul Subject: Re: [PATCH RESEND2 net-next 0/8] net: stmmac: qcom-ethqos: further serdes reorganisation Message-ID: <20260301120824.ot53bhv7z7kn5lfd@skbuf> References: <20260227165556.5cf9e844@kernel.org> <20260228083111.5df8550c@kernel.org> <20260301001453.lpd2rawy7bqxyivp@skbuf> <20260228163229.1024f263@kernel.org> Precedence: bulk X-Mailing-List: netdev@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <20260228163229.1024f263@kernel.org> On Sat, Feb 28, 2026 at 04:32:29PM -0800, Jakub Kicinski wrote: > > I'm working on a series for phy-next which will conflict with this > > hunk from Russell's patch 1: > > > > diff --git a/drivers/phy/qualcomm/phy-qcom-sgmii-eth.c b/drivers/phy/qualcomm/phy-qcom-sgmii-eth.c > > index 5b1c82459c12..4ea3dce7719f 100644 > > --- a/drivers/phy/qualcomm/phy-qcom-sgmii-eth.c > > +++ b/drivers/phy/qualcomm/phy-qcom-sgmii-eth.c > > @@ -7,6 +7,7 @@ > > #include > > #include > > #include > > +#include > > #include // this gets renamed to > > #include > > #include > > That's not too bad.. if that's the extent of the conflict (which is > probably hard to predict at rc2?) we could let linux-next handle it. Yeah, I can't predict the future beyond that. > Of course assuming Vinod is okay with us merging Russell's entire > series. > > > If there's no other way to provide a stable tag other than on v7.0-rc1 > > (like for example a snapshot of current net-next/main), which I didn't > > know wouldn't be possible, then I think going with the route of fewer/ > > more trivial merge conflicts makes sense. > > To be clear, it's only about having a common ancestor, I wasn't actually > planning on making y'all a tag. I'd just apply the series on top of > v7.0-rc1 and merge them in. Then anyone can tag the relevant commit > in net-next or use as a base for their own work. > > I haven't looked how bad the conflict would be if Russell's work was > rebased on Linus's tree. If the delta is not too bad, and we can just > resolve the merge conflict when pulling it into net-next. That's > probably the cleanest. I don't think applying the current series on top of v7.0-rc1 would be a good idea. It depends upon this series in a very non-trivial way, basically building upon it: https://patchwork.kernel.org/project/netdevbpf/list/?series=1056390&state=* For example, that previous series introduces ethqos_mac_finish_serdes() - absent in v7.0-rc1 - and this series modifies it (in current net-next/main, it is calling phy_set_speed(), and after this series, it is calling phy_set_mode_ext()). By comparison, the merge conflict with me renaming would be smaller. > I don't recall us ever making a "dirty tag" on net-next which would > propagate few 100s of netdev patches into someone else's tree :S > IDK how Linus would react. It's the least good option IMO. Just for my curiosity, what difference would it make to him?