From: Peter Maydell Date: Mon, 30 Nov 2015 17:09:35 +0000 (+0000) Subject: Merge remote-tracking branch 'remotes/dgibson/tags/ppc-for-2.5-20151130' into staging X-Git-Url: http://git.maquefel.me/?a=commitdiff_plain;h=a2485925f76d01795f041fd63663d8582139fda4;p=qemu.git Merge remote-tracking branch 'remotes/dgibson/tags/ppc-for-2.5-20151130' into staging ppc patch queue for qemu-2.5 20151130 target-ppc and related bugfix patches for qemu-2.5 I don't have the facilities to test the Macintosh and BookE related patches. I've sanity checked them (inspection + make check), but I'm otherwise relying on the submitters. # gpg: Signature made Mon 30 Nov 2015 08:42:01 GMT using RSA key ID 20D9B392 # gpg: Good signature from "David Gibson " # gpg: aka "David Gibson (Red Hat) " # gpg: aka "David Gibson (ozlabs.org) " # gpg: WARNING: This key is not certified with sufficiently trusted signatures! # gpg: It is not certain that the signature belongs to the owner. # Primary key fingerprint: 75F4 6586 AE61 A66C C44E 87DC 6C38 CACA 20D9 B392 * remotes/dgibson/tags/ppc-for-2.5-20151130: target-ppc/fpu_helper: fix FPSCR_FX bit shift operation target-ppc: Move the FPSCR bit update macros to cpu.h hw/ppc/ppc405_boards: Fix infinite recursion by converting taihu_cpld from old_mmio hw/ppc/spapr: Remove duplicated "pseries" alias mac_dbdma: always initialize channel field in DBDMA_channel Signed-off-by: Peter Maydell --- a2485925f76d01795f041fd63663d8582139fda4