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

Signed-off-by: Josh Boyer <jwboyer@kernel.org>

diff --git a/WHENCE b/WHENCE
index b9d3d622c36baac9645fa6c8726fd7201dd2552e..c0c2ab31a6698e09856d80e0d62bb0ed8e6b3846 100644 (file)
--- a/WHENCE
+++ b/WHENCE
@@ -577,14 +577,14 @@ 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
-File: cxgb4/t4fw-1.20.8.0.bin
-Link: cxgb4/t4fw.bin -> t4fw-1.20.8.0.bin
+File: cxgb4/t4fw-1.21.5.0.bin
+Link: cxgb4/t4fw.bin -> t4fw-1.21.5.0.bin
 File: cxgb4/t5fw-1.14.4.0.bin
 File: cxgb4/t5fw-1.15.37.0.bin
-File: cxgb4/t5fw-1.20.8.0.bin
-Link: cxgb4/t5fw.bin -> t5fw-1.20.8.0.bin
-File: cxgb4/t6fw-1.20.8.0.bin
-Link: cxgb4/t6fw.bin -> t6fw-1.20.8.0.bin
+File: cxgb4/t5fw-1.21.5.0.bin
+Link: cxgb4/t5fw.bin -> t5fw-1.21.5.0.bin
+File: cxgb4/t6fw-1.21.5.0.bin
+Link: cxgb4/t6fw.bin -> t6fw-1.21.5.0.bin
 File: cxgb4/aq1202_fw.cld
 File: cxgb4/bcm8483.bin
 

diff --git a/cxgb4/t4fw-1.20.8.0.bin b/cxgb4/t4fw-1.20.8.0.bin
deleted file mode 100644 (file)
index b1d7d5d..0000000
Binary files a/cxgb4/t4fw-1.20.8.0.bin and /dev/null differ

diff --git a/cxgb4/t4fw-1.21.5.0.bin b/cxgb4/t4fw-1.21.5.0.bin
new file mode 100644 (file)
index 0000000..576626b
Binary files /dev/null and b/cxgb4/t4fw-1.21.5.0.bin differ

diff --git a/cxgb4/t4fw.bin b/cxgb4/t4fw.bin
index 0961746df2f0745608f4d999d8fccd8ed136d5da..b840b34666a64616b89603ce0f6c53eb8c7a7fd4 120000 (symlink)
--- a/cxgb4/t4fw.bin
+++ b/cxgb4/t4fw.bin
@@ -1 +1 @@
-t4fw-1.20.8.0.bin
\ No newline at end of file
+t4fw-1.21.5.0.bin
\ No newline at end of file

diff --git a/cxgb4/t5fw-1.20.8.0.bin b/cxgb4/t5fw-1.20.8.0.bin
deleted file mode 100644 (file)
index 7374414..0000000
Binary files a/cxgb4/t5fw-1.20.8.0.bin and /dev/null differ

diff --git a/cxgb4/t5fw-1.21.5.0.bin b/cxgb4/t5fw-1.21.5.0.bin
new file mode 100644 (file)
index 0000000..da3a6ba
Binary files /dev/null and b/cxgb4/t5fw-1.21.5.0.bin differ

diff --git a/cxgb4/t5fw.bin b/cxgb4/t5fw.bin
index b19ffee66a20e27c854ba44f012462de3439bec7..e27e4f3cc5fd08a269fd28f1c83c44ab21f71c20 120000 (symlink)
--- a/cxgb4/t5fw.bin
+++ b/cxgb4/t5fw.bin
@@ -1 +1 @@
-t5fw-1.20.8.0.bin
\ No newline at end of file
+t5fw-1.21.5.0.bin
\ No newline at end of file

diff --git a/cxgb4/t6fw-1.20.8.0.bin b/cxgb4/t6fw-1.20.8.0.bin
deleted file mode 100644 (file)
index 7bcb8c8..0000000
Binary files a/cxgb4/t6fw-1.20.8.0.bin and /dev/null differ

diff --git a/cxgb4/t6fw-1.21.5.0.bin b/cxgb4/t6fw-1.21.5.0.bin
new file mode 100644 (file)
index 0000000..1dc3f23
Binary files /dev/null and b/cxgb4/t6fw-1.21.5.0.bin differ

diff --git a/cxgb4/t6fw.bin b/cxgb4/t6fw.bin
index 67dceb569b98706ad657e88289723e6cdc1c9c71..1434bcfeb3b49bc69051345be71df0bc429a9658 120000 (symlink)
--- a/cxgb4/t6fw.bin
+++ b/cxgb4/t6fw.bin
@@ -1 +1 @@
-t6fw-1.20.8.0.bin
\ No newline at end of file
+t6fw-1.21.5.0.bin
\ No newline at end of file