LKML Archive on lore.kernel.org
help / color / mirror / Atom feed
From: Linus Torvalds <torvalds@linux-foundation.org>
To: Alistair John Strachan <alistair@devzero.co.uk>
Cc: "Rafael J. Wysocki" <rjw@sisk.pl>,
	Linux Kernel Mailing List <linux-kernel@vger.kernel.org>
Subject: Re: Linux 2.6.28-rc1
Date: Fri, 24 Oct 2008 08:17:53 -0700 (PDT)	[thread overview]
Message-ID: <alpine.LFD.2.00.0810240801540.3287@nehalem.linux-foundation.org> (raw)
In-Reply-To: <200810241352.45745.alistair@devzero.co.uk>



On Fri, 24 Oct 2008, Alistair John Strachan wrote:
> 
> git reset --hard v2.6.27 ; git clean -d -f
> git status ("Nothing to commit")

The problem is ignored files.

Yes, git claims everything is clean, but that's because it has been told 
to ignore certain files, and because it has been told to ignore them, it 
will not remove them (without the -x flag) in "git clean", nor will it 
mention them in "git status".

And yes, one of the ignored file patterns is

	include/asm-*/asm-offsets.h

which means that your "git clean -df" didn't *really* clean everything 
from the old include/asm-x86, and because it didn't clean it all it also 
wouldn't be able to remove the old stale directory - since it wasn't 
empty.

You can use "git clean -dfx" to force git to remove ignored files too. And 
"make distclean" should have done it too.

Now, _another_ part (and arguably the really core reason) of this problem 
is that our Makefile rules for the asm include directory is weak and 
unreliable in the presense of already-existing unexpected entries.

And it has caused problems before. For example, if you somehow made the 
symlink not be a symlink at all (by using "cp -LR" for example), or a 
symlink pointing to another architecture (changing architecture builds in 
the same tree without doing a "make clean" in between), you historically 
got really odd results.

In fact, it's broken in subtle way before to the point where we now have a 
special "check-symlink" target internally that checks that the symlink is 
correctly set up.

Of course, it didn't check that you had some old stuff in include/asm-x86, 
it only checks for the _traditional_ problems we've had. Not some new odd 
one.

		Linus

  parent reply	other threads:[~2008-10-24 15:18 UTC|newest]

Thread overview: 36+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2008-10-24  4:10 Linus Torvalds
2008-10-24  4:14 ` Roland Dreier
2008-10-24 18:08   ` Greg KH
2008-10-24 11:24 ` Alistair John Strachan
2008-10-24 11:45   ` Rafael J. Wysocki
2008-10-24 12:52     ` Alistair John Strachan
2008-10-24 13:13       ` Alexey Dobriyan
2008-10-24 14:56         ` git-clean [Was: Linux 2.6.28-rc1] Björn Steinbrink
2008-10-24 15:17       ` Linus Torvalds [this message]
2008-10-24 19:22         ` Linux 2.6.28-rc1 Sam Ravnborg
2008-10-24 22:31         ` David Miller
2008-10-24 22:51           ` Sam Ravnborg
2008-10-24 19:15   ` Sam Ravnborg
2008-10-24 23:44     ` Alistair John Strachan
2008-10-24 17:09 ` Matt Mackall
2008-10-24 17:54   ` Matt Mackall
2008-10-24 17:57     ` Randy Dunlap
2008-10-24 18:05       ` Fenghua Yu
2008-10-24 18:11         ` Matt Mackall
2008-10-24 22:28 ` nf_conntrack oopes on parisc/smp (was Re: Linux 2.6.28-rc1) Domenico Andreoli
2008-10-24 22:53 ` Linux 2.6.28-rc1 Tony Vroon
2008-10-24 23:01   ` Arjan van de Ven
2008-10-26 13:17     ` Tony Vroon
2008-10-30 14:26 ` 2.6.28-rc1: NVRAM being corrupted on ppc64 preventing boot (bisected) Mel Gorman
2008-10-30 20:52   ` Paul Mackerras
2008-10-30 21:05     ` Josh Boyer
2008-10-30 21:35       ` Dave Kleikamp
2008-10-31 10:36     ` Mel Gorman
2008-10-31 11:10       ` Paul Mackerras
2008-10-31 11:31         ` Mel Gorman
2008-10-31 18:36         ` Mel Gorman
2008-10-31 11:18       ` Paul Mackerras
2008-10-31 11:31         ` Benjamin Herrenschmidt
2008-10-31 11:56           ` Paul Mackerras
2008-10-31 11:32         ` Mel Gorman
2008-10-24 18:10 Linux 2.6.28-rc1 Rufus & Azrael

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=alpine.LFD.2.00.0810240801540.3287@nehalem.linux-foundation.org \
    --to=torvalds@linux-foundation.org \
    --cc=alistair@devzero.co.uk \
    --cc=linux-kernel@vger.kernel.org \
    --cc=rjw@sisk.pl \
    --subject='Re: Linux 2.6.28-rc1' \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link

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).