在 2020/2/3 22:03, Peter Maydell 写道:
On Mon, 3 Feb 2020 at 13:33, Heyi Guo <guoh...@huawei.com> wrote:
在 2020/2/3 14:43, Michael S. Tsirkin 写道:
On Mon, Feb 03, 2020 at 08:14:58AM +0800, Heyi Guo wrote:
Remove conflict _ADR objects, and fix and refine PCI device definition in
ACPI/DSDT.
Cc: Peter Maydell <peter.mayd...@linaro.org>
Cc: "Michael S. Tsirkin" <m...@redhat.com>
Cc: Igor Mammedov <imamm...@redhat.com>
Cc: Shannon Zhao <shannon.zha...@gmail.com>
Cc: qemu-...@nongnu.org
Cc: qemu-devel@nongnu.org
Series
Reviewed-by: Michael S. Tsirkin <m...@redhat.com>
merge through ARM tree pls.
Thanks, Michael :)
Hi Peter,
Do I need to send v3 to update the commit message of patch 4/7 as
Michael suggested?
This patchset seems to be corrupt somehow:
e104462:bionic:qemu$ patches apply -s
id:20200203001505.52573-1-guoh...@huawei.com
Applying: bios-tables-test: prepare to change ARM virt ACPI DSDT
Applying: arm/virt/acpi: remove meaningless sub device "RP0" from PCI0
Applying: arm/virt/acpi: remove _ADR from devices identified by _HID
Applying: arm/acpi: fix PCI _PRT definition
Applying: arm/acpi: fix duplicated _UID of PCI interrupt link devices
Applying: arm/acpi: simplify the description of PCI _CRS
Applying: virt/acpi: update golden masters for DSDT update
error: corrupt patch at line 68
error: could not build fake ancestor
hint: Use 'git am --show-current-patch' to see the failed patch
Patch failed at 0007 virt/acpi: update golden masters for DSDT update
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".
Patchew didn't like it either:
https://patchew.org/QEMU/20200203001505.52573-1-guoh...@huawei.com/
I think the problem here is the quoting of the diff in
the commit message of patch 7: git am and friends think
that is part of the actual patch body and get confused.
You might be able to avoid that by not putting the
diff --git a/DSDT.dsl.orig b/DSDT.dsl
index ed3e5f0fa9..10cf70c886 100644
--- a/DSDT.dsl.orig
+++ b/DSDT.dsl
part in the commit message, but I haven't tested that.
So resending a v4 would probably be a good idea anyway.
Sorry for trouble. I should have tried locally before sending the patch.
Yes, removing the above 4 lines help git am success.
I'll send a v3.
Thanks,
Heyi
thanks
-- PMM
.
