lkml.org 
[lkml]   [2020]   [May]   [12]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
/
SubjectRe: linux-next: manual merge of the net-next tree with the net tree
From
Date
On 2020/5/13 0:47, Jakub Kicinski wrote:

> On Tue, 12 May 2020 13:30:51 +1000 Stephen Rothwell wrote:
>> Hi all,
>>
>> Today's linux-next merge of the net-next tree got conflicts in:
>>
>> drivers/net/ethernet/huawei/hinic/hinic_hw_mgmt.c
>> drivers/net/ethernet/huawei/hinic/hinic_main.c
>>
>> between commit:
>>
>> e8a1b0efd632 ("hinic: fix a bug of ndo_stop")
>>
>> from the net tree and commit:
>>
>> 7dd29ee12865 ("hinic: add sriov feature support")
>>
>> from the net-next tree.
>>
>> I fixed it up (I think, see below) and can carry the fix as necessary. This
>> is now fixed as far as linux-next is concerned, but any non trivial
>> conflicts should be mentioned to your upstream maintainer when your tree
>> is submitted for merging. You may also want to consider cooperating
>> with the maintainer of the conflicting tree to minimise any particularly
>> complex conflicts.
> I had a feeling this was gonna happen :(
>
> Resolution looks correct, thank you!
>
> Luo bin, if you want to adjust the timeouts (you had slightly different
> ones depending on the command in the first version of the fix) - you can
> follow up with a patch to net-next once Dave merges net into net-next
> (usually happens every two weeks).

> OK. Thanks.
> .

\
 
 \ /
  Last update: 2020-05-13 03:52    [W:0.048 / U:0.444 seconds]
©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site