I assume you meant the branches: v5.10/standard/intel-sdk-5.10/intel-socfpga
and v5.10/standard/preempt-rt/intel-sdk-5.10/intel-socfpga Which is where I've merged this .. if not, you need to follow up with fixes. Bruce In message: [kernel-source][PATCH 1/1] [PATCH 5.10/intel-socfpga]firmware: stratix10-svc: fix a conflict caused by introducing upstream commit on 13/07/2022 Carlos Dominguez wrote: > This building issue is caused by the merge of stable kernel commit > 7027c890ff6b ("firmware: stratix10-svc: fix a missing check on list > iterator") that conflicts with sdk patch. So, adjust code to merge > sdk patch and upstream commit together. > > Signed-off-by: Meng Li <meng...@windriver.com> > Signed-off-by: Carlos Dominguez <carlos.doming...@windriver.com> > --- > drivers/firmware/stratix10-svc.c | 6 ++---- > 1 file changed, 2 insertions(+), 4 deletions(-) > > diff --git a/drivers/firmware/stratix10-svc.c > b/drivers/firmware/stratix10-svc.c > index 6e24649aa9bf..d9d1e00367ea 100644 > --- a/drivers/firmware/stratix10-svc.c > +++ b/drivers/firmware/stratix10-svc.c > @@ -1505,6 +1505,7 @@ void stratix10_svc_free_memory(struct > stratix10_svc_chan *chan, void *kaddr) > > list_for_each_entry(pmem, &svc_data_mem, node) > if (pmem->vaddr == kaddr) { > + memset(kaddr, 0, pmem->size); > gen_pool_free(chan->ctrl->genpool, > (unsigned long)kaddr, pmem->size); > pmem->vaddr = NULL; > @@ -1512,10 +1513,7 @@ void stratix10_svc_free_memory(struct > stratix10_svc_chan *chan, void *kaddr) > return; > } > > - memset(kaddr, 0, size); > - gen_pool_free(chan->ctrl->genpool, (unsigned long)kaddr, size); > - pmem->vaddr = NULL; > - list_del(&pmem->node); > + list_del(&svc_data_mem); > } > EXPORT_SYMBOL_GPL(stratix10_svc_free_memory); > > -- > 2.34.1 >
-=-=-=-=-=-=-=-=-=-=-=- Links: You receive all messages sent to this group. View/Reply Online (#11466): https://lists.yoctoproject.org/g/linux-yocto/message/11466 Mute This Topic: https://lists.yoctoproject.org/mt/92359005/21656 Group Owner: linux-yocto+ow...@lists.yoctoproject.org Unsubscribe: https://lists.yoctoproject.org/g/linux-yocto/unsub [arch...@mail-archive.com] -=-=-=-=-=-=-=-=-=-=-=-