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=-15.2 required=3.0 tests=BAYES_00, HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_CR_TRAILER,INCLUDES_PATCH, MAILING_LIST_MULTI,SPF_HELO_NONE,SPF_PASS,URIBL_BLOCKED,USER_AGENT_SANE_2 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 9E359C433DB for ; Tue, 2 Feb 2021 09:27:57 +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 96E2360C3E for ; Tue, 2 Feb 2021 09:27:56 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 96E2360C3E Authentication-Results: mail.kernel.org; dmarc=none (p=none dis=none) header.from=kaod.org Authentication-Results: mail.kernel.org; spf=pass smtp.mailfrom=qemu-devel-bounces+qemu-devel=archiver.kernel.org@nongnu.org Received: from localhost ([::1]:55712 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1l6ryV-0006Lf-G4 for qemu-devel@archiver.kernel.org; Tue, 02 Feb 2021 04:27:55 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]:37810) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1l6rxV-0005um-81 for qemu-devel@nongnu.org; Tue, 02 Feb 2021 04:26:53 -0500 Received: from 1.mo52.mail-out.ovh.net ([178.32.96.117]:47041) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1l6rxS-0000YU-Hi for qemu-devel@nongnu.org; Tue, 02 Feb 2021 04:26:53 -0500 Received: from mxplan5.mail.ovh.net (unknown [10.108.16.173]) by mo52.mail-out.ovh.net (Postfix) with ESMTPS id 9557723BF32; Tue, 2 Feb 2021 10:26:39 +0100 (CET) Received: from kaod.org (37.59.142.98) by DAG8EX1.mxp5.local (172.16.2.71) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.1.2106.2; Tue, 2 Feb 2021 10:26:38 +0100 Authentication-Results: garm.ovh; auth=pass (GARM-98R002a4c1bd17-bca2-4faf-a69a-142cfd9bb192, DC0DBEB447F422121002C77F277C88083E2578C3) smtp.auth=groug@kaod.org X-OVh-ClientIp: 78.197.208.248 Date: Tue, 2 Feb 2021 10:26:36 +0100 From: Greg Kurz To: Programmingkid Subject: Re: Makefile has local changes that will be overwritten Message-ID: <20210202102636.3b1474e5@bahia.lan> In-Reply-To: References: X-Mailer: Claws Mail 3.17.8 (GTK+ 2.24.32; x86_64-redhat-linux-gnu) MIME-Version: 1.0 Content-Type: text/plain; charset="US-ASCII" Content-Transfer-Encoding: 7bit X-Originating-IP: [37.59.142.98] X-ClientProxiedBy: DAG2EX2.mxp5.local (172.16.2.12) To DAG8EX1.mxp5.local (172.16.2.71) X-Ovh-Tracer-GUID: 257b891a-aea9-481e-99a5-8d13f78372f5 X-Ovh-Tracer-Id: 1931762765334878688 X-VR-SPAMSTATE: OK X-VR-SPAMSCORE: -100 X-VR-SPAMCAUSE: gggruggvucftvghtrhhoucdtuddrgeduledrgedtgddtfecutefuodetggdotefrodftvfcurfhrohhfihhlvgemucfqggfjpdevjffgvefmvefgnecuuegrihhlohhuthemucehtddtnecusecvtfgvtghiphhivghnthhsucdlqddutddtmdenucfjughrpeffhffvuffkjghfofggtgfgihesthejredtredtvdenucfhrhhomhepifhrvghgucfmuhhriicuoehgrhhouhhgsehkrghougdrohhrgheqnecuggftrfgrthhtvghrnhepfedutdeijeejveehkeeileetgfelteekteehtedtieefffevhffflefftdefleejnecukfhppedtrddtrddtrddtpdefjedrheelrddugedvrdelkeenucevlhhushhtvghrufhiiigvpedtnecurfgrrhgrmhepmhhouggvpehsmhhtphdqohhuthdphhgvlhhopehmgihplhgrnhehrdhmrghilhdrohhvhhdrnhgvthdpihhnvghtpedtrddtrddtrddtpdhmrghilhhfrhhomhepghhrohhugheskhgrohgurdhorhhgpdhrtghpthhtohepqhgvmhhuqdguvghvvghlsehnohhnghhnuhdrohhrgh Received-SPF: pass client-ip=178.32.96.117; envelope-from=groug@kaod.org; helo=1.mo52.mail-out.ovh.net X-Spam_score_int: -18 X-Spam_score: -1.9 X-Spam_bar: - X-Spam_report: (-1.9 / 5.0 requ) BAYES_00=-1.9, RCVD_IN_DNSWL_NONE=-0.0001, RCVD_IN_MSPIKE_H3=0.001, RCVD_IN_MSPIKE_WL=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: , Cc: Dan Streetman , Peter Maydell , QEMU Developers Errors-To: qemu-devel-bounces+qemu-devel=archiver.kernel.org@nongnu.org Sender: "Qemu-devel" On Mon, 1 Feb 2021 10:30:25 -0500 Programmingkid wrote: > > > > On Feb 1, 2021, at 9:52 AM, Peter Maydell wrote: > > > > On Mon, 1 Feb 2021 at 14:49, Dan Streetman wrote: > >> > >> On Mon, Feb 1, 2021 at 9:23 AM Programmingkid wrote: > >>> > >>> When trying to build QEMU I see this error: > >>> > >>> error: Your local changes to the following files would be overwritten by checkout: > >>> Makefile > >>> Please commit your changes or stash them before you switch branches. > >>> Aborting > >>> > >>> What I do to see this error: > >>> ./configure --target-list=i386-softmmu > >> > >> Sorry, I don't see that error, what commit are you building from? > > > > ...and what does git think the local changes to Makefile are ? > > This is the output of 'git status': > On branch master > Your branch is up to date with 'origin/master'. > > Changes not staged for commit: > (use "git add ..." to update what will be committed) > (use "git restore ..." to discard changes in working directory) > (commit or discard the untracked or modified content in submodules) > modified: dtc (new commits, modified content) > > Untracked files: > (use "git add ..." to include in what will be committed) > pixman/ > > no changes added to commit (use "git add" and/or "git commit -a") > > > This is the output of 'git diff master': > diff --git a/dtc b/dtc > index 85e5d83984..88f18909db 160000 > --- a/dtc > +++ b/dtc > @@ -1 +1 @@ > -Subproject commit 85e5d839847af54efab170f2b1331b2a6421e647 > +Subproject commit 88f18909db731a627456f26d779445f84e449536-dirty > This looks like you have a change in the dtc submodule based on an old commit: commit 88f18909db731a627456f26d779445f84e449536 (tag: v1.4.7) Author: David Gibson Date: Mon Jul 23 13:00:50 2018 +1000 dtc: Bump version to v1.4.7 We've accumulated a bunch of bugfixes, including considerable improvements to libfdt's memory safety, so get ready for another release. Signed-off-by: David Gibson while current head of dtc is: commit 85e5d839847af54efab170f2b1331b2a6421e647 (HEAD) Author: Claudio Fontana Date: Tue May 12 12:33:15 2020 +0200 Makefile: when building libfdt only, do not add unneeded deps implemented originally for the QEMU consumer of libfdt. Signed-off-by: Claudio Fontana Message-Id: <20200512103315.1926-1-cfontana@suse.de> Signed-off-by: David Gibson > I have tried 'git clean -d -f', 'git reset --hard' and 'git pull'. I am now at 74208cd252c5da9d867270a178799abd802b9338 and still seeing the error with MakeFile. > Since the change affects the dtc submodule, you should 'cd dtc && git diff' to see what these differences are, and possibly 'git reset --hard' if you don't want them. Then go back to the QEMU source dir and update the dtc module with 'git submodule update dtc'. >