lkml.org 
[lkml]   [2023]   [Feb]   [6]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
/
Date
SubjectRe: [PATCH 00/37] nvmem: patches for 6.3
From


On 06/02/2023 07:46, Greg KH wrote:
> On Mon, Feb 06, 2023 at 08:45:29AM +0100, Greg KH wrote:
>> On Mon, Jan 30, 2023 at 03:54:58PM +0000, Srinivas Kandagatla wrote:
>>>
>>>
>>> On 30/01/2023 11:59, Greg KH wrote:
>>>> On Mon, Jan 30, 2023 at 11:27:06AM +0000, Srinivas Kandagatla wrote:
>>>>>
>>>>>
>>>>> On 28/01/2023 13:43, Greg KH wrote:
>>>>>> On Fri, Jan 27, 2023 at 11:15:28AM +0000, Srinivas Kandagatla wrote:
>>>>>>> Hi Greg,
>>>>>>>
>>>>>>> Here are some nvmem patches bit more than usual for 6.3 which includes
>>>>>>>
>>>>>>> - Adding support for nvmem layouts, thanks to Michael and Miquel for
>>>>>>> driving this effort.
>>>>>>> - Add support to stm32 STM32MP15x OPTEE based nvmem provider
>>>>>>> - Updated to qfprom bindings to include various Qualcomm SoCs.
>>>>>>> - adding sl28vpd provider layout
>>>>>>> - move imx provider to use new layout apis
>>>>>>> - add ONIE provider layout.
>>>>>>> - new helper eth_addr_add().
>>>>>>> - few minor enhancements to core and providersdrivers.
>>>>>>>
>>>>>>> Can you please queue them up for 6.3.
>>>>>>
>>>>>> This series does NOT apply to my char-misc-next branch, which is based
>>>>>> on 6.2-rc5. What did you generate it against?
>>>>>>
>>>>> These were on top of nvmem-fixes based on 6.2-rc1.
>>>>
>>>> Ah, always say that please.
>>> My bad, I assumed that fixes will be applied and then these patches. But I
>>> should have mentioned this clearly.
>>>
>>>>
>>>>>> Can you rebase it and resend?
>>>>>
>>>>> char-misc-next does not have nvmem-fixes yet, which branch should I rebase
>>>>> these on?
>>>>
>>>> char-misc-next please. If there are going to be merge conflicts when
>>>> the char-misc-linus branch gets merged into that with these changes, > please let me know.
>>>
>>> Yes, for sure this is going to conflict. some of the patches in this set are
>>> on top of fixes.
>>
>> Ok, now that the char-misc-linus branch is merged into my -next branch,
>> I've applied these.
>
> Nope, lots of errors:
>
> Commit: b4fee523c0d7 ("nvmem: stm32: fix OPTEE dependency")
> Fixes tag: Fixes: ae46fd89cc0cc ("nvmem: stm32: add OP-TEE support for STM32MP13x")
> Has these problem(s):
> - Target SHA1 does not exist
> Commit: b6dc9d9a156a ("of: property: fix #nvmem-cell-cells parsing")
> Fixes tag: Fixes: 6a80b3e6fb41 ("of: property: make #.*-cells optional for simple props")
> Has these problem(s):
> - Target SHA1 does not exist
> Commit: 57a71161cecb ("nvmem: core: fix nvmem_layout_get_match_data()")
> Fixes tag: Fixes: f61a093b4a0e ("nvmem: core: introduce NVMEM layouts")
> Has these problem(s):
> - Target SHA1 does not exist
> Commit: 8e1cd6f05f71 ("nvmem: core: return -ENOENT if nvmem cell is not found")
> Fixes tag: Fixes: e894d5ad177c ("nvmem: core: add an index parameter to the cell")
> Has these problem(s):
> - Target SHA1 does not exist
>
>
> Can you please fix this up and resend?
>
thanks Greg for trying out.
Sure, will rebase on top of char-misc-next

--srini
> thanks,
>
> greg k-h

\
 
 \ /
  Last update: 2023-03-27 00:10    [W:0.047 / U:1.216 seconds]
©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site