On Wed, Mar 18, 2026 at 11:28:49AM +0800, Huang Shijie wrote:
> On Wed, Mar 18, 2026 at 11:19:09AM +0800, lijiang wrote:
> > Hi, Shijie
> > Thank you for the update.
> >
> > I can not apply your patch and get an error:
> > # git apply v4-1.patch
> > error: patch failed: ipcs.c:1150
> > error: ipcs.c: patch does not apply
> >
> > And it seems to have some patch conflicts, would you mind double checking?
> > That is very helpful for our review and testing.
> I also met the same issue when I apply the patch with the latest crash code.
> It seems it caused by the file format by ipcs.c
>
> Could you please try like this:
I missed one command here:
#git am xx.patch
> #git apply --reject xx.patch
> #git add -u
> #git am --continue
>
It still doesn't work for me. And I got a .rej patch, still need to modify them manually.
Lianbo.
Thanks
Huang Shijie