From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-20.0 required=3.0 tests=BAYES_00,DKIM_INVALID, DKIM_SIGNED,HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_PATCH, INCLUDES_PULL_REQUEST,MAILING_LIST_MULTI,MENTIONS_GIT_HOSTING,SPF_HELO_NONE, SPF_PASS,URIBL_BLOCKED,USER_AGENT_SANE_1 autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 01A8BC433F5 for ; Thu, 9 Sep 2021 15:22:35 +0000 (UTC) Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id 995AB6105A for ; Thu, 9 Sep 2021 15:22:34 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.4.1 mail.kernel.org 995AB6105A Authentication-Results: mail.kernel.org; dmarc=fail (p=none dis=none) header.from=redhat.com Authentication-Results: mail.kernel.org; spf=pass smtp.mailfrom=nongnu.org Received: from localhost ([::1]:57812 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1mOLsn-00019D-QM for qemu-devel@archiver.kernel.org; Thu, 09 Sep 2021 11:22:33 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:45576) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1mOLry-0008Dz-5V for qemu-devel@nongnu.org; Thu, 09 Sep 2021 11:21:42 -0400 Received: from us-smtp-delivery-124.mimecast.com ([170.10.133.124]:60995) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1mOLrw-00025q-I2 for qemu-devel@nongnu.org; Thu, 09 Sep 2021 11:21:41 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1631200899; h=from:from:reply-to:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc:cc:mime-version:mime-version: content-type:content-type:in-reply-to:in-reply-to: references:references; bh=Wi2qliHPd3AtKVNTLoCsraUbVFLCSxb4qy59V1yf7x0=; b=IYAjTZPa0mXNv/+7deikmkkG7x0YbmAfAYwaIHGDVuhgmZeiILDCc1K/wfp6FAie/WH/Du J3MZaSyfcLNV8VUsNd/8gxHBM8P8AHSS6D7b5moQJ89jxtlUwyronfWeB4Z0afXhWjvryI 102hfFK+8ePpdoA+DUbZ9kC9mwZUxas= Received: from mimecast-mx01.redhat.com (mimecast-mx01.redhat.com [209.132.183.4]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-90-pGtyimnOP4euVQ5v-WUGiA-1; Thu, 09 Sep 2021 11:21:33 -0400 X-MC-Unique: pGtyimnOP4euVQ5v-WUGiA-1 Received: from smtp.corp.redhat.com (int-mx02.intmail.prod.int.phx2.redhat.com [10.5.11.12]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id EE645A40CE; Thu, 9 Sep 2021 15:21:28 +0000 (UTC) Received: from redhat.com (unknown [10.39.195.19]) by smtp.corp.redhat.com (Postfix) with ESMTPS id EACCC60C04; Thu, 9 Sep 2021 15:21:27 +0000 (UTC) Date: Thu, 9 Sep 2021 16:21:25 +0100 From: Daniel =?utf-8?B?UC4gQmVycmFuZ8Op?= To: Warner Losh Subject: Re: [PULL 00/42] bsd-user updates to run hello world Message-ID: References: <20210907215332.30737-1-imp@bsdimp.com> MIME-Version: 1.0 In-Reply-To: User-Agent: Mutt/2.0.7 (2021-05-04) X-Scanned-By: MIMEDefang 2.79 on 10.5.11.12 Authentication-Results: relay.mimecast.com; auth=pass smtp.auth=CUSA124A263 smtp.mailfrom=berrange@redhat.com X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Content-Type: text/plain; charset=utf-8 Content-Disposition: inline Received-SPF: pass client-ip=170.10.133.124; envelope-from=berrange@redhat.com; helo=us-smtp-delivery-124.mimecast.com X-Spam_score_int: -31 X-Spam_score: -3.2 X-Spam_bar: --- X-Spam_report: (-3.2 / 5.0 requ) BAYES_00=-1.9, DKIMWL_WL_HIGH=-0.393, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_LOW=-0.7, RCVD_IN_MSPIKE_H2=-0.001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=ham autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Reply-To: Daniel =?utf-8?B?UC4gQmVycmFuZ8Op?= Cc: Peter Maydell , QEMU Developers , Kyle Evans Errors-To: qemu-devel-bounces+qemu-devel=archiver.kernel.org@nongnu.org Sender: "Qemu-devel" On Thu, Sep 09, 2021 at 09:12:45AM -0600, Warner Losh wrote: > On Thu, Sep 9, 2021, 9:01 AM Peter Maydell wrote: > > > On Tue, 7 Sept 2021 at 22:56, wrote: > > > > > > From: Warner Losh > > > > > > 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 :|