[Crash-utility] Re: [PATCH v4 0/4] xarray: add large folio support

On Wed, Mar 18, 2026 at 03:34:00PM +0800, lijiang wrote: > On Wed, Mar 18, 2026 at 11:35 AM Huang Shijie <huangsj(a)hygon.cn&gt; wrote: > > > 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. I guess the .rej patch is left by previous operations. So you`d better to use "git clean -xdf" before you do the "git-am". The following is my working log : ------------------------------------------------------ huangsj@SH-HV00110:~/crash-2$ git log --oneline -1 95c1b0a (HEAD -> master, origin/master, origin/HEAD) Fix for "help -r/-D" to display register values and notes[] huangsj@SH-HV00110:~/crash-2$ git am 0001-xarray-add-a-new-parameter-for-do_xarray.patch Applying: xarray: add a new parameter for do_xarray error: patch failed: ipcs.c:1150 error: ipcs.c: patch does not apply Patch failed at 0001 xarray: add a new parameter for do_xarray 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". huangsj@SH-HV00110:~/crash-2$ git apply --reject 0001-xarray-add-a-new-parameter-for-do_xarray.patch Checking patch bpf.c... Checking patch defs.h... Checking patch dev.c... Checking patch diskdump.c... Checking patch filesys.c... Checking patch ipcs.c... Checking patch kernel.c... Checking patch task.c... Applied patch bpf.c cleanly. Applied patch defs.h cleanly. Applied patch dev.c cleanly. Applied patch diskdump.c cleanly. Applied patch filesys.c cleanly. Applied patch ipcs.c cleanly. Applied patch kernel.c cleanly. Applied patch task.c cleanly. huangsj@SH-HV00110:~/crash-2$ git add -u huangsj@SH-HV00110:~/crash-2$ git am --continue Applying: xarray: add a new parameter for do_xarray ------------------------------------------------------ I do not see any .rej patch.