On Sat, Aug 30, 2025 at 4:34 AM Tao Liu <[email protected]> wrote: > Hi Lianbo, > > On Fri, Aug 29, 2025 at 9:17 PM lijiang <[email protected]> wrote: > > > > On Fri, Aug 29, 2025 at 2:16 PM < > [email protected]> wrote: > >> > >> Date: Mon, 11 Aug 2025 05:56:23 +0000 > >> From: Ajay Kaher <[email protected]> > >> Subject: [Crash-utility] [PATCH 2/2] vmware_guestdump: support segment > >> registers > >> To: [email protected] > >> Cc: [email protected], > >> [email protected], > [email protected], > >> [email protected] > >> Message-ID: <[email protected]> > >> > >> adding support for segment registers for vmware guest dumps. > >> > >> Signed-off-by: Ajay Kaher <[email protected]> > >> > >> --- > >> vmware_guestdump.c | 17 +++++++++++++++-- > >> 1 file changed, 15 insertions(+), 2 deletions(-) > >> > > > > when I tried to apply the patch[2], it failed with the following error. > Do you encounter the same issue? Tao. > > > > $ git am 2.patch > > Applying: vmware_guestdump: support segment registers > > error: patch failed: vmware_guestdump.c:107 > > error: vmware_guestdump.c: patch does not apply > > Patch failed at 0001 vmware_guestdump: support segment registers > > hint: Use 'git am --show-current-patch=diff' to see the failed patch > > hint: When you have resolved this problem, run "git am --continue". > > hint: If you prefer to skip this patch, run "git am --skip" instead. > > hint: To restore the original branch and stop patching, run "git am > --abort". > > hint: Disable this message with "git config set advice.mergeConflict > false" > > > Yeah, I saw it. But I can apply it with patch cmd with no problem. I > thought it was due to the restricted issue of git, so I overlooked >
Not sure what configuration caused the restriction, It's strange that I encountered this many times. > it... Anyway, I guess it is not a serious problem and can be fixed > during code merge. > > Sounds good. Thanks Lianbo
-- Crash-utility mailing list -- [email protected] To unsubscribe send an email to [email protected] https://${domain_name}/admin/lists/devel.lists.crash-utility.osci.io/ Contribution Guidelines: https://github.com/crash-utility/crash/wiki
