lists.openwall.net   lists  /  announce  owl-users  owl-dev  john-users  john-dev  passwdqc-users  yescrypt  popa3d-users  /  oss-security  kernel-hardening  musl  sabotage  tlsify  passwords  /  crypt-dev  xvendor  /  Bugtraq  Full-Disclosure  linux-kernel  linux-netdev  linux-ext4  linux-hardening  linux-cve-announce  PHC 
Open Source and information security mailing list archives
 
Hash Suite: Windows password security audit tool. GUI, reports in PDF.
[<prev] [next>] [<thread-prev] [thread-next>] [day] [month] [year] [list]
Date:   Fri, 6 Nov 2020 08:39:18 -0800
From:   Jakub Kicinski <kuba@...nel.org>
To:     Manivannan Sadhasivam <manivannan.sadhasivam@...aro.org>
Cc:     Loic Poulain <loic.poulain@...aro.org>, davem@...emloft.net,
        netdev@...r.kernel.org, linux-arm-msm@...r.kernel.org,
        bbhatt@...eaurora.org, willemdebruijn.kernel@...il.com,
        jhugo@...eaurora.org, hemantk@...eaurora.org
Subject: Re: [PATCH v10 1/2] bus: mhi: Add mhi_queue_is_full function

On Fri, 06 Nov 2020 21:58:12 +0530 Manivannan Sadhasivam wrote:
>>> Since you've applied now, what would you propose?  
>>
>> Do you need mhi_queue_is_full() in other branches, or are you just
>> concerned about the conflicts?
> 
> Yes, I need this patch in mhi-next.
> 
>> I'm assuming the concern is just about the mhi/core patch, or would 
>> you need to refactor something in the net driver as well?  
> 
> Just the mhi_queue_is_full() patch. 

Okay, I think you can just apply that patch to your tree again and git
should figure out it's a duplicate. Not optimal, because the change will
have two hashes, but the function is trivial, shouldn't be an issue
even if conflict happens.

Will you need it in wireless (ath11k), or only in other trees?

If it ends up in the wireless tree Dave or I will do the resolution when
we pull from Kalle so it won't even appear to Linus (but then it should
go into wireless through an immutable branch).

Powered by blists - more mailing lists