Re: [PULL 00/42] bsd-user updates to run hello world

[Daniel P . Berrangé]

On Thu, Sep 09, 2021 at 09:12:45AM -0600, Warner Losh wrote:
> On Thu, Sep 9, 2021, 9:01 AM Peter Maydell <peter.maydell@linaro.org> wrote:
> 
> > On Tue, 7 Sept 2021 at 22:56, <imp@bsdimp.com> wrote:
> > >
> > > From: Warner Losh <imp@bsdimp.com>
> > >
> > > The following changes since commit
> > f214d8e0150766c31172e16ef4b17674f549d852:
> > >
> > >   Merge remote-tracking branch
> > 'remotes/pmaydell/tags/pull-target-arm-20210826' into staging (2021-08-26
> > 18:03:57 +0100)
> > >
> > > are available in the Git repository at:
> > >
> > >   https://gitlab.com/bsdimp/qemu.git tags/bsd-user-pull-20210907-tag
> > >
> > > for you to fetch changes up to dc96376e46a52ac63a27ea185c3f0a6fd54e3c82:
> > >
> > >   bsd-user: Update mapping to handle reserved and starting conditions
> > (2021-09-07 08:26:53 -0600)
> >
> > >  slirp                                         |    2 +-
> >
> > A bogus submodule update seems to have crept in here...
> >
> 
> So I need to fix this and resubmit?
> 
> My loath of modules is coming to a middle... they update in the rebase, but
> don't reset without magic commands. :(

Historically this was quite a common problem as  'git add -u' would
stage any submodule  changes. At some point in recentish history
git stopped doing that, so these accidental inclusions don't happen
as easily.

For your specific case here:

diff --git a/slirp b/slirp
index a88d9ace23..8f43a99191 160000
--- a/slirp
+++ b/slirp
@@ -1 +1 @@
-Subproject commit a88d9ace234a24ce1c17189642ef9104799425e0
+Subproject commit 8f43a99191afb47ca3f3c6972f6306209f367ece


to fix this you just need to go into the submodule and checkout the
original hash and then add it to the commit. eg

  cd slirp
  git checkout a88d9ace234a24ce1c17189642ef9104799425e0
  cd ..
  git add slirp
  git commit --amend
  

Regards,
Daniel
-- 
|: https://berrange.com      -o-    https://www.flickr.com/photos/dberrange :|
|: https://libvirt.org         -o-            https://fstop138.berrange.com :|
|: https://entangle-photo.org    -o-    https://www.instagram.com/dberrange :|