Merge branch 'for-upstream' of git://git.chelsio.net/pub/git/linux-firmware

8 years ago · 6e99b1e046
7 changed files with 10 additions and 5 deletions
--- a/10
+++ b/10
@ -565,14 +565,18 @@ Found in hex form in kernel source.
				@@ -565,14 +565,18 @@ Found in hex form in kernel source.

 --------------------------------------------------------------------------

-Driver: cxgb4 - Chelsio Terminator 4/5 1G/10/40G Ethernet adapter
+Driver: cxgb4 - Chelsio Terminator 4/5/6 1/10/25/40/100G Ethernet adapter

 File: cxgb4/t4fw-1.14.4.0.bin
 File: cxgb4/t4fw-1.15.37.0.bin
-Link: cxgb4/t4fw.bin -> t4fw-1.15.37.0.bin
+File: cxgb4/t4fw-1.16.26.0.bin
+Link: cxgb4/t4fw.bin -> t4fw-1.16.26.0.bin
 File: cxgb4/t5fw-1.14.4.0.bin
 File: cxgb4/t5fw-1.15.37.0.bin
-Link: cxgb4/t5fw.bin -> t5fw-1.15.37.0.bin
+File: cxgb4/t5fw-1.16.26.0.bin
+Link: cxgb4/t5fw.bin -> t5fw-1.16.26.0.bin
+File: cxgb4/t6fw-1.16.26.0.bin
+Link: cxgb4/t6fw.bin -> t6fw-1.16.26.0.bin
 File: cxgb4/aq1202_fw.cld
 File: cxgb4/bcm8483.bin

--- a/cxgb4/t4fw-1.16.26.0.bin
+++ b/cxgb4/t4fw-1.16.26.0.bin
--- a/cxgb4/t4fw.bin
+++ b/cxgb4/t4fw.bin
@ -1 +1 @@
				@@ -1 +1 @@
-t4fw-1.15.37.0.bin
+t4fw-1.16.26.0.bin
--- a/cxgb4/t5fw-1.16.26.0.bin
+++ b/cxgb4/t5fw-1.16.26.0.bin
--- a/cxgb4/t5fw.bin
+++ b/cxgb4/t5fw.bin
@ -1 +1 @@
				@@ -1 +1 @@
-t5fw-1.15.37.0.bin
+t5fw-1.16.26.0.bin
--- a/cxgb4/t6fw-1.16.26.0.bin
+++ b/cxgb4/t6fw-1.16.26.0.bin
--- a/cxgb4/t6fw.bin
+++ b/cxgb4/t6fw.bin
@ -0,0 +1 @@
				@@ -0,0 +1 @@
+t6fw-1.16.26.0.bin