Re: [PATCH RESEND] dt-bindings: crypto: qcom,inline-crypto-engine: Document Nord ICE

[Bartosz Golaszewski]

On Mon, 6 Jul 2026 19:33:37 +0200, Krzysztof Kozlowski <krzk@xxxxxxxxxx> said:
> On 06/07/2026 19:13, Bartosz Golaszewski wrote:
>> On Mon, 6 Jul 2026 08:54:22 +0200, Krzysztof Kozlowski <krzk@xxxxxxxxxx> said:
>>> On Sun, Jul 05, 2026 at 11:15:45PM +0530, Kuldeep Singh wrote:
>>>> On 04-07-2026 06:14, Shawn Guo wrote:
>>>>> Document Inline Crypto Engine (ICE) on Qualcomm Nord SoC.
>>>>>
>>>>> Acked-by: Krzysztof Kozlowski <krzysztof.kozlowski@xxxxxxxxxxxxxxxx>
>>>>> Reviewed-by: Harshal Dev <harshal.dev@xxxxxxxxxxxxxxxx>
>>>>> Signed-off-by: Shawn Guo <shengchao.guo@xxxxxxxxxxxxxxxx>
>>>>> ---
>>>>
>>>> With below patch, we don't need nord entry here.
>>>> https://lore.kernel.org/lkml/20260702-b4-shikra_crypto_changse-v2-1-66173f2f28b3@xxxxxxxxxxxxxxxx/
>>>
>>> Patch has conflict. This (Nord) should go after above one, with this
>>> fixed.
>>>
>>
>> The other series still hasn't made its way upstream. This one's simple, can we
>> queue it now and rebase the other one?
>
> This is not point of rebase, but conflicting work.
>

I'm not following. This applies fine on top of current linux-next. Whatever
ongoing work conflicts with it, will have to be rebased when this patch makes
its way into next. Am I missing something?

Bart