diff mbox

[for-4.6] Config.mk: update mini-os commit

Message ID 1461582725-11621-1-git-send-email-wei.liu2@citrix.com (mailing list archive)
State New, archived
Headers show

Commit Message

Wei Liu April 25, 2016, 11:12 a.m. UTC
Backport several fixes to mini-os in order to fix stubdom in 4.6.

Patches pulled in:

xenbus: notify the other end when necessary
Mini-OS: netfront: fix off-by-one error introduced in 7c8f3483
Clean arch/x86/time.c
Fix time update

Signed-off-by: Wei Liu <wei.liu2@citrix.com>
---
Cc: Ian Jackson <ian.jackson@eu.citrix.com>
Cc: Jan Beulich <jbeulich@suse.com>
---
 Config.mk | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

Comments

Jan Beulich April 25, 2016, 11:15 a.m. UTC | #1
>>> On 25.04.16 at 13:12, <wei.liu2@citrix.com> wrote:
> Backport several fixes to mini-os in order to fix stubdom in 4.6.
> 
> Patches pulled in:
> 
> xenbus: notify the other end when necessary
> Mini-OS: netfront: fix off-by-one error introduced in 7c8f3483
> Clean arch/x86/time.c
> Fix time update
> 
> Signed-off-by: Wei Liu <wei.liu2@citrix.com>

Fine by me, provided the mini-os maintainer agrees these are
important enough to go into a stable update.

Jan
Wei Liu April 25, 2016, 11:21 a.m. UTC | #2
On Mon, Apr 25, 2016 at 05:15:57AM -0600, Jan Beulich wrote:
> >>> On 25.04.16 at 13:12, <wei.liu2@citrix.com> wrote:
> > Backport several fixes to mini-os in order to fix stubdom in 4.6.
> > 
> > Patches pulled in:
> > 
> > xenbus: notify the other end when necessary
> > Mini-OS: netfront: fix off-by-one error introduced in 7c8f3483
> > Clean arch/x86/time.c
> > Fix time update
> > 
> > Signed-off-by: Wei Liu <wei.liu2@citrix.com>
> 
> Fine by me, provided the mini-os maintainer agrees these are
> important enough to go into a stable update.
> 

Oops, I forgot to CC Samuel. Thanks Jan for doing that.

Samuel, the branch is xen-stable-4.6 in mini-os.git.

Wei.

> Jan
>
Wei Liu May 2, 2016, 9:48 a.m. UTC | #3
On Mon, Apr 25, 2016 at 12:21:51PM +0100, Wei Liu wrote:
> On Mon, Apr 25, 2016 at 05:15:57AM -0600, Jan Beulich wrote:
> > >>> On 25.04.16 at 13:12, <wei.liu2@citrix.com> wrote:
> > > Backport several fixes to mini-os in order to fix stubdom in 4.6.
> > > 
> > > Patches pulled in:
> > > 
> > > xenbus: notify the other end when necessary
> > > Mini-OS: netfront: fix off-by-one error introduced in 7c8f3483
> > > Clean arch/x86/time.c
> > > Fix time update
> > > 
> > > Signed-off-by: Wei Liu <wei.liu2@citrix.com>
> > 
> > Fine by me, provided the mini-os maintainer agrees these are
> > important enough to go into a stable update.
> > 
> 
> Oops, I forgot to CC Samuel. Thanks Jan for doing that.
> 
> Samuel, the branch is xen-stable-4.6 in mini-os.git.
> 

Ping?
Samuel Thibault May 2, 2016, 9:51 a.m. UTC | #4
Wei Liu, on Mon 02 May 2016 10:48:11 +0100, wrote:
> On Mon, Apr 25, 2016 at 12:21:51PM +0100, Wei Liu wrote:
> > On Mon, Apr 25, 2016 at 05:15:57AM -0600, Jan Beulich wrote:
> > > >>> On 25.04.16 at 13:12, <wei.liu2@citrix.com> wrote:
> > > > Backport several fixes to mini-os in order to fix stubdom in 4.6.
> > > > 
> > > > Patches pulled in:
> > > > 
> > > > xenbus: notify the other end when necessary
> > > > Mini-OS: netfront: fix off-by-one error introduced in 7c8f3483
> > > > Clean arch/x86/time.c
> > > > Fix time update
> > > > 
> > > > Signed-off-by: Wei Liu <wei.liu2@citrix.com>
> > > 
> > > Fine by me, provided the mini-os maintainer agrees these are
> > > important enough to go into a stable update.
> > > 
> > 
> > Oops, I forgot to CC Samuel. Thanks Jan for doing that.
> > 
> > Samuel, the branch is xen-stable-4.6 in mini-os.git.
> 
> Ping?

I'm not sure who is the destination of the ping, but just in case: yes I
agree these should go to a stable update.

Samuel
Wei Liu May 2, 2016, 9:58 a.m. UTC | #5
On Mon, May 02, 2016 at 11:51:45AM +0200, Samuel Thibault wrote:
> Wei Liu, on Mon 02 May 2016 10:48:11 +0100, wrote:
> > On Mon, Apr 25, 2016 at 12:21:51PM +0100, Wei Liu wrote:
> > > On Mon, Apr 25, 2016 at 05:15:57AM -0600, Jan Beulich wrote:
> > > > >>> On 25.04.16 at 13:12, <wei.liu2@citrix.com> wrote:
> > > > > Backport several fixes to mini-os in order to fix stubdom in 4.6.
> > > > > 
> > > > > Patches pulled in:
> > > > > 
> > > > > xenbus: notify the other end when necessary
> > > > > Mini-OS: netfront: fix off-by-one error introduced in 7c8f3483
> > > > > Clean arch/x86/time.c
> > > > > Fix time update
> > > > > 
> > > > > Signed-off-by: Wei Liu <wei.liu2@citrix.com>
> > > > 
> > > > Fine by me, provided the mini-os maintainer agrees these are
> > > > important enough to go into a stable update.
> > > > 
> > > 
> > > Oops, I forgot to CC Samuel. Thanks Jan for doing that.
> > > 
> > > Samuel, the branch is xen-stable-4.6 in mini-os.git.
> > 
> > Ping?
> 
> I'm not sure who is the destination of the ping, but just in case: yes I
> agree these should go to a stable update.
> 

It was directed to you because you're listed as mini-os maintainer in
xen.git MAINTAINERS file.

Sorry if that's not clear.

Wei.

> Samuel
diff mbox

Patch

diff --git a/Config.mk b/Config.mk
index b34be6a..e529513 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 ?= xen-RELEASE-4.6.0
-# Fri Jun 26 11:58:40 2015 +0100
-# Correct printf formatting for tpm_tis message.
+MINIOS_UPSTREAM_REVISION ?= 6aadd46e0927763861b19eacce2f2aeac9f17835
+# Sat, 9 Apr 2016 23:46:32 +0100 (00:46 +0200)
+# Fix time update
 
 SEABIOS_UPSTREAM_REVISION ?= rel-1.8.2
 # Tue Mar 17 10:52:16 2015 -0400