Request updated/unified patch for OFED v3.2 update

[David P. Discher]

Thanks Hans ! - Just one issue … I was going to attempt to resolve myself, but the rej is just too large.

Attached: sys/ofed/drivers/infiniband/hw/mlx4/main.c.rej

-------------- next part --------------
A non-text attachment was scrubbed...
Name: main.c.rej
Type: application/octet-stream
Size: 20360 bytes
Desc: not available
URL: <http://lists.freebsd.org/pipermail/freebsd-infiniband/attachments/20160423/8b2b9a4c/attachment.obj>
-------------- next part --------------



|Index: sys/ofed/drivers/infiniband/hw/mlx4/main.c
|===================================================================
|--- sys/ofed/drivers/infiniband/hw/mlx4/main.c
|+++ sys/ofed/drivers/infiniband/hw/mlx4/main.c
--------------------------
Patching file sys/ofed/drivers/infiniband/hw/mlx4/main.c using Plan A...
Hunk #1 succeeded at 34.
Hunk #2 succeeded at 62.
Hunk #3 succeeded at 109.
Hunk #4 succeeded at 123.
Hunk #5 succeeded at 136.
Hunk #6 succeeded at 150.
Hunk #7 succeeded at 198.
Hunk #8 succeeded at 212.
Hunk #9 succeeded at 232.
Hunk #10 succeeded at 282.
Hunk #11 succeeded at 407.
Hunk #12 succeeded at 420.
Hunk #13 succeeded at 557.
Hunk #14 succeeded at 699.
Hunk #15 succeeded at 708.
Hunk #16 succeeded at 780.
Hunk #17 succeeded at 801.
Hunk #18 succeeded at 811.
Hunk #19 succeeded at 823.
Hunk #20 succeeded at 843.
Hunk #21 succeeded at 1040.
Hunk #22 succeeded at 1236.
Hunk #23 succeeded at 1262.
Hunk #24 succeeded at 1394.
Hunk #25 succeeded at 1437.
Hunk #26 succeeded at 1463.
Hunk #27 succeeded at 1478.
Hunk #28 succeeded at 1778.
Hunk #29 succeeded at 1842.
Hunk #30 succeeded at 1954.
Hunk #31 succeeded at 1965.
Hunk #32 succeeded at 2039.
Hunk #33 succeeded at 2071.
Hunk #34 succeeded at 2123.
Hunk #35 failed at 2144.
Hunk #36 succeeded at 2464 (offset 6 lines).
Hunk #37 succeeded at 2703 (offset 6 lines).
Hunk #38 succeeded at 2723 (offset 6 lines).
Hunk #39 succeeded at 2743 (offset 6 lines).
Hunk #40 succeeded at 2765 (offset 6 lines).
Hunk #41 succeeded at 2793 (offset 6 lines).
Hunk #42 failed at 2850.
Hunk #43 succeeded at 2889 (offset 1 line).
Hunk #44 succeeded at 2972 (offset 6 lines).
Hunk #45 succeeded at 3045 (offset 1 line).
Hunk #46 succeeded at 3070 (offset 6 lines).
Hunk #47 succeeded at 3112 (offset 1 line).
Hunk #48 succeeded at 3147 (offset 6 lines).
Hunk #49 succeeded at 3181 (offset 1 line).
Hunk #50 succeeded at 3224 (offset 6 lines).
Hunk #51 succeeded at 3248 (offset 1 line).
Hunk #52 succeeded at 3265 (offset 6 lines).
Hunk #53 succeeded at 3412 (offset 1 line).
Hunk #54 succeeded at 3438 (offset 6 lines).
Hunk #55 succeeded at 3477 (offset 1 line).
Hunk #56 succeeded at 3516 (offset 6 lines).
Hunk #57 succeeded at 3532 (offset 1 line).
Hunk #58 succeeded at 3553 (offset 6 lines).
2 out of 58 hunks failed--saving rejects to sys/ofed/drivers/infiniband/hw/mlx4/main.c.rej



-
David P. Discher
http://davidpdischer.com/
AIM: DavidDPD | Y!M: daviddpdz
Mobile: 408.368.3725



> On Apr 23, 2016, at 11:36 AM, Hans Petter Selasky <hps at selasky.org> wrote:
> 
> On 04/23/16 10:26, Hans Petter Selasky wrote:
>> On 04/23/16 01:08, David P. Discher wrote:
>>> Hans and Chris -
>>> 
>>> Any chance of getting an updated diff for the OFED 3.2 patches?  I
>>> love to see if I can reproduce Chris’s IPOIB performance.  I got a
>>> couple MT25208 InfiniHost III Ex I’d like to start using.
>>> 
>>> I grabbed the D5790-9 freebsd reviews diffs, and attempted to applied
>>> to -head at r298494 :
>>> 
>>> 
>> 
>> Yes, I'll update the patchset later today. It is broken because of some
>> changes I pushed upstream.
>> 
>> --HPS
> 
> Hi,
> 
> You'll need to refetch D5790, D5791 and D5797. Let me know if something still doesn't apply cleanly.
> 
> --HPS
> 

-------------- next part --------------
A non-text attachment was scrubbed...
Name: signature.asc
Type: application/pgp-signature
Size: 496 bytes
Desc: Message signed with OpenPGP using GPGMail
URL: <http://lists.freebsd.org/pipermail/freebsd-infiniband/attachments/20160423/8b2b9a4c/attachment.sig>