linux-kernel - linux-next: manual merge of the net-next tree with the net tree

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

Message-ID: <20241118135512.1039208b@canb.auug.org.au>
Date: Mon, 18 Nov 2024 13:55:12 +1100
From: Stephen Rothwell <sfr@...b.auug.org.au>
To: David Miller <davem@...emloft.net>, Jakub Kicinski <kuba@...nel.org>,
 Paolo Abeni <pabeni@...hat.com>
Cc: Networking <netdev@...r.kernel.org>, Heiner Kallweit
 <hkallweit1@...il.com>, Linux Kernel Mailing List
 <linux-kernel@...r.kernel.org>, Linux Next Mailing List
 <linux-next@...r.kernel.org>, "Russell King (Oracle)"
 <rmk+kernel@...linux.org.uk>
Subject: linux-next: manual merge of the net-next tree with the net tree

Hi all,

Today's linux-next merge of the net-next tree got a conflict in:

  include/linux/phy.h

between commit:

  41ffcd95015f ("net: phy: fix phylib's dual eee_enabled")

from the net tree and commit:

  721aa69e708b ("net: phy: convert eee_broken_modes to a linkmode bitmap")

from the net-next tree.

I fixed it up (see below) and can carry the fix as necessary. This
is now fixed as far as linux-next is concerned, but any non trivial
conflicts should be mentioned to your upstream maintainer when your tree
is submitted for merging.  You may also want to consider cooperating
with the maintainer of the conflicting tree to minimise any particularly
complex conflicts.

-- 
Cheers,
Stephen Rothwell

diff --cc include/linux/phy.h
index 44890cdf40a2,b8346db42727..000000000000
--- a/include/linux/phy.h
+++ b/include/linux/phy.h
@@@ -720,6 -721,11 +720,10 @@@ struct phy_device 
  	/* used for eee validation and configuration*/
  	__ETHTOOL_DECLARE_LINK_MODE_MASK(supported_eee);
  	__ETHTOOL_DECLARE_LINK_MODE_MASK(advertising_eee);
+ 	/* Energy efficient ethernet modes which should be prohibited */
+ 	__ETHTOOL_DECLARE_LINK_MODE_MASK(eee_broken_modes);
 -	bool eee_enabled;
+ 	bool enable_tx_lpi;
+ 	struct eee_config eee_cfg;
  
  	/* Host supported PHY interface types. Should be ignored if empty. */
  	DECLARE_PHY_INTERFACE_MASK(host_interfaces);

Content of type "application/pgp-signature" skipped