From: Peter Maydell Date: Mon, 9 Dec 2019 11:07:34 +0000 (+0000) Subject: Merge remote-tracking branch 'remotes/dgibson/tags/ppc-for-4.2-20191209' into staging X-Git-Url: http://git.maquefel.me/?a=commitdiff_plain;h=8350b17be015bb872f28268bdeba1bac6c380efc;p=qemu.git Merge remote-tracking branch 'remotes/dgibson/tags/ppc-for-4.2-20191209' into staging ppc patch queue 2019-12-09 This is a last minute pull request for ppc-for-4.2. I know it's very late in freeze, but this does fix a regression: a bad interaction between the new qemu and SLOF device tree construction code means that SLOF will crash if PCI to PCI bridges are included in the system. This PR supersedes ppc-for-4.2-20191206. This one has only a more minimal change to the firmware addressed only at fixing this bug and not incorporating some other unrelated changes that happened in the meantime. # gpg: Signature made Mon 09 Dec 2019 04:52:19 GMT # gpg: using RSA key 75F46586AE61A66CC44E87DC6C38CACA20D9B392 # gpg: Good signature from "David Gibson " [full] # gpg: aka "David Gibson (Red Hat) " [full] # gpg: aka "David Gibson (ozlabs.org) " [full] # gpg: aka "David Gibson (kernel.org) " [unknown] # Primary key fingerprint: 75F4 6586 AE61 A66C C44E 87DC 6C38 CACA 20D9 B392 * remotes/dgibson/tags/ppc-for-4.2-20191209: pseries: Update SLOF firmware image Signed-off-by: Peter Maydell --- 8350b17be015bb872f28268bdeba1bac6c380efc