On Sat, Aug 30, 2025 at 2:04 AM Tao Liu <l...@redhat.com> wrote:
>
> Hi Lianbo,
>
> On Fri, Aug 29, 2025 at 9:17 PM lijiang <liji...@redhat.com> wrote:
> >
> > On Fri, Aug 29, 2025 at 2:16 PM <devel-requ...@lists.crash-utility.osci.io> 
> > wrote:
> >>
> >> Date: Mon, 11 Aug 2025 05:56:23 +0000
> >> From: Ajay Kaher <ajay.ka...@broadcom.com>
> >> Subject: [Crash-utility] [PATCH 2/2] vmware_guestdump: support segment
> >>         registers
> >> To: devel@lists.crash-utility.osci.io
> >> Cc: alexey.makha...@broadcom.com,
> >>         vamsi-krishna.brahmajosy...@broadcom.com, tapas.ku...@broadcom.com,
> >>         ajay.ka...@broadcom.com
> >> Message-ID: <20250811055623.179491-2-ajay.ka...@broadcom.com>
> >>
> >> adding support for segment registers for vmware guest dumps.
> >>
> >> Signed-off-by: Ajay Kaher <ajay.ka...@broadcom.com>
> >>
> >> ---
> >>  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
> it... Anyway, I guess it is not a serious problem and can be fixed
> during code merge.

Lianbo, Tao, thanks for the response.
I have rebased and posted as v2 of this patch.

- Ajay

Attachment: smime.p7s
Description: S/MIME Cryptographic Signature

--
Crash-utility mailing list -- devel@lists.crash-utility.osci.io
To unsubscribe send an email to devel-le...@lists.crash-utility.osci.io
https://${domain_name}/admin/lists/devel.lists.crash-utility.osci.io/
Contribution Guidelines: https://github.com/crash-utility/crash/wiki

Reply via email to