From: Jakub Kicinski <kuba@kernel.org>
To: Sean Anderson <sean.anderson@linux.dev>
Cc: Andrew Lunn <andrew@lunn.ch>,
Heiner Kallweit <hkallweit1@gmail.com>,
Russell King <linux@armlinux.org.uk>,
netdev@vger.kernel.org, Paolo Abeni <pabeni@redhat.com>,
linux-kernel@vger.kernel.org,
"David S . Miller" <davem@davemloft.net>,
Florian Fainelli <f.fainelli@gmail.com>,
Eric Dumazet <edumazet@google.com>,
Christian Marangi <ansuelsmth@gmail.com>
Subject: Re: [PATCH net] net: phy: Don't register LEDs for genphy
Date: Thu, 10 Jul 2025 12:09:23 -0700 [thread overview]
Message-ID: <20250710120923.0c307a9c@kernel.org> (raw)
In-Reply-To: <85f00716-4cd7-410c-a4c7-8efd52e04ec8@linux.dev>
On Thu, 10 Jul 2025 14:57:48 -0400 Sean Anderson wrote:
> OK, so if A is this patch and B is the conflict above, you'd like me to
> post an A' like:
>
> B---merge---A' net-next
> / /
> base---A net
>
> ? Or did you have something in mind more like
>
> B---A' net-next
> /
> base---A net
The latter, so we will end up with:
B---A' net-next --M
/ /
base---A net -----
where M is a merge with a conflict, to resolve will basically pick
the net-next version.
next prev parent reply other threads:[~2025-07-10 19:09 UTC|newest]
Thread overview: 11+ messages / expand[flat|nested] mbox.gz Atom feed top
2025-07-07 19:58 [PATCH net] net: phy: Don't register LEDs for genphy Sean Anderson
2025-07-07 23:32 ` Jakub Kicinski
2025-07-08 15:52 ` Sean Anderson
2025-07-10 17:40 ` Sean Anderson
2025-07-10 17:52 ` Jakub Kicinski
2025-07-10 18:17 ` Sean Anderson
2025-07-10 18:49 ` Jakub Kicinski
2025-07-10 18:57 ` Sean Anderson
2025-07-10 19:09 ` Jakub Kicinski [this message]
2025-07-08 8:58 ` Russell King (Oracle)
2025-07-08 15:33 ` Sean Anderson
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20250710120923.0c307a9c@kernel.org \
--to=kuba@kernel.org \
--cc=andrew@lunn.ch \
--cc=ansuelsmth@gmail.com \
--cc=davem@davemloft.net \
--cc=edumazet@google.com \
--cc=f.fainelli@gmail.com \
--cc=hkallweit1@gmail.com \
--cc=linux-kernel@vger.kernel.org \
--cc=linux@armlinux.org.uk \
--cc=netdev@vger.kernel.org \
--cc=pabeni@redhat.com \
--cc=sean.anderson@linux.dev \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.