On Thu, 20 Dec 2018 14:52:49 +0000 Peter Maydell <peter.mayd...@linaro.org> wrote:
> On Thu, 20 Dec 2018 at 14:50, Igor Mammedov <imamm...@redhat.com> wrote: > > > > On Wed, 19 Dec 2018 19:15:26 +0000 > > Peter Maydell <peter.mayd...@linaro.org> wrote: > > > Hi; I'm afraid I get conflicts in some files which look > > > too complicated for me to want to try to resolve at this end: > > > Auto-merging tests/vmgenid-test.c > > > CONFLICT (content): Merge conflict in tests/vmgenid-test.c > > > Auto-merging tests/bios-tables-test.c > > > CONFLICT (content): Merge conflict in tests/bios-tables-test.c > > > Auto-merging tests/acpi-utils.h > > > CONFLICT (content): Merge conflict in tests/acpi-utils.h > > > Auto-merging tests/acpi-utils.c > > > CONFLICT (content): Merge conflict in tests/acpi-utils.c > > > Removing include/hw/smbios/ipmi.h > > > > I'm working on fixing conflicts due to 29/30 and will include conflicting > > patch in my acpi tests cleanup on respin > > > > Meanwhile could you drop 29/30 and apply the rest of pull request (which > > applies just fine)? > > I can't apply a partial pull request -- MST will need to > drop those patches and send a v2. ok I'll post fixed up patch here for MST to pick it up PS: /me need to learn how to do pull requests > > thanks > -- PMM
