Update version for v2.6.0 release

Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
Update version for v2.6.0-rc5 release
2016-05-11 16:44:26 +01:00 · 2016-05-09 14:08:12 +01:00 · 2016-05-09 13:42:25 +01:00 · 2016-05-02 17:27:01 +01:00 · 2016-05-02 17:19:13 +01:00
2 changed files with 1 additions and 2 deletions
--- a/2
+++ b/2
@@ -1 +1 @@
-2.5.93
+2.6.0
--- a/hw/acpi/core.c
+++ b/hw/acpi/core.c
@@ -536,7 +536,6 @@ void acpi_pm_tmr_init(ACPIREGS *ar, acpi_update_sci_fn update_sci,
    ar->tmr.timer = timer_new_ns(QEMU_CLOCK_VIRTUAL, acpi_pm_tmr_timer, ar);
    memory_region_init_io(&ar->tmr.io, memory_region_owner(parent),
                          &acpi_pm_tmr_ops, ar, "acpi-tmr", 4);
-    memory_region_clear_global_locking(&ar->tmr.io);
    memory_region_add_subregion(parent, 8, &ar->tmr.io);
 }
Author	SHA1	Message	Date
Peter Maydell	bfc766d38e	Update version for v2.6.0 release Signed-off-by: Peter Maydell <peter.maydell@linaro.org>	2016-05-11 16:44:26 +01:00
Peter Maydell	860a3b3485	Update version for v2.6.0-rc5 release Signed-off-by: Peter Maydell <peter.maydell@linaro.org>	2016-05-09 14:08:12 +01:00
Peter Maydell	53db932604	Merge remote-tracking branch 'remotes/kraxel/tags/pull-vga-20160509-1' into staging vga security fixes (CVE-2016-3710, CVE-2016-3712) # gpg: Signature made Mon 09 May 2016 13:39:30 BST using RSA key ID D3E87138 # gpg: Good signature from "Gerd Hoffmann (work) <kraxel@redhat.com>" # gpg: aka "Gerd Hoffmann <gerd@kraxel.org>" # gpg: aka "Gerd Hoffmann (private) <kraxel@gmail.com>" * remotes/kraxel/tags/pull-vga-20160509-1: vga: make sure vga register setup for vbe stays intact (CVE-2016-3712). vga: update vga register setup on vbe changes vga: factor out vga register setup vga: add vbe_enabled() helper vga: fix banked access bounds checking (CVE-2016-3710) Signed-off-by: Peter Maydell <peter.maydell@linaro.org>	2016-05-09 13:42:25 +01:00
Peter Maydell	975eb6a547	Update version for v2.6.0-rc4 release Signed-off-by: Peter Maydell <peter.maydell@linaro.org>	2016-05-02 17:27:01 +01:00
Gerd Hoffmann	1beb99f787	Revert "acpi: mark PMTIMER as unlocked" This reverts commit `7070e085d4`. Commit message claims locking is not needed, but that appears to not be true, seabios ehci driver runs into timekeeping problems with this, see https://bugzilla.redhat.com/show_bug.cgi?id=1322713 Signed-off-by: Gerd Hoffmann <kraxel@redhat.com> Message-id: 1460702609-25971-1-git-send-email-kraxel@redhat.com Signed-off-by: Peter Maydell <peter.maydell@linaro.org>	2016-05-02 17:19:13 +01:00
@@ -1 +1 @@
 .5.93
 .6.0