linux-kernel - Re: [PATCH net] net: phy: Don't register LEDs for genphy

lists.openwall.net		lists / announce owl-users owl-dev john-users john-dev passwdqc-users yescrypt popa3d-users / oss-security kernel-hardening musl sabotage tlsify passwords / crypt-dev xvendor / Bugtraq Full-Disclosure linux-kernel linux-netdev linux-ext4 linux-hardening linux-cve-announce PHC
Open Source and information security mailing list archives

Hash Suite: Windows password security audit tool. GUI, reports in PDF.

[<prev] [next>] [<thread-prev] [day] [month] [year] [list]

Message-ID: <20250710120923.0c307a9c@kernel.org>
Date: Thu, 10 Jul 2025 12:09:23 -0700
From: Jakub Kicinski <kuba@...nel.org>
To: Sean Anderson <sean.anderson@...ux.dev>
Cc: Andrew Lunn <andrew@...n.ch>, Heiner Kallweit <hkallweit1@...il.com>,
 Russell King <linux@...linux.org.uk>, netdev@...r.kernel.org, Paolo Abeni
 <pabeni@...hat.com>, linux-kernel@...r.kernel.org, "David S . Miller"
 <davem@...emloft.net>, Florian Fainelli <f.fainelli@...il.com>, Eric
 Dumazet <edumazet@...gle.com>, Christian Marangi <ansuelsmth@...il.com>
Subject: Re: [PATCH net] net: phy: Don't register LEDs for genphy

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.