From: David S. Miller <davem@davemloft.net>
Date: Mon, 7 Oct 2019 13:30:03 +0000 (-0400)
Subject: Merge branch 'ena-set_channels'
X-Git-Tag: v5.5-rc1~174^2~401
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=6c157f6ed90ffceba73d43c115ccf94a435a4c3c;p=thirdparty%2Fkernel%2Flinux.git

Merge branch 'ena-set_channels'

Sameeh Jubran says:

====================
ena: Support ethtool set_channels

Difference from v2:
* ethtool's set/get channels: Switched to using combined instead of
  separate rx/tx
* Fixed error handling in set_channels
* Fixed indentation and cosmetic issues as requested by Jakub Kicinski

Difference from v1:
* Dropped the print from patch 0002 - "net: ena: multiple queue creation
  related cleanups" as requested by David Miller
====================

Signed-off-by: David S. Miller <davem@davemloft.net>
---

6c157f6ed90ffceba73d43c115ccf94a435a4c3c