public inbox for linux-kernel@vger.kernel.org
 help / color / mirror / Atom feed
* [Patch] um: tell git to ignore generated files
@ 2010-02-20 14:33 Américo Wang
  2010-02-20 15:09 ` Al Viro
  0 siblings, 1 reply; 6+ messages in thread
From: Américo Wang @ 2010-02-20 14:33 UTC (permalink / raw)
  To: LKML; +Cc: Jeff Dike, Andrew Morton, user-mode-linux-devel


git should ignore these files, since they are generated.

Signed-off-by: WANG Cong <xiyou.wangcong@gmail.com>
Cc: Jeff Dike <jdike@addtoit.com>

---
diff --git a/.gitignore b/.gitignore
index de6344e..efab0eb 100644
--- a/.gitignore
+++ b/.gitignore
@@ -36,6 +36,7 @@ modules.builtin
 #
 tags
 TAGS
+linux
 vmlinux
 vmlinuz
 System.map
diff --git a/arch/um/.gitignore b/arch/um/.gitignore
new file mode 100644
index 0000000..f22bd73
--- /dev/null
+++ b/arch/um/.gitignore
@@ -0,0 +1,5 @@
+include/shared/kern_constants.h
+include/shared/user_constants.h
+kernel/config.c
+kernel/config.tmp
+kernel/vmlinux.lds


^ permalink raw reply related	[flat|nested] 6+ messages in thread

* Re: [Patch] um: tell git to ignore generated files
  2010-02-20 14:33 [Patch] um: tell git to ignore generated files Américo Wang
@ 2010-02-20 15:09 ` Al Viro
  2010-02-20 15:16   ` Al Viro
  2010-02-20 15:35   ` Américo Wang
  0 siblings, 2 replies; 6+ messages in thread
From: Al Viro @ 2010-02-20 15:09 UTC (permalink / raw)
  To: Am??rico Wang; +Cc: LKML, Jeff Dike, Andrew Morton, user-mode-linux-devel

On Sat, Feb 20, 2010 at 10:33:59PM +0800, Am??rico Wang wrote:
> 
> git should ignore these files, since they are generated.

> +include/shared/kern_constants.h
> +include/shared/user_constants.h

I have patches taking that to include/generated, actually

^ permalink raw reply	[flat|nested] 6+ messages in thread

* Re: [Patch] um: tell git to ignore generated files
  2010-02-20 15:09 ` Al Viro
@ 2010-02-20 15:16   ` Al Viro
  2010-02-20 15:36     ` Américo Wang
  2010-02-20 15:35   ` Américo Wang
  1 sibling, 1 reply; 6+ messages in thread
From: Al Viro @ 2010-02-20 15:16 UTC (permalink / raw)
  To: Am??rico Wang; +Cc: LKML, Jeff Dike, Andrew Morton, user-mode-linux-devel

On Sat, Feb 20, 2010 at 03:09:36PM +0000, Al Viro wrote:
> On Sat, Feb 20, 2010 at 10:33:59PM +0800, Am??rico Wang wrote:
> > 
> > git should ignore these files, since they are generated.
> 
> > +include/shared/kern_constants.h
> > +include/shared/user_constants.h
> 
> I have patches taking that to include/generated, actually

BTW, what's the status of skas4?  I have a series of patches leading towards
resurrection of uml/powerpc (skas0), but I'd rather avoid breaking skas4
in process...  Where does the recent version of that thing live?

^ permalink raw reply	[flat|nested] 6+ messages in thread

* Re: [Patch] um: tell git to ignore generated files
  2010-02-20 15:09 ` Al Viro
  2010-02-20 15:16   ` Al Viro
@ 2010-02-20 15:35   ` Américo Wang
  2010-02-25 14:55     ` [RESEND Patch] " Américo Wang
  1 sibling, 1 reply; 6+ messages in thread
From: Américo Wang @ 2010-02-20 15:35 UTC (permalink / raw)
  To: Al Viro
  Cc: Am??rico Wang, LKML, Jeff Dike, Andrew Morton,
	user-mode-linux-devel

On Sat, Feb 20, 2010 at 03:09:36PM +0000, Al Viro wrote:
>On Sat, Feb 20, 2010 at 10:33:59PM +0800, Am??rico Wang wrote:
>> 
>> git should ignore these files, since they are generated.
>
>> +include/shared/kern_constants.h
>> +include/shared/user_constants.h
>
>I have patches taking that to include/generated, actually

