linux-kernel - Re: [PATCH net-next v3 00/10] net: pcs: xpcs: Add memory-mapped device support

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] [thread-next>] [day] [month] [year] [list]

Date: Thu, 27 Jun 2024 14:10:34 +0300
From: Vladimir Oltean <olteanv@...il.com>
To: Serge Semin <fancer.lancer@...il.com>
Cc: Andrew Lunn <andrew@...n.ch>, Heiner Kallweit <hkallweit1@...il.com>,
	Russell King <linux@...linux.org.uk>,
	Alexandre Torgue <alexandre.torgue@...s.st.com>,
	Jose Abreu <joabreu@...opsys.com>,
	Jose Abreu <Jose.Abreu@...opsys.com>,
	Florian Fainelli <f.fainelli@...il.com>,
	Maxime Chevallier <maxime.chevallier@...tlin.com>,
	Rob Herring <robh+dt@...nel.org>,
	Krzysztof Kozlowski <krzysztof.kozlowski+dt@...aro.org>,
	Conor Dooley <conor+dt@...nel.org>,
	"David S. Miller" <davem@...emloft.net>,
	Eric Dumazet <edumazet@...gle.com>,
	Jakub Kicinski <kuba@...nel.org>, Paolo Abeni <pabeni@...hat.com>,
	Sagar Cheluvegowda <quic_scheluve@...cinc.com>,
	Abhishek Chauhan <quic_abchauha@...cinc.com>,
	Andrew Halaney <ahalaney@...hat.com>,
	Jiawen Wu <jiawenwu@...stnetic.com>,
	Mengyuan Lou <mengyuanlou@...-swift.com>,
	Tomer Maimon <tmaimon77@...il.com>, openbmc@...ts.ozlabs.org,
	netdev@...r.kernel.org, devicetree@...r.kernel.org,
	linux-kernel@...r.kernel.org
Subject: Re: [PATCH net-next v3 00/10] net: pcs: xpcs: Add memory-mapped
 device support

Hi Sergey,

This does not apply to net-next.

Applying: net: pcs: xpcs: Move native device ID macro to linux/pcs/pcs-xpcs.h
Applying: net: pcs: xpcs: Split up xpcs_create() body to sub-functions
Applying: net: pcs: xpcs: Convert xpcs_id to dw_xpcs_desc
Applying: net: pcs: xpcs: Convert xpcs_compat to dw_xpcs_compat
Applying: net: pcs: xpcs: Introduce DW XPCS info structure
Applying: dt-bindings: net: Add Synopsys DW xPCS bindings
Applying: net: pcs: xpcs: Add Synopsys DW xPCS platform device driver
Applying: net: pcs: xpcs: Add fwnode-based descriptor creation method
Applying: net: stmmac: Create DW XPCS device with particular address
Using index info to reconstruct a base tree...
M       drivers/net/ethernet/stmicro/stmmac/dwmac-intel.c
M       include/linux/stmmac.h
Checking patch drivers/net/ethernet/stmicro/stmmac/dwmac-intel.c...
Checking patch drivers/net/ethernet/stmicro/stmmac/stmmac_mdio.c...
Checking patch include/linux/stmmac.h...
Applied patch drivers/net/ethernet/stmicro/stmmac/dwmac-intel.c cleanly.
Applied patch drivers/net/ethernet/stmicro/stmmac/stmmac_mdio.c cleanly.
Applied patch include/linux/stmmac.h cleanly.
Falling back to patching base and 3-way merge...
error: Your local changes to the following files would be overwritten by merge:
        drivers/net/ethernet/stmicro/stmmac/dwmac-intel.c
        drivers/net/ethernet/stmicro/stmmac/stmmac_mdio.c
        include/linux/stmmac.h
Please commit your changes or stash them before you merge.
Aborting
error: Failed to merge in the changes.
Patch failed at 0009 net: stmmac: Create DW XPCS device with particular address
hint: Use 'git am --show-current-patch=diff' to see the failed patch

Thanks,
Vladimir