Re: [2.6 patch] update .gitignore

Previous thread: THINKPAD_ACPI_INPUT_ENABLED seems regressive by Hugh Dickins on Wednesday, August 1, 2007 - 9:07 am. (6 messages)

Next thread: [PATCH] AT91: include atmel_lcdc.h in at91sam926{1,3}_devices.c by Jan Altenberg on Wednesday, August 1, 2007 - 9:22 am. (1 message)
To: Andrew Morton <akpm@...>
Cc: <linux-kernel@...>
Date: Wednesday, August 1, 2007 - 9:10 am

Some shipped files were wrongly ignored by git.

Signed-off-by: Adrian Bunk <bunk@stusta.de>

---

.gitignore | 9 ++++++++-
1 file changed, 8 insertions(+), 1 deletion(-)

--- linux-2.6.23-rc1-mm2/.gitignore.old 2007-08-01 14:12:43.000000000 +0200
+++ linux-2.6.23-rc1-mm2/.gitignore 2007-08-01 14:52:51.000000000 +0200
@@ -14,18 +14,25 @@
*.so
*.mod.c
*.i
+!include/asm-*/*.i
*.lst
*.symtypes

+# .gitignore files
+!.gitignore
+
#
# Top-level generic files
#
tags
TAGS
vmlinux*
-!vmlinux.lds.S
+!vmlinux*.lds*
+!vmlinux*.scr
System.map
Module.symvers
+!.mailmap
+!.mm

#
# Generated include files

-

To: Adrian Bunk <bunk@...>
Cc: Andrew Morton <akpm@...>, <linux-kernel@...>
Date: Wednesday, August 1, 2007 - 3:07 pm

I think these should be renamed to .S and let .i alone for preprocessed

-

To: Alexey Dobriyan <adobriyan@...>
Cc: Andrew Morton <akpm@...>, <linux-kernel@...>, Andi Kleen <andi@...>
Date: Wednesday, August 1, 2007 - 3:10 pm

Fine with me if Andi agrees.

cu
Adrian

--

"Is there not promise of rain?" Ling Tan asked suddenly out
of the darkness. There had been need of rain for many days.
"Only a promise," Lao Er said.
Pearl S. Buck - Dragon Seed

-

To: Alexey Dobriyan <adobriyan@...>
Cc: Andrew Morton <akpm@...>, <linux-kernel@...>, Andi Kleen <andi@...>
Date: Sunday, August 19, 2007 - 7:01 pm

Andi?

cu
Adrian

--

"Is there not promise of rain?" Ling Tan asked suddenly out
of the darkness. There had been need of rain for many days.
"Only a promise," Lao Er said.
Pearl S. Buck - Dragon Seed

-

To: Adrian Bunk <bunk@...>
Cc: Alexey Dobriyan <adobriyan@...>, Andrew Morton <akpm@...>, <linux-kernel@...>, Andi Kleen <andi@...>
Date: Sunday, August 19, 2007 - 8:16 pm

Hmm, perhaps rename alternative-asm.i to .h and stick a #ifdef __ASSEMBLY__
around it.

There is actually only one includer currently, but there might
be more in the future again.

-Andi

-

To: Andi Kleen <andi@...>, <jdike@...>
Cc: Alexey Dobriyan <adobriyan@...>, Andrew Morton <akpm@...>, <linux-kernel@...>, <discuss@...>, <user-mode-linux-devel@...>
Date: Wednesday, August 29, 2007 - 7:29 pm

cu
Adrian

<-- snip -->

.i is an ending used for preprocessed stuff.

This patch therefore renames assembler include files to .h and guards
the contents with an #ifdef __ASSEMBLY__.

Signed-off-by: Adrian Bunk <bunk@kernel.org>

---

arch/i386/lib/semaphore.S | 4 ++--
arch/x86_64/lib/rwlock.S | 2 +-
include/asm-i386/alternative-asm.h | 16 ++++++++++++++++
include/asm-i386/alternative-asm.i | 12 ------------
include/asm-i386/frame.h | 27 +++++++++++++++++++++++++++
include/asm-i386/frame.i | 23 -----------------------
include/asm-um/alternative-asm.h | 6 ++++++
include/asm-um/alternative-asm.i | 6 ------
include/asm-um/frame.h | 6 ++++++
include/asm-um/frame.i | 6 ------
include/asm-x86_64/alternative-asm.h | 16 ++++++++++++++++
include/asm-x86_64/alternative-asm.i | 12 ------------
12 files changed, 74 insertions(+), 62 deletions(-)

7b64536780b39820b13bebd144983c3c8c9ae64c
diff --git a/arch/i386/lib/semaphore.S b/arch/i386/lib/semaphore.S
index c01eb39..444fba4 100644
--- a/arch/i386/lib/semaphore.S
+++ b/arch/i386/lib/semaphore.S
@@ -15,8 +15,8 @@

#include <linux/linkage.h>
#include <asm/rwlock.h>
-#include <asm/alternative-asm.i>
-#include <asm/frame.i>
+#include <asm/alternative-asm.h>
+#include <asm/frame.h>
#include <asm/dwarf2.h>

/*
diff --git a/arch/x86_64/lib/rwlock.S b/arch/x86_64/lib/rwlock.S
index 0cde1f8..05ea55f 100644
--- a/arch/x86_64/lib/rwlock.S
+++ b/arch/x86_64/lib/rwlock.S
@@ -2,7 +2,7 @@

#include <linux/linkage.h>
#include <asm/rwlock.h>
-#include <asm/alternative-asm.i>
+#include <asm/alternative-asm.h>
#include <asm/dwarf2.h>

/* rdi: pointer to rwlock_t */
diff --git a/include/asm-i386/alternative-asm.h b/include/asm-i386/alternative-asm.h
new file mode 100644
index 0000000..c478a03
--- /dev/...

Previous thread: THINKPAD_ACPI_INPUT_ENABLED seems regressive by Hugh Dickins on Wednesday, August 1, 2007 - 9:07 am. (6 messages)

Next thread: [PATCH] AT91: include atmel_lcdc.h in at91sam926{1,3}_devices.c by Jan Altenberg on Wednesday, August 1, 2007 - 9:22 am. (1 message)