Skip to content
Commit 51b35d4f authored by Jakub Kicinski's avatar Jakub Kicinski
Browse files
Merge in late fixes to prepare for the 6.11 net-next PR.

Conflicts:
  93c3a96c ("net: pse-pd: Do not return EOPNOSUPP if config is null")
  4cddb0f1 ("net: ethtool: pse-pd: Fix possible null-deref")
  30d7b672 ("net: ethtool: Add new power limit get and set features")
https://lore.kernel.org/20240715123204.623520bb@canb.auug.org.au/



Signed-off-by: default avatarJakub Kicinski <kuba@kernel.org>
parents af58de31 0a1868b9
Loading
Loading
Loading
Loading
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment