I've done an audit of all of the patches noted above. All of them are officially upstream. Some landed in 3.19, while the rest are in 4.0-rc1. It breaks down as follows:
git describe --contains ca9f9f703950e5cb300526549b4f1b0a6605a5c5 v3.15-rc1~113^2~263^2
commit ca9f9f703950e5cb300526549b4f1b0a6605a5c5 Author: Amir Vadai <email address hidden> Date: Tue Feb 25 18:17:52 2014 +0200
net/mlx4_en: Fix bad use of dev_id
git describe --contains adbc7ac5c15eb5e9d70393428345e72a1a897d6a v3.19-rc1~118^2~332^2~10
commit adbc7ac5c15eb5e9d70393428345e72a1a897d6a Author: Saeed Mahameed <email address hidden> Date: Mon Oct 27 11:37:37 2014 +0200
net/mlx4_core: Introduce ACCESS_REG CMD and eth_prot_ctrl dev cap
git describe --contains a53e3e8c1db547981e13d1ebf24a659bd4e87710 v3.19-rc1~118^2~332^2~9
commit a53e3e8c1db547981e13d1ebf24a659bd4e87710 Author: Saeed Mahameed <email address hidden> Date: Mon Oct 27 11:37:38 2014 +0200
net/mlx4_core: Add ethernet backplane autoneg device capability
git describe --contains d475c95b4bcff983ac76e8522bfd2d29bcc567d0 v3.19-rc1~118^2~294^2
commit d475c95b4bcff983ac76e8522bfd2d29bcc567d0 Author: Matan Barak <email address hidden> Date: Sun Nov 2 16:26:17 2014 +0200
net/mlx4_core: Add retrieval of CONFIG_DEV parameters
git describe --contains dd65beac48a5259945846956d4b27344dfb73bd9 v3.19-rc1~118^2~228^2~1
commit dd65beac48a5259945846956d4b27344dfb73bd9 Author: Shani Michaeli <email address hidden> Date: Sun Nov 9 13:51:52 2014 +0200
net/mlx4_en: Extend usage of napi_gro_frags
git describe --contains f8c6455bb04b944edb69e9b074e28efee2c56bdd v3.19-rc1~118^2~228^2
commit f8c6455bb04b944edb69e9b074e28efee2c56bdd Author: Shani Michaeli <email address hidden> Date: Sun Nov 9 13:51:53 2014 +0200
net/mlx4_en: Extend checksum offloading by CHECKSUM COMPLETE
git describe --contains ffc39f6d6fff2878c55ffa5ffb1828d7618c0a29 v3.19-rc1~118^2~192^2~4
commit ffc39f6d6fff2878c55ffa5ffb1828d7618c0a29 Author: Matan Barak <email address hidden> Date: Thu Nov 13 14:45:29 2014 +0200
net/mlx4_core: Refactor mlx4_cmd_init and mlx4_cmd_cleanup
git describe --contains a0eacca948d2d4531a393d82a736ff19b7b8fa0b v3.19-rc1~118^2~192^2~3
commit a0eacca948d2d4531a393d82a736ff19b7b8fa0b Author: Matan Barak <email address hidden> Date: Thu Nov 13 14:45:30 2014 +0200
net/mlx4_core: Refactor mlx4_load_one
git describe --contains e8c4265bea8437f5583d0c2f272058200ebc10ff v3.19-rc1~118^2~192^2~2
commit e8c4265bea8437f5583d0c2f272058200ebc10ff Author: Matan Barak <email address hidden> Date: Thu Nov 13 14:45:31 2014 +0200
net/mlx4_core: Add QUERY_FUNC firmware command
git describe --contains 7ae0e400cd9396c41fe596d35dcc34feaa89a04f v3.19-rc1~118^2~192^2~1
commit 7ae0e400cd9396c41fe596d35dcc34feaa89a04f Author: Matan Barak <email address hidden> Date: Thu Nov 13 14:45:32 2014 +0200
net/mlx4_core: Flexible (asymmetric) allocation of EQs and MSI-X vectors for PF/VFs
git describe --contains da315679e80635021e98de1306ff4eee0759ba57 v3.19-rc1~32^2~28^2~1
commit da315679e80635021e98de1306ff4eee0759ba57 Author: Matan Barak <email address hidden> Date: Sun Dec 14 16:18:04 2014 +0200
net/mlx4_core: Fixed memory leak and incorrect refcount in mlx4_load_one
git describe --contains 225c6c8c6bbbc32455df3d1c0fb1e1e1fb51c533 v3.19-rc1~118^2~192^2~5
commit 225c6c8c6bbbc32455df3d1c0fb1e1e1fb51c533 Author: Matan Barak <email address hidden> Date: Thu Nov 13 14:45:28 2014 +0200
net/mlx4_core: Use correct variable type for mlx4_slave_cap
git describe --contains de966c5928026b100a989c8cef761d306310a184 v3.19-rc1~118^2~192^2
commit de966c5928026b100a989c8cef761d306310a184 Author: Matan Barak <email address hidden> Date: Thu Nov 13 14:45:33 2014 +0200
net/mlx4_core: Support more than 64 VFs
git describe --contains 383677da43fa83b390888cf7d25885166b2a6812 v3.19-rc1~118^2~2^2~8
commit 383677da43fa83b390888cf7d25885166b2a6812 Author: Or Gerlitz <email address hidden> Date: Thu Dec 11 10:57:52 2014 +0200
net/mlx4_core: Mask out host side virtualization features for guests
git describe --contains ddae0349fdb78bcc5e7219061847012aa1a29069 v3.19-rc1~118^2~2^2~6
commit ddae0349fdb78bcc5e7219061847012aa1a29069 Author: Eugenia Emantayev <email address hidden> Date: Thu Dec 11 10:57:54 2014 +0200
net/mlx4: Change QP allocation scheme
git describe --contains 431df8c7e9708433459fd806a08308997de43121 v3.19-rc1~118^2~2^2~1
commit 431df8c7e9708433459fd806a08308997de43121 Author: Matan Barak <email address hidden> Date: Thu Dec 11 10:57:59 2014 +0200
net/mlx4: Refactor QUERY_PORT
git describe --contains ab256e5ad02b36951f01bf6b5cfda25f14820847 v3.19-rc1~118^2~2^2~5
commit ab256e5ad02b36951f01bf6b5cfda25f14820847 Author: Dotan Barak <email address hidden> Date: Thu Dec 11 10:57:55 2014 +0200
net/mlx4: Add a check if there are too many reserved QPs
git describe --contains d57febe1a47801ef8a55dbf10672850523dfaa60 v3.19-rc1~118^2~2^2~3
commit d57febe1a47801ef8a55dbf10672850523dfaa60 Author: Matan Barak <email address hidden> Date: Thu Dec 11 10:57:57 2014 +0200
net/mlx4: Add A0 hybrid steering
git describe --contains 7d077cd34eabb2ffd05abe0f2cad01da1ef11712 v3.19-rc1~118^2~2^2
commit 7d077cd34eabb2ffd05abe0f2cad01da1ef11712 Author: Matan Barak <email address hidden> Date: Thu Dec 11 10:58:00 2014 +0200
net/mlx4: Add support for A0 steering
git describe --contains 7a89399ffad7b7c47b43afda010309b3b88538c0 v3.19-rc1~118^2~2^2~4
commit 7a89399ffad7b7c47b43afda010309b3b88538c0 Author: Matan Barak <email address hidden> Date: Thu Dec 11 10:57:56 2014 +0200
net/mlx4: Add mlx4_bitmap zone allocator
git describe --contains 872bf2fb69d90e3619befee842fc26db39d8e475 v4.0-rc1~133^2~151^2~8
commit 872bf2fb69d90e3619befee842fc26db39d8e475 Author: Yishai Hadas <email address hidden> Date: Sun Jan 25 16:59:35 2015 +0200
net/mlx4_core: Maintain a persistent memory for mlx4 device
git describe --contains dd0eefe3abbf47442db296bf68f27eb2860c1cdf v4.0-rc1~133^2~151^2~7
commit dd0eefe3abbf47442db296bf68f27eb2860c1cdf Author: Yishai Hadas <email address hidden> Date: Sun Jan 25 16:59:36 2015 +0200
net/mlx4_core: Set device configuration data to be persistent across reset
git describe --contains ad9a0bf08ffbf32b8f292c3bb78ca0f24bb8f6b2 v4.0-rc1~133^2~151^2~6
commit ad9a0bf08ffbf32b8f292c3bb78ca0f24bb8f6b2 Author: Yishai Hadas <email address hidden> Date: Sun Jan 25 16:59:37 2015 +0200
net/mlx4_core: Refactor the catas flow to work per device
git describe --contains f6bc11e42646e661e699a5593cbd1e9dba7191d0 v4.0-rc1~133^2~151^2~5
commit f6bc11e42646e661e699a5593cbd1e9dba7191d0 Author: Yishai Hadas <email address hidden> Date: Sun Jan 25 16:59:38 2015 +0200
net/mlx4_core: Enhance the catas flow to support device reset
git describe --contains f5aef5aa35063f2b45c3605871cd525d0cb7fb7a v4.0-rc1~133^2~151^2~4
commit f5aef5aa35063f2b45c3605871cd525d0cb7fb7a Author: Yishai Hadas <email address hidden> Date: Sun Jan 25 16:59:39 2015 +0200
net/mlx4_core: Activate reset flow upon fatal command cases
git describe --contains c69453e294c9f16da977b68e658a8028b854c209 v4.0-rc1~133^2~151^2~3
commit c69453e294c9f16da977b68e658a8028b854c209 Author: Yishai Hadas <email address hidden> Date: Sun Jan 25 16:59:40 2015 +0200
net/mlx4_core: Manage interface state for Reset flow cases
git describe --contains 2ba5fbd62b2534335f4e3b844ecc7860115525a3 v4.0-rc1~133^2~151^2~2
commit 2ba5fbd62b2534335f4e3b844ecc7860115525a3 Author: Yishai Hadas <email address hidden> Date: Sun Jan 25 16:59:41 2015 +0200
net/mlx4_core: Handle AER flow properly
git describe --contains 55ad359225b2232b9b8f04a0dfa169bd3a7d86d2 v4.0-rc1~133^2~151^2~1
commit 55ad359225b2232b9b8f04a0dfa169bd3a7d86d2 Author: Yishai Hadas <email address hidden> Date: Sun Jan 25 16:59:42 2015 +0200
net/mlx4_core: Enable device recovery flow with SRIOV
git describe --contains 0cd9302734111abc0b5912b695336f2ee63cb22b v4.0-rc1~133^2~151^2
commit 0cd9302734111abc0b5912b695336f2ee63cb22b Author: Yishai Hadas <email address hidden> Date: Sun Jan 25 16:59:43 2015 +0200
net/mlx4_core: Reset flow activation upon SRIOV fatal command cases
I've done an audit of all of the patches noted above. All of them are officially upstream. Some landed in 3.19, while the rest are in 4.0-rc1. It breaks down as follows:
git describe --contains ca9f9f703950e5c b300526549b4f1b 0a6605a5c5 113^2~263^ 2
v3.15-rc1~
commit ca9f9f703950e5c b300526549b4f1b 0a6605a5c5
Author: Amir Vadai <email address hidden>
Date: Tue Feb 25 18:17:52 2014 +0200
net/mlx4_en: Fix bad use of dev_id
git describe --contains adbc7ac5c15eb5e 9d70393428345e7 2a1a897d6a 118^2~332^ 2~10
v3.19-rc1~
commit adbc7ac5c15eb5e 9d70393428345e7 2a1a897d6a
Author: Saeed Mahameed <email address hidden>
Date: Mon Oct 27 11:37:37 2014 +0200
net/mlx4_core: Introduce ACCESS_REG CMD and eth_prot_ctrl dev cap
git describe --contains a53e3e8c1db5479 81e13d1ebf24a65 9bd4e87710 118^2~332^ 2~9
v3.19-rc1~
commit a53e3e8c1db5479 81e13d1ebf24a65 9bd4e87710
Author: Saeed Mahameed <email address hidden>
Date: Mon Oct 27 11:37:38 2014 +0200
net/mlx4_core: Add ethernet backplane autoneg device capability
git describe --contains d475c95b4bcff98 3ac76e8522bfd2d 29bcc567d0 118^2~294^ 2
v3.19-rc1~
commit d475c95b4bcff98 3ac76e8522bfd2d 29bcc567d0
Author: Matan Barak <email address hidden>
Date: Sun Nov 2 16:26:17 2014 +0200
net/mlx4_core: Add retrieval of CONFIG_DEV parameters
git describe --contains dd65beac48a5259 945846956d4b273 44dfb73bd9 118^2~228^ 2~1
v3.19-rc1~
commit dd65beac48a5259 945846956d4b273 44dfb73bd9
Author: Shani Michaeli <email address hidden>
Date: Sun Nov 9 13:51:52 2014 +0200
net/mlx4_en: Extend usage of napi_gro_frags
git describe --contains f8c6455bb04b944 edb69e9b074e28e fee2c56bdd 118^2~228^ 2
v3.19-rc1~
commit f8c6455bb04b944 edb69e9b074e28e fee2c56bdd
Author: Shani Michaeli <email address hidden>
Date: Sun Nov 9 13:51:53 2014 +0200
net/mlx4_en: Extend checksum offloading by CHECKSUM COMPLETE
git describe --contains ffc39f6d6fff287 8c55ffa5ffb1828 d7618c0a29 118^2~192^ 2~4
v3.19-rc1~
commit ffc39f6d6fff287 8c55ffa5ffb1828 d7618c0a29
Author: Matan Barak <email address hidden>
Date: Thu Nov 13 14:45:29 2014 +0200
net/mlx4_core: Refactor mlx4_cmd_init and mlx4_cmd_cleanup
git describe --contains a0eacca948d2d45 31a393d82a736ff 19b7b8fa0b 118^2~192^ 2~3
v3.19-rc1~
commit a0eacca948d2d45 31a393d82a736ff 19b7b8fa0b
Author: Matan Barak <email address hidden>
Date: Thu Nov 13 14:45:30 2014 +0200
net/mlx4_core: Refactor mlx4_load_one
git describe --contains e8c4265bea8437f 5583d0c2f272058 200ebc10ff 118^2~192^ 2~2
v3.19-rc1~
commit e8c4265bea8437f 5583d0c2f272058 200ebc10ff
Author: Matan Barak <email address hidden>
Date: Thu Nov 13 14:45:31 2014 +0200
net/mlx4_core: Add QUERY_FUNC firmware command
git describe --contains 7ae0e400cd9396c 41fe596d35dcc34 feaa89a04f 118^2~192^ 2~1
v3.19-rc1~
commit 7ae0e400cd9396c 41fe596d35dcc34 feaa89a04f
Author: Matan Barak <email address hidden>
Date: Thu Nov 13 14:45:32 2014 +0200
net/mlx4_core: Flexible (asymmetric) allocation of EQs and MSI-X vectors for PF/VFs
git describe --contains da315679e806350 21e98de1306ff4e ee0759ba57 32^2~28^ 2~1
v3.19-rc1~
commit da315679e806350 21e98de1306ff4e ee0759ba57
Author: Matan Barak <email address hidden>
Date: Sun Dec 14 16:18:04 2014 +0200
net/mlx4_core: Fixed memory leak and incorrect refcount in mlx4_load_one
git describe --contains 225c6c8c6bbbc32 455df3d1c0fb1e1 e1fb51c533 118^2~192^ 2~5
v3.19-rc1~
commit 225c6c8c6bbbc32 455df3d1c0fb1e1 e1fb51c533
Author: Matan Barak <email address hidden>
Date: Thu Nov 13 14:45:28 2014 +0200
net/mlx4_core: Use correct variable type for mlx4_slave_cap
git describe --contains de966c5928026b1 00a989c8cef761d 306310a184 118^2~192^ 2
v3.19-rc1~
commit de966c5928026b1 00a989c8cef761d 306310a184
Author: Matan Barak <email address hidden>
Date: Thu Nov 13 14:45:33 2014 +0200
net/mlx4_core: Support more than 64 VFs
git describe --contains 383677da43fa83b 390888cf7d25885 166b2a6812 118^2~2^ 2~8
v3.19-rc1~
commit 383677da43fa83b 390888cf7d25885 166b2a6812
Author: Or Gerlitz <email address hidden>
Date: Thu Dec 11 10:57:52 2014 +0200
net/mlx4_core: Mask out host side virtualization features for guests
git describe --contains ddae0349fdb78bc c5e721906184701 2aa1a29069 118^2~2^ 2~6
v3.19-rc1~
commit ddae0349fdb78bc c5e721906184701 2aa1a29069
Author: Eugenia Emantayev <email address hidden>
Date: Thu Dec 11 10:57:54 2014 +0200
net/mlx4: Change QP allocation scheme
git describe --contains 431df8c7e970843 3459fd806a08308 997de43121 118^2~2^ 2~1
v3.19-rc1~
commit 431df8c7e970843 3459fd806a08308 997de43121
Author: Matan Barak <email address hidden>
Date: Thu Dec 11 10:57:59 2014 +0200
net/mlx4: Refactor QUERY_PORT
git describe --contains ab256e5ad02b369 51f01bf6b5cfda2 5f14820847 118^2~2^ 2~5
v3.19-rc1~
commit ab256e5ad02b369 51f01bf6b5cfda2 5f14820847
Author: Dotan Barak <email address hidden>
Date: Thu Dec 11 10:57:55 2014 +0200
net/mlx4: Add a check if there are too many reserved QPs
git describe --contains d57febe1a47801e f8a55dbf1067285 0523dfaa60 118^2~2^ 2~3
v3.19-rc1~
commit d57febe1a47801e f8a55dbf1067285 0523dfaa60
Author: Matan Barak <email address hidden>
Date: Thu Dec 11 10:57:57 2014 +0200
net/mlx4: Add A0 hybrid steering
git describe --contains 7d077cd34eabb2f fd05abe0f2cad01 da1ef11712
v3.19-rc1~118^2~2^2
commit 7d077cd34eabb2f fd05abe0f2cad01 da1ef11712
Author: Matan Barak <email address hidden>
Date: Thu Dec 11 10:58:00 2014 +0200
net/mlx4: Add support for A0 steering
git describe --contains 7a89399ffad7b7c 47b43afda010309 b3b88538c0 118^2~2^ 2~4
v3.19-rc1~
commit 7a89399ffad7b7c 47b43afda010309 b3b88538c0
Author: Matan Barak <email address hidden>
Date: Thu Dec 11 10:57:56 2014 +0200
net/mlx4: Add mlx4_bitmap zone allocator
git describe --contains 872bf2fb69d90e3 619befee842fc26 db39d8e475 133^2~151^ 2~8
v4.0-rc1~
commit 872bf2fb69d90e3 619befee842fc26 db39d8e475
Author: Yishai Hadas <email address hidden>
Date: Sun Jan 25 16:59:35 2015 +0200
net/mlx4_core: Maintain a persistent memory for mlx4 device
git describe --contains dd0eefe3abbf474 42db296bf68f27e b2860c1cdf 133^2~151^ 2~7
v4.0-rc1~
commit dd0eefe3abbf474 42db296bf68f27e b2860c1cdf
Author: Yishai Hadas <email address hidden>
Date: Sun Jan 25 16:59:36 2015 +0200
net/mlx4_core: Set device configuration data to be persistent across reset
git describe --contains ad9a0bf08ffbf32 b8f292c3bb78ca0 f24bb8f6b2 133^2~151^ 2~6
v4.0-rc1~
commit ad9a0bf08ffbf32 b8f292c3bb78ca0 f24bb8f6b2
Author: Yishai Hadas <email address hidden>
Date: Sun Jan 25 16:59:37 2015 +0200
net/mlx4_core: Refactor the catas flow to work per device
git describe --contains f6bc11e42646e66 1e699a5593cbd1e 9dba7191d0 133^2~151^ 2~5
v4.0-rc1~
commit f6bc11e42646e66 1e699a5593cbd1e 9dba7191d0
Author: Yishai Hadas <email address hidden>
Date: Sun Jan 25 16:59:38 2015 +0200
net/mlx4_core: Enhance the catas flow to support device reset
git describe --contains f5aef5aa35063f2 b45c3605871cd52 5d0cb7fb7a 133^2~151^ 2~4
v4.0-rc1~
commit f5aef5aa35063f2 b45c3605871cd52 5d0cb7fb7a
Author: Yishai Hadas <email address hidden>
Date: Sun Jan 25 16:59:39 2015 +0200
net/mlx4_core: Activate reset flow upon fatal command cases
git describe --contains c69453e294c9f16 da977b68e658a80 28b854c209 133^2~151^ 2~3
v4.0-rc1~
commit c69453e294c9f16 da977b68e658a80 28b854c209
Author: Yishai Hadas <email address hidden>
Date: Sun Jan 25 16:59:40 2015 +0200
net/mlx4_core: Manage interface state for Reset flow cases
git describe --contains 2ba5fbd62b25343 35f4e3b844ecc78 60115525a3 133^2~151^ 2~2
v4.0-rc1~
commit 2ba5fbd62b25343 35f4e3b844ecc78 60115525a3
Author: Yishai Hadas <email address hidden>
Date: Sun Jan 25 16:59:41 2015 +0200
net/mlx4_core: Handle AER flow properly
git describe --contains 55ad359225b2232 b9b8f04a0dfa169 bd3a7d86d2 133^2~151^ 2~1
v4.0-rc1~
commit 55ad359225b2232 b9b8f04a0dfa169 bd3a7d86d2
Author: Yishai Hadas <email address hidden>
Date: Sun Jan 25 16:59:42 2015 +0200
net/mlx4_core: Enable device recovery flow with SRIOV
git describe --contains 55ad359225b2232 b9b8f04a0dfa169 bd3a7d86d2 133^2~151^ 2~1
v4.0-rc1~
commit 55ad359225b2232 b9b8f04a0dfa169 bd3a7d86d2
Author: Yishai Hadas <email address hidden>
Date: Sun Jan 25 16:59:42 2015 +0200
net/mlx4_core: Enable device recovery flow with SRIOV
git describe --contains 0cd9302734111ab c0b5912b695336f 2ee63cb22b 133^2~151^ 2
v4.0-rc1~
commit 0cd9302734111ab c0b5912b695336f 2ee63cb22b
Author: Yishai Hadas <email address hidden>
Date: Sun Jan 25 16:59:43 2015 +0200
net/mlx4_core: Reset flow activation upon SRIOV fatal command cases