From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:46276) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1YUumG-0000FF-An for qemu-devel@nongnu.org; Mon, 09 Mar 2015 06:19:13 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1YUumB-0005mS-Bk for qemu-devel@nongnu.org; Mon, 09 Mar 2015 06:19:12 -0400 Message-ID: <1425896323.20588.15.camel@nilsson.home.kraxel.org> From: Gerd Hoffmann Date: Mon, 09 Mar 2015 11:18:43 +0100 In-Reply-To: <54FD65F0.1040007@redhat.com> References: <1425813387-31231-1-git-send-email-marcel@redhat.com> <1425887036.17517.17.camel@nilsson.home.kraxel.org> <54FD65F0.1040007@redhat.com> Content-Type: text/plain; charset="UTF-8" Mime-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: Re: [Qemu-devel] [PATCH v4 for-2.3 00/25] hw/pc: implement multiple primary busses for pc machines List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: Marcel Apfelbaum Cc: seabios@seabios.org, mst@redhat.com, quintela@redhat.com, qemu-devel@nongnu.org, agraf@suse.de, alex.williamson@redhat.com, kevin@koconnor.net, qemu-ppc@nongnu.org, hare@suse.de, imammedo@redhat.com, amit.shah@redhat.com, pbonzini@redhat.com, leon.alrae@imgtec.com, aurelien@aurel32.net, rth@twiddle.net On Mo, 2015-03-09 at 11:20 +0200, Marcel Apfelbaum wrote: > On 03/09/2015 09:43 AM, Gerd Hoffmann wrote: > > On So, 2015-03-08 at 13:16 +0200, Marcel Apfelbaum wrote: > >> Notes: > >> - Sorry for the late submission, I was waiting for dynamic ACPI series to get merged > >> in order to submit - my bad. > >> - The prev version (v2) was wrongfully tagged by me as RFC, it was actually ready but not > >> rebased. V3 only rebases with no actual functionality changed. > >> - This series is not that big, patches 1-8 are really small and can be submitted > >> separately, however I preferred to keep them here to get the whole picture. > > > > Which tree this does apply against? > > Do you have a git tree with this somewhere? > > Michael's pci branch of: > git://git.kernel.org/pub/scm/virt/kvm/mst/qemu.git Hmm, not working for me ... nilsson kraxel ~/projects/qemu ((a3b66ab...))# git checkout -b testing mst/pci M roms/seabios Branch testing set up to track remote branch pci from mst. Switched to a new branch 'testing' nilsson kraxel ~/projects/qemu (testing)# git am -s ~/Downloads/patches/testing/\[Qemu-devel\]_\[PATCH_v4_for-2.3_01_25 \]_acpi\:_fix_aml_equal_term_implementation.mbox Applying: acpi: fix aml_equal term implementation error: patch failed: hw/acpi/aml-build.c:542 error: hw/acpi/aml-build.c: patch does not apply Patch failed at 0001 acpi: fix aml_equal term implementation The copy of the patch that failed is found in: /home/kraxel/projects/qemu/.git/rebase-apply/patch When you have resolved this problem, run "git am --resolved". If you prefer to skip this patch, run "git am --skip" instead. To restore the original branch and stop patching, run "git am --abort". nilsson kraxel ~/projects/qemu (testing|AM 1/25)# cheers, Gerd