Commit 929f37cb3c3e0f4d23d7106693b7067cf72f4dbc
Committed by
Linus Torvalds
1 parent
1c828320d2
Exists in
master
and in
20 other branches
dontdiff: more updates to be closer to gitignore
defkeymap.c_shipped should be diffed if it is changed. Reported-by: Mike Galbraith <efault@gmx.de> COPYING, CREDITS, .mailmap should be diffed if they are changed. keywords.c_shipped & lex.c_shipped should be diffed when changed. parse.[ch]_shipped should be diffed when changed. Reported-by: Sam Ravnborg <sam@ravnborg.org> vsyscall* updates from a .gitignore patch by "Denis V. Lunev" <den@openvz.org>. *.so.dbg from a .gitignore patch by Thomas Gleixner <tglx@linutronix.de>. binoffset from a .gitignore patch by Uwe Kleine-Koenig <Uwe.Kleine-Koenig@digi.com>. Module.markers from a .gitignore patch by Matthew Wilcox <willy@linux.intel.com>. vmlinux*.lds* should be diffed if changed. Reported-by: Etienne Lorrain <etienne_lorrain@yahoo.fr> vmlinux.lds from a .gitignore patch by Daniel Guilak <daniel@danielguilak.com>. *.scr should be diffed if changed. Lots of updates from http://lkml.org/lkml/2008/5/20/32 Reported-by: Bart Van Assche <bart.vanassche@gmail.com> Use ncscope.* instead of *cscope* since the latter may catch too many files. Add *.elf, from a .gitignore patch by Eduard - Gabriel Munteanu <eduard.munteanu@linux360.ro>. Make firmware entries match .gitignore entries. Make some entries less greedy by removing trailing '*'. Remove "make_times_h" (no such file). Remove "filelist" (no such file). Remove "dummy_sym.c" (no such file). Remove "gen-kdb_cmds.c" (no such file). Remove "gentbl" (no such file). Remove "kconfig.tk" (no such file). Remove "tkparse" (no such file). Remove "sim710_d.h" (no such file). Remove "53c8xx_d.h" (no such file). Add "syscalltab.h" (generated file). Signed-off-by: Randy Dunlap <randy.dunlap@oracle.com> Signed-off-by: Andrew Morton <akpm@linux-foundation.org> Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
Showing 1 changed file with 33 additions and 26 deletions Side-by-side Diff
Documentation/dontdiff
... | ... | @@ -2,11 +2,13 @@ |
2 | 2 | *.aux |
3 | 3 | *.bin |
4 | 4 | *.cpio |
5 | -*.css | |
5 | +*.csp | |
6 | +*.dsp | |
6 | 7 | *.dvi |
8 | +*.elf | |
7 | 9 | *.eps |
8 | -*.fw.gen.S | |
9 | 10 | *.fw |
11 | +*.gen.S | |
10 | 12 | *.gif |
11 | 13 | *.grep |
12 | 14 | *.grp |
... | ... | @@ -30,6 +32,7 @@ |
30 | 32 | *.s |
31 | 33 | *.sgml |
32 | 34 | *.so |
35 | +*.so.dbg | |
33 | 36 | *.symtypes |
34 | 37 | *.tab.c |
35 | 38 | *.tab.h |
36 | 39 | |
37 | 40 | |
38 | 41 | |
... | ... | @@ -38,24 +41,17 @@ |
38 | 41 | *.xml |
39 | 42 | *_MODULES |
40 | 43 | *_vga16.c |
41 | -*cscope* | |
42 | 44 | *~ |
43 | 45 | *.9 |
44 | 46 | *.9.gz |
45 | 47 | .* |
46 | -.cscope | |
47 | -.gitignore | |
48 | -.mailmap | |
49 | 48 | .mm |
50 | 49 | 53c700_d.h |
51 | -53c8xx_d.h* | |
52 | -COPYING | |
53 | -CREDITS | |
54 | 50 | CVS |
55 | 51 | ChangeSet |
56 | 52 | Image |
57 | 53 | Kerntypes |
58 | -MODS.txt | |
54 | +Module.markers | |
59 | 55 | Module.symvers |
60 | 56 | PENDING |
61 | 57 | SCCS |
62 | 58 | |
... | ... | @@ -73,7 +69,9 @@ |
73 | 69 | bbootsect |
74 | 70 | bin2c |
75 | 71 | binkernel.spec |
72 | +binoffset | |
76 | 73 | bootsect |
74 | +bounds.h | |
77 | 75 | bsetup |
78 | 76 | btfixupprep |
79 | 77 | build |
80 | 78 | |
81 | 79 | |
82 | 80 | |
83 | 81 | |
84 | 82 | |
85 | 83 | |
86 | 84 | |
87 | 85 | |
... | ... | @@ -89,39 +87,36 @@ |
89 | 87 | config_data.gz* |
90 | 88 | conmakehash |
91 | 89 | consolemap_deftbl.c* |
90 | +cpustr.h | |
92 | 91 | crc32table.h* |
93 | 92 | cscope.* |
94 | -defkeymap.c* | |
93 | +defkeymap.c | |
95 | 94 | devlist.h* |
96 | 95 | docproc |
97 | -dummy_sym.c* | |
98 | 96 | elf2ecoff |
99 | 97 | elfconfig.h* |
100 | -filelist | |
101 | 98 | fixdep |
102 | 99 | fore200e_mkfirm |
103 | 100 | fore200e_pca_fw.c* |
104 | 101 | gconf |
105 | 102 | gen-devlist |
106 | -gen-kdb_cmds.c* | |
107 | 103 | gen_crc32table |
108 | 104 | gen_init_cpio |
109 | 105 | genksyms |
110 | -gentbl | |
111 | 106 | *_gray256.c |
107 | +ihex2fw | |
112 | 108 | ikconfig.h* |
113 | 109 | initramfs_data.cpio |
114 | 110 | initramfs_data.cpio.gz |
115 | 111 | initramfs_list |
116 | 112 | kallsyms |
117 | 113 | kconfig |
118 | -kconfig.tk | |
119 | -keywords.c* | |
114 | +keywords.c | |
120 | 115 | ksym.c* |
121 | 116 | ksym.h* |
122 | 117 | kxgettext |
123 | 118 | lkc_defs.h |
124 | -lex.c* | |
119 | +lex.c | |
125 | 120 | lex.*.c |
126 | 121 | logo_*.c |
127 | 122 | logo_*_clut224.c |
... | ... | @@ -130,7 +125,6 @@ |
130 | 125 | mach-types |
131 | 126 | mach-types.h |
132 | 127 | machtypes.h |
133 | -make_times_h | |
134 | 128 | map |
135 | 129 | maui_boot.h |
136 | 130 | mconf |
... | ... | @@ -138,6 +132,7 @@ |
138 | 132 | mk_elfconfig |
139 | 133 | mkboot |
140 | 134 | mkbugboot |
135 | +mkcpustr | |
141 | 136 | mkdep |
142 | 137 | mkprep |
143 | 138 | mktables |
144 | 139 | |
... | ... | @@ -145,11 +140,12 @@ |
145 | 140 | modpost |
146 | 141 | modules.order |
147 | 142 | modversions.h* |
143 | +ncscope.* | |
148 | 144 | offset.h |
149 | 145 | offsets.h |
150 | 146 | oui.c* |
151 | -parse.c* | |
152 | -parse.h* | |
147 | +parse.c | |
148 | +parse.h | |
153 | 149 | patches* |
154 | 150 | pca200e.bin |
155 | 151 | pca200e_ecd.bin2 |
... | ... | @@ -157,7 +153,7 @@ |
157 | 153 | piggyback |
158 | 154 | pnmtologo |
159 | 155 | ppc_defs.h* |
160 | -promcon_tbl.c* | |
156 | +promcon_tbl.c | |
161 | 157 | pss_boot.h |
162 | 158 | qconf |
163 | 159 | raid6altivec*.c |
164 | 160 | |
165 | 161 | |
166 | 162 | |
167 | 163 | |
168 | 164 | |
169 | 165 | |
170 | 166 | |
... | ... | @@ -168,28 +164,39 @@ |
168 | 164 | setup |
169 | 165 | setup.bin |
170 | 166 | setup.elf |
171 | -sim710_d.h* | |
172 | 167 | sImage |
173 | 168 | sm_tbl* |
174 | 169 | split-include |
170 | +syscalltab.h | |
175 | 171 | tags |
176 | 172 | tftpboot.img |
177 | 173 | timeconst.h |
178 | 174 | times.h* |
179 | -tkparse | |
180 | 175 | trix_boot.h |
181 | 176 | utsrelease.h* |
177 | +vdso-syms.lds | |
182 | 178 | vdso.lds |
179 | +vdso32-int80-syms.lds | |
180 | +vdso32-syms.lds | |
181 | +vdso32-syscall-syms.lds | |
182 | +vdso32-sysenter-syms.lds | |
183 | +vdso32.lds | |
184 | +vdso32.so.dbg | |
185 | +vdso64.lds | |
186 | +vdso64.so.dbg | |
183 | 187 | version.h* |
184 | 188 | vmlinux |
185 | 189 | vmlinux-* |
186 | 190 | vmlinux.aout |
187 | -vmlinux*.lds* | |
188 | -vmlinux*.scr | |
191 | +vmlinux.lds | |
189 | 192 | vsyscall.lds |
193 | +vsyscall_32.lds | |
190 | 194 | wanxlfw.inc |
191 | 195 | uImage |
192 | 196 | unifdef |
197 | +wakeup.bin | |
198 | +wakeup.elf | |
199 | +wakeup.lds | |
193 | 200 | zImage* |
194 | 201 | zconf.hash.c |