From: David S. Miller Date: Sun, 15 May 2016 17:35:49 +0000 (-0400) Subject: Merge branch 'bnxt_en-next' X-Git-Tag: v4.9.8~2112^2~51 X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=bf14e9ec80dea9a16cd47bdf1d7c418add2594f0;p=platform%2Fkernel%2Flinux-rpi3.git Merge branch 'bnxt_en-next' Michael Chan says: ==================== bnxt_en: updates for net-next. Non-critical bug fixes, improvements, a new ethtool feature, and a new device ID. v2: Fixed a bug in bnxt_get_module_eeprom() found by Ben Hutchings. Ajit Khaparde (2): bnxt_en: Add Support for ETHTOOL_GMODULEINFO and ETHTOOL_GMODULEEEPRO bnxt_en: Report PCIe link speed and width during driver load Michael Chan (6): bnxt_en: Reduce maximum ring pages if page size is 64K. bnxt_en: Improve the delay logic for firmware response. bnxt_en: Fix length value in dmesg log firmware error message. bnxt_en: Simplify and improve unsupported SFP+ module reporting. bnxt_en: Add BCM57314 device ID. bnxt_en: Use dma_rmb() instead of rmb(). Satish Baddipadige (1): bnxt_en: Fix invalid max channel parameter in ethtool -l. ==================== Signed-off-by: David S. Miller --- bf14e9ec80dea9a16cd47bdf1d7c418add2594f0