| Message ID | 1463500675-23974-1-git-send-email-wei.liu2@citrix.com (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
>>> On 17.05.16 at 17:57, <wei.liu2@citrix.com> wrote: > Patches pulled in: > lib/sys.c: enclose file_types in define guards > build: change MINI-OS_ROOT to MINIOS_ROOT > > Signed-off-by: Wei Liu <wei.liu2@citrix.com> Applied, but in the future please submit patches against staging-4.6: I had to fix up patch context to account for the qemu updates which didn't pass the push gate yet. Jan
On Wed, May 18, 2016 at 04:31:22AM -0600, Jan Beulich wrote: > >>> On 17.05.16 at 17:57, <wei.liu2@citrix.com> wrote: > > Patches pulled in: > > lib/sys.c: enclose file_types in define guards > > build: change MINI-OS_ROOT to MINIOS_ROOT > > > > Signed-off-by: Wei Liu <wei.liu2@citrix.com> > > Applied, but in the future please submit patches against staging-4.6: > I had to fix up patch context to account for the qemu updates which > didn't pass the push gate yet. > Sorry for the trouble. I will patch staging in the future. Wei. > Jan >
diff --git a/Config.mk b/Config.mk index e529513..513467b 100644 --- a/Config.mk +++ b/Config.mk @@ -255,9 +255,9 @@ MINIOS_UPSTREAM_URL ?= git://xenbits.xen.org/mini-os.git endif OVMF_UPSTREAM_REVISION ?= 52a99493cce88a9d4ec8a02d7f1bd1a1001ce60d QEMU_UPSTREAM_REVISION ?= qemu-xen-4.6.1 -MINIOS_UPSTREAM_REVISION ?= 6aadd46e0927763861b19eacce2f2aeac9f17835 -# Sat, 9 Apr 2016 23:46:32 +0100 (00:46 +0200) -# Fix time update +MINIOS_UPSTREAM_REVISION ?= e1cca557c64272d33da7bafc0ad25399267563d0 +# Fri May 13 15:21:10 2016 +0100 +# lib/sys.c: enclose file_types in define guards SEABIOS_UPSTREAM_REVISION ?= rel-1.8.2 # Tue Mar 17 10:52:16 2015 -0400
Patches pulled in: lib/sys.c: enclose file_types in define guards build: change MINI-OS_ROOT to MINIOS_ROOT Signed-off-by: Wei Liu <wei.liu2@citrix.com> --- Cc: Jan Beulich <JBeulich@suse.com> Cc: Ian Jackson <ian.jackson@eu.citrix.com> One of the patches is required to build stubdom on Ubuntu 16.04. Samuel has confirmed it's fine to backport both. http://lists.xen.org/archives/html/minios-devel/2016-05/msg00018.html --- Config.mk | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-)