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 43a9aaa77fee9b784daa0dc88f0ee37764b9cbe0..b2a65bad46f02f672d7e8faab1204a1ec218e96a 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.23.3.0.bin
-Link: cxgb4/t4fw.bin -> t4fw-1.23.3.0.bin
+File: cxgb4/t4fw-1.23.4.0.bin
+Link: cxgb4/t4fw.bin -> t4fw-1.23.4.0.bin
 File: cxgb4/t5fw-1.14.4.0.bin
 File: cxgb4/t5fw-1.15.37.0.bin
-File: cxgb4/t5fw-1.23.3.0.bin
-Link: cxgb4/t5fw.bin -> t5fw-1.23.3.0.bin
-File: cxgb4/t6fw-1.23.3.0.bin
-Link: cxgb4/t6fw.bin -> t6fw-1.23.3.0.bin
+File: cxgb4/t5fw-1.23.4.0.bin
+Link: cxgb4/t5fw.bin -> t5fw-1.23.4.0.bin
+File: cxgb4/t6fw-1.23.4.0.bin
+Link: cxgb4/t6fw.bin -> t6fw-1.23.4.0.bin
 File: cxgb4/aq1202_fw.cld
 File: cxgb4/bcm8483.bin
 

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

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

diff --git a/cxgb4/t4fw.bin b/cxgb4/t4fw.bin
index 28155617e3081673813ce232d0125dbbbb11254f..1077346a039b0bccb64f7c565e3fd6d582307e26 120000 (symlink)
--- a/cxgb4/t4fw.bin
+++ b/cxgb4/t4fw.bin
@@ -1 +1 @@
-t4fw-1.23.3.0.bin
\ No newline at end of file
+t4fw-1.23.4.0.bin
\ No newline at end of file

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

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

diff --git a/cxgb4/t5fw.bin b/cxgb4/t5fw.bin
index 8b710d7e29b83c6ee2f492c101f42513700acd7f..4f2122573c317b40b2ed484155961bdb29970506 120000 (symlink)
--- a/cxgb4/t5fw.bin
+++ b/cxgb4/t5fw.bin
@@ -1 +1 @@
-t5fw-1.23.3.0.bin
\ No newline at end of file
+t5fw-1.23.4.0.bin
\ No newline at end of file

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

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

diff --git a/cxgb4/t6fw.bin b/cxgb4/t6fw.bin
index 5f3ec6568c3f8eb83efdcce8488f865a721d37d0..f66a538d227af5394d7747d1a34ebf41cf8676be 120000 (symlink)
--- a/cxgb4/t6fw.bin
+++ b/cxgb4/t6fw.bin
@@ -1 +1 @@
-t6fw-1.23.3.0.bin
\ No newline at end of file
+t6fw-1.23.4.0.bin
\ No newline at end of file