From: Jakub Kicinski <kuba@kernel.org>
Date: Wed, 14 Oct 2020 02:41:34 +0000 (-0700)
Subject: Merge branch '40GbE-Intel-Wired-LAN-Driver-Updates-2020-10-12'
X-Git-Tag: v5.10.7~1401^2~7
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=d5e6f064ac664aacc0a6f72691b27a6db9525a89;p=platform%2Fkernel%2Flinux-rpi.git

Merge branch '40GbE-Intel-Wired-LAN-Driver-Updates-2020-10-12'

Tony Nguyen says:

====================
40GbE Intel Wired LAN Driver Updates 2020-10-12

This series contains updates to i40e and e1000 drivers.

Jaroslaw adds support for changing FEC on i40e if the firmware supports it.

Jesse fixes a kbuild-bot warning regarding ternary operator on e1000.

v2: Return -EOPNOTSUPP instead of -EINVAL when FEC settings are not
supported by firmware. Remove, unneeded, done label and return errors
directly in i40e_set_fec_param() for patch 1. Dropped, previous patch 2,
to send to net.
====================

Signed-off-by: Jakub Kicinski <kuba@kernel.org>
---

d5e6f064ac664aacc0a6f72691b27a6db9525a89