On 10/9/2016 8:14 PM, Linus Torvalds wrote:
> On Fri, Oct 7, 2016 at 3:24 PM, Doug Ledford <dledford@xxxxxxxxxx> wrote:
>>
>> 1) cxgb4 - keep the head version in your tree, my tree and the common
>> ancestor were prior to a refactoring in your tree that moved uld_attach
>> from cxgb4_main.c to cxgb4_uld.c
>
> Hmm. As far as I can tell, a proper merge also involves adding the line
>
> lld->fr_nsmr_tpte_wr_support = adap->params.fr_nsmr_tpte_wr_support;
>
> to uld_init() in cxgb4_uld.c.
>
> I did so, and it all seems to build find for me, but I obviously
> cannot do any testing. Somebody with the proper cxgb4 hardware should
> verify.
Thanks for that catch, we'll get it tested.
--
Doug Ledford <dledford@xxxxxxxxxx>
GPG Key ID: 0E572FDD
Attachment:
signature.asc
Description: OpenPGP digital signature