Oh, ok, I can remove these two for you. :)

Thanks.


------------>

Tell git to ignore the generated files under um, except:

include/shared/kern_constants.h
include/shared/user_constants.h

which will be moved to include/generated.

Signed-off-by: WANG Cong <xiyou.wangcong@gmail.com>


---
diff --git a/.gitignore b/.gitignore
index de6344e..efab0eb 100644
--- a/.gitignore
+++ b/.gitignore
@@ -36,6 +36,7 @@ modules.builtin
 #
 tags
 TAGS
+linux
 vmlinux
 vmlinuz
 System.map
diff --git a/arch/um/.gitignore b/arch/um/.gitignore
new file mode 100644
index 0000000..f22bd73
--- /dev/null
+++ b/arch/um/.gitignore
@@ -0,0 +1,3 @@
+kernel/config.c
+kernel/config.tmp
+kernel/vmlinux.lds


^ permalink raw reply related	[flat|nested] 6+ messages in thread

* Re: [Patch] um: tell git to ignore generated files
  2010-02-20 15:16   ` Al Viro
@ 2010-02-20 15:36     ` Américo Wang
  0 siblings, 0 replies; 6+ messages in thread
From: Américo Wang @ 2010-02-20 15:36 UTC (permalink / raw)
  To: Al Viro
  Cc: Am??rico Wang, LKML, Jeff Dike, Andrew Morton,
	user-mode-linux-devel

On Sat, Feb 20, 2010 at 03:16:05PM +0000, Al Viro wrote:
>On Sat, Feb 20, 2010 at 03:09:36PM +0000, Al Viro wrote:
>> On Sat, Feb 20, 2010 at 10:33:59PM +0800, Am??rico Wang wrote:
>> > 
>> > git should ignore these files, since they are generated.
>> 
>> > +include/shared/kern_constants.h
>> > +include/shared/user_constants.h
>> 
>> I have patches taking that to include/generated, actually
>
>BTW, what's the status of skas4?  I have a series of patches leading towards
>resurrection of uml/powerpc (skas0), but I'd rather avoid breaking skas4
>in process...  Where does the recent version of that thing live?

I have no idea, maybe it is still in draft? Jeff?

Thanks.


^ permalink raw reply	[flat|nested] 6+ messages in thread

* [RESEND Patch] um: tell git to ignore generated files
  2010-02-20 15:35   ` Américo Wang
@ 2010-02-25 14:55     ` Américo Wang
  0 siblings, 0 replies; 6+ messages in thread
From: Américo Wang @ 2010-02-25 14:55 UTC (permalink / raw)
  To: Américo Wang
  Cc: Al Viro, LKML, Jeff Dike, Andrew Morton, user-mode-linux-devel


Tell git to ignore the generated files under um, except:

 include/shared/kern_constants.h
 include/shared/user_constants.h

which will be moved to include/generated.

Signed-off-by: WANG Cong <xiyou.wangcong@gmail.com>

---
diff --git a/.gitignore b/.gitignore
index de6344e..efab0eb 100644
--- a/.gitignore
+++ b/.gitignore
@@ -36,6 +36,7 @@ modules.builtin
 #
 tags
 TAGS
+linux
 vmlinux
 vmlinuz
 System.map
diff --git a/arch/um/.gitignore b/arch/um/.gitignore
new file mode 100644
index 0000000..f22bd73
--- /dev/null
+++ b/arch/um/.gitignore
@@ -0,0 +1,3 @@
+kernel/config.c
+kernel/config.tmp
+kernel/vmlinux.lds

^ permalink raw reply related	[flat|nested] 6+ messages in thread

end of thread, other threads:[~2010-02-25 14:52 UTC | newest]

Thread overview: 6+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2010-02-20 14:33 [Patch] um: tell git to ignore generated files Américo Wang
2010-02-20 15:09 ` Al Viro
2010-02-20 15:16   ` Al Viro
2010-02-20 15:36     ` Américo Wang
2010-02-20 15:35   ` Américo Wang
2010-02-25 14:55     ` [RESEND Patch] " Américo Wang

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox