* [Qemu-devel] [PATCH] seabios: fix submodule
@ 2016-01-22 10:59 Gerd Hoffmann
2016-01-22 12:02 ` Peter Maydell
0 siblings, 1 reply; 3+ messages in thread
From: Gerd Hoffmann @ 2016-01-22 10:59 UTC (permalink / raw)
To: qemu-devel; +Cc: Gerd Hoffmann
Commit "36f96c4 target-i386: Add support to migrate vcpu's TSC rate"
updates roms/seabios, appearently by mistake. Revert this.
Signed-off-by: Gerd Hoffmann <kraxel@redhat.com>
---
roms/seabios | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/roms/seabios b/roms/seabios
index 33fbe13..01a84be 160000
--- a/roms/seabios
+++ b/roms/seabios
@@ -1 +1 @@
-Subproject commit 33fbe13a3e2a01e0ba1087a8feed801a0451db21
+Subproject commit 01a84bea2d28a19d2405c1ecac4bdef17683cc0c
--
1.8.3.1
^ permalink raw reply related [flat|nested] 3+ messages in thread
* Re: [Qemu-devel] [PATCH] seabios: fix submodule
2016-01-22 10:59 [Qemu-devel] [PATCH] seabios: fix submodule Gerd Hoffmann
@ 2016-01-22 12:02 ` Peter Maydell
2016-01-23 13:02 ` Eduardo Habkost
0 siblings, 1 reply; 3+ messages in thread
From: Peter Maydell @ 2016-01-22 12:02 UTC (permalink / raw)
To: Gerd Hoffmann; +Cc: Haozhong Zhang, QEMU Developers, Eduardo Habkost
On 22 January 2016 at 10:59, Gerd Hoffmann <kraxel@redhat.com> wrote:
> Commit "36f96c4 target-i386: Add support to migrate vcpu's TSC rate"
> updates roms/seabios, appearently by mistake. Revert this.
>
> Signed-off-by: Gerd Hoffmann <kraxel@redhat.com>
> ---
> roms/seabios | 2 +-
> 1 file changed, 1 insertion(+), 1 deletion(-)
>
> diff --git a/roms/seabios b/roms/seabios
> index 33fbe13..01a84be 160000
> --- a/roms/seabios
> +++ b/roms/seabios
> @@ -1 +1 @@
> -Subproject commit 33fbe13a3e2a01e0ba1087a8feed801a0451db21
> +Subproject commit 01a84bea2d28a19d2405c1ecac4bdef17683cc0c
> --
> 1.8.3.1
Whoops. Unfortunately git can make it easy to accidentally include
submodule updates in patches or pull requests, and I didn't catch
this one on applying the pullreq either.
I've applied this patch to master to correct the error.
thanks
-- PMM
^ permalink raw reply [flat|nested] 3+ messages in thread
* Re: [Qemu-devel] [PATCH] seabios: fix submodule
2016-01-22 12:02 ` Peter Maydell
@ 2016-01-23 13:02 ` Eduardo Habkost
0 siblings, 0 replies; 3+ messages in thread
From: Eduardo Habkost @ 2016-01-23 13:02 UTC (permalink / raw)
To: Peter Maydell; +Cc: Haozhong Zhang, Gerd Hoffmann, QEMU Developers
On Fri, Jan 22, 2016 at 12:02:30PM +0000, Peter Maydell wrote:
> On 22 January 2016 at 10:59, Gerd Hoffmann <kraxel@redhat.com> wrote:
> > Commit "36f96c4 target-i386: Add support to migrate vcpu's TSC rate"
> > updates roms/seabios, appearently by mistake. Revert this.
> >
> > Signed-off-by: Gerd Hoffmann <kraxel@redhat.com>
> > ---
> > roms/seabios | 2 +-
> > 1 file changed, 1 insertion(+), 1 deletion(-)
> >
> > diff --git a/roms/seabios b/roms/seabios
> > index 33fbe13..01a84be 160000
> > --- a/roms/seabios
> > +++ b/roms/seabios
> > @@ -1 +1 @@
> > -Subproject commit 33fbe13a3e2a01e0ba1087a8feed801a0451db21
> > +Subproject commit 01a84bea2d28a19d2405c1ecac4bdef17683cc0c
> > --
> > 1.8.3.1
>
> Whoops. Unfortunately git can make it easy to accidentally include
> submodule updates in patches or pull requests, and I didn't catch
> this one on applying the pullreq either.
>
> I've applied this patch to master to correct the error.
Oops! This was my mistake, it probably happened when I was
rebasing and solving conflicts. Sorry.
Does anybody know a way to tell git to never ever try to commit
submodule changes unless explicitly asked to?
--
Eduardo
^ permalink raw reply [flat|nested] 3+ messages in thread
end of thread, other threads:[~2016-01-23 13:02 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2016-01-22 10:59 [Qemu-devel] [PATCH] seabios: fix submodule Gerd Hoffmann
2016-01-22 12:02 ` Peter Maydell
2016-01-23 13:02 ` Eduardo Habkost
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).