From: Sam Ravnborg
Subject: [PATCH 0/6] kill i386 and x86_64 directories
Date: Oct 25, 12:56 pm 2007

This series kill the old i386 and x86_64 directories.
The relevant files are moved and adapted and
Kconfig.debug was consolidated (thanks to Randy).

I had to modify both the top-lvel Makefile and the kconfig
Makefile to accomplish this. It was done in such a way that
it is trivial for other archs to use the same mechanism
should they have the need.

To solve the defconfig issue (i386 and x86_64 cannot share one)
the arch/x86/configs/ directory were introduced. This has
been used by other archs for some time now but x86 had not had
the need until now.

The Kconfig files could be consolidated much more - I only
did the minimal changes to make it work in the new place.

Total diffstat (in git format):

 Makefile                                           |    7 ++-
 arch/i386/.gitignore                               |    1 -
 arch/{i386 => x86}/Kconfig.cpu                     |    0 
 arch/{i386 => x86}/Kconfig.debug                   |   51 +++++++++++++---
 arch/{i386/Kconfig => x86/Kconfig.i386}            |    4 +-
 arch/{x86_64/Kconfig => x86/Kconfig.x86_64}        |    6 +--
 arch/x86/Makefile                                  |   16 +++++
 arch/{i386/Makefile => x86/Makefile_32}            |    7 +--
 arch/{i386/Makefile.cpu => x86/Makefile_32.cpu}    |    0 
 arch/{x86_64/Makefile => x86/Makefile_64}          |    5 +-
 .../{i386/defconfig => x86/configs/i386_defconfig} |    0 
 .../defconfig => x86/configs/x86_64_defconfig}     |    0 
 arch/x86_64/.gitignore                             |    1 -
 arch/x86_64/Kconfig.debug                          |   61 --------------------
 scripts/kconfig/Makefile                           |   35 +++++++-----
 15 files changed, 89 insertions(+), 105 deletions(-)

Patches follows.
The full serie can be pulled from:

	git://git.kernel.org/pub/scm/linux/kernel/git/sam/x86.git

Note: The serie were slightly modfied compared to the fist published
      version.

	Sam
-


From: Thomas Gleixner
Subject: Re: [PATCH 0/6] kill i386 and x86_64 directories
Date: Oct 25, 1:17 pm 2007

Sam,

On Thu, 25 Oct 2007, Sam Ravnborg wrote:
> This series kill the old i386 and x86_64 directories.
> The relevant files are moved and adapted and
> Kconfig.debug was consolidated (thanks to Randy).
> 
> I had to modify both the top-lvel Makefile and the kconfig
> Makefile to accomplish this. It was done in such a way that
> it is trivial for other archs to use the same mechanism
> should they have the need.
> 
> To solve the defconfig issue (i386 and x86_64 cannot share one)
> the arch/x86/configs/ directory were introduced. This has
> been used by other archs for some time now but x86 had not had
> the need until now.
> 
> The Kconfig files could be consolidated much more - I only
> did the minimal changes to make it work in the new place.

Thanks for doing this.

I think the last remaining bit to cleanup is the symlink from
arch/x86/boot/bzImage. Now that the old directories are gone it does
not make much sense to keep them alive. Andrew will survive it :)

Please send it Linus wards and feel free to add my Acked-by to all of
them.

Thanks,

	tglx

-


From: Sam Ravnborg
Subject: [GIT PULL] kill i386 and x86_64 directories
Date: Oct 25, 2:12 pm 2007

Hi Linus.

This patch serie kill the old i386 and x86_64 directories.
Introducing a few trivial changes in top-level Makefile
and kconfig Makefile allows us to move all files to
arch/x86/ where they belong.

Kay Sievers hit a bug in the first patch-set - this is now fixed and
the updated patch set is uploaded to my x86.git tree.
Build tested on both i386 and x86_64.
I test builded a few other archs just to check that I did not break them.

Shortlog:

Randy Dunlap (1):
      x86: unification of i386 and x86_64 Kconfig.debug

Sam Ravnborg (5):
      x86: move i386 and x86_64 Makefiles to arch/x86
      x86: move defconfig files for i386 and x86_64 to x86
      kconfig: small code refactoring in kconfig Makefile
      x86: move i386 and x86_64 Kconfig files to x86 directory
      x86: kill the old i386 and x86_64 directories

diffstat:

 Makefile                                           |    7 ++-
 arch/i386/.gitignore                               |    1 -
 arch/{i386 => x86}/Kconfig.cpu                     |    0 
 arch/{i386 => x86}/Kconfig.debug                   |   51 +++++++++++++---
 arch/{i386/Kconfig => x86/Kconfig.i386}            |    4 +-
 arch/{x86_64/Kconfig => x86/Kconfig.x86_64}        |    2 +-
 arch/x86/Makefile                                  |   16 +++++
 arch/{i386/Makefile => x86/Makefile_32}            |    7 +--
 arch/{i386/Makefile.cpu => x86/Makefile_32.cpu}    |    0 
 arch/{x86_64/Makefile => x86/Makefile_64}          |    5 +-
 .../{i386/defconfig => x86/configs/i386_defconfig} |    0 
 .../defconfig => x86/configs/x86_64_defconfig}     |    0 
 arch/x86_64/.gitignore                             |    1 -
 arch/x86_64/Kconfig.debug                          |   61 --------------------
 scripts/kconfig/Makefile                           |   35 +++++++-----
 15 files changed, 89 insertions(+), 101 deletions(-)

A nice patch serie that deletes more lines than it adds.

Under normal circumstances I would not send this to you after the
merge window but this serie give a good hint to the casual
reader that something changed now the directories are gone.
So they do not ask - why are so many files missing. Now they
will hunt for the new location.


Thomas wrote:
On Thu, Oct 25, 2007 at 10:17:53PM +0200, Thomas Gleixner wrote:
> 
> Thanks for doing this.
> 
> I think the last remaining bit to cleanup is the symlink from
> arch/x86/boot/bzImage. Now that the old directories are gone it does
> not make much sense to keep them alive. Andrew will survive it :)
> 
> Please send it Linus wards and feel free to add my Acked-by to all of
> them.

I did not amend the serie to add his acked-by - but just kept it in this mail.

Please pull from:

	git://git.kernel.org/pub/scm/linux/kernel/git/sam/x86.git


	Sam
-