Re: [PATCH v2 00/14] PPC440 devices misc clean up

[BALATON Zoltan]

On Thu, 6 Jul 2023, Daniel Henrique Barboza wrote:
> On 7/5/23 22:09, BALATON Zoltan wrote:
> > On Wed, 5 Jul 2023, Daniel Henrique Barboza wrote:
> > > Zoltan,
> > >
> > > Patches 1-9 are queued. Don't need to re-send those.
> >
> > Thanks, the last two patches are also reviewed and they don't depend on the 
> > ones before so you could queue those too.
>
> Just queued patch 13.
>
> Patch 14 doesn't apply in ppc-next even after applying patch 13:
>
> $ git am -s -m \[PATCH\ v2\ 14_14\]\ ppc440_pcix\:\ Stop\ using\ system\ io\ 
> region\ for\ PCI\ bus\ -\ BALATON\ Zoltan\ \<balaton@eik.bme.hu\>\ -\ 
> 2023-07-05\ 1712.eml
> Applying: ppc440_pcix: Stop using system io region for PCI bus
> error: patch failed: hw/ppc/ppc440_pcix.c:490
> error: hw/ppc/ppc440_pcix.c: patch does not apply
> error: patch failed: hw/ppc/sam460ex.c:441
> error: hw/ppc/sam460ex.c: patch does not apply
> Patch failed at 0001 ppc440_pcix: Stop using system io region for PCI bus
> hint: Use 'git am --show-current-patch=diff' to see the failed patch
> When you have resolved this problem, run "git am --continue".
> If you prefer to skip this patch, run "git am --skip" instead.
> To restore the original branch and stop patching, run "git am --abort".
>
> I suspect we need  some of the previous (10, 11, 12) to apply it cleanly.

There was only one place in context that differs. All I did was an 
interactive rebase with moving it to the front and it did not have any 
conflict. I've resent a v3 series with that so you can take the first 
patch from that (or the rest of that if we can reach a decision on 
naming). The first attempt had wrong dates so I've resent the series. 
Sorry about that.

Regards,
BALATON Zoltan