| Message ID | 20231216182740.3305724-1-sam@rfc1149.net (mailing list archive) |
|---|---|
| Headers | show |
| Series | Add "num-prio-bits" property for Cortex-M devices | expand |
> Samuel Tardieu (3): > hw/intc/armv7m_nvic: add "num-prio-bits" property > hw/arm/armv7m: alias the NVIC "num-prio-bits" property > hw/arm/socs: configure priority bits for existing SOCs Any idea to why patchew fails to apply thoses patches? The mbox at <https://patchew.org/QEMU/20231216182740.3305724-1-sam@rfc1149.net/> applies cleanly on master AFAICS. Sam
On Sun, 17 Dec 2023 at 07:37, Samuel Tardieu <sam@rfc1149.net> wrote: > > > > Samuel Tardieu (3): > > hw/intc/armv7m_nvic: add "num-prio-bits" property > > hw/arm/armv7m: alias the NVIC "num-prio-bits" property > > hw/arm/socs: configure priority bits for existing SOCs > > Any idea to why patchew fails to apply thoses patches? The mbox at > <https://patchew.org/QEMU/20231216182740.3305724-1-sam@rfc1149.net/> > applies cleanly on master AFAICS. This is because you put a Based-on: tag in the cover letter. Based-on: means "please apply this other patch first before this series, because there is a dependency" (we use it for things like "this patchset has to sit on top of some other cleanup patchset I sent last week and which hasn't got into git yet"). So patchew applied Anton's original patch from 2022, and then tried to apply your three patches on top of that, which caused a conflict. Anyway, I just wanted to say that this patchset is on my todo list to review but I'm not going to be able to get to it before I break for Christmas, so I'll get back to it in January. Thanks for the contribution! -- PMM
Peter Maydell <peter.maydell@linaro.org> writes: >> Any idea to why patchew fails to apply thoses patches? The mbox >> at >> <https://patchew.org/QEMU/20231216182740.3305724-1-sam@rfc1149.net/> >> applies cleanly on master AFAICS. > > This is because you put a Based-on: tag in the cover letter. > Based-on: means "please apply this other patch first before this > series, because there is a dependency" (we use it for things > like "this patchset has to sit on top of some other cleanup > patchset I sent last week and which hasn't got into git yet"). > So patchew applied Anton's original patch from 2022, and then > tried > to apply your three patches on top of that, which caused a > conflict. Thanks for the explanation. I thought "Based-on:" was just a polite way of attributing credit to past discussions. I'll keep that in mind. Do you want me to resubmit it as a v2 without the "Based-on:" tag so that patchew gets it right? > Anyway, I just wanted to say that this patchset is on my > todo list to review but I'm not going to be able to get to > it before I break for Christmas, so I'll get back to it > in January. Thanks for the contribution! Noted! Best. Sam
On Tue, 19 Dec 2023 at 19:15, Samuel Tardieu <sam@rfc1149.net> wrote: > > > Peter Maydell <peter.maydell@linaro.org> writes: > > >> Any idea to why patchew fails to apply thoses patches? The mbox > >> at > >> <https://patchew.org/QEMU/20231216182740.3305724-1-sam@rfc1149.net/> > >> applies cleanly on master AFAICS. > > > > This is because you put a Based-on: tag in the cover letter. > > Based-on: means "please apply this other patch first before this > > series, because there is a dependency" (we use it for things > > like "this patchset has to sit on top of some other cleanup > > patchset I sent last week and which hasn't got into git yet"). > > So patchew applied Anton's original patch from 2022, and then > > tried > > to apply your three patches on top of that, which caused a > > conflict. > > Thanks for the explanation. I thought "Based-on:" was just a > polite way of attributing credit to past discussions. I'll keep > that in mind. Do you want me to resubmit it as a v2 without the > "Based-on:" tag so that patchew gets it right? No, you don't need to do that. I can review it, and if it's OK I can apply it to my target-arm tree, based on what we have now. thanks -- PMM