* [PATCH] Documentation: remove 'linux' from dontdiff file
@ 2012-04-13 22:52 H Hartley Sweeten
2012-04-13 23:04 ` richard -rw- weinberger
2012-04-16 19:47 ` Rob Landley
0 siblings, 2 replies; 6+ messages in thread
From: H Hartley Sweeten @ 2012-04-13 22:52 UTC (permalink / raw)
To: Linux Kernel; +Cc: linux-doc
The linux entry in the dontdiff file causes the include/linux
directory to be skipped.
Signed-off-by: H Hartley Sweeten <hsweeten@visionengravers.com>
CC: Randy Dunlap <rdunlap@xenotime.net>
---
diff --git a/Documentation/dontdiff b/Documentation/dontdiff
index b4a898f..a25f35a 100644
--- a/Documentation/dontdiff
+++ b/Documentation/dontdiff
@@ -153,7 +153,6 @@ kxgettext
lkc_defs.h
lex.c
lex.*.c
-linux
logo_*.c
logo_*_clut224.c
logo_*_mono.c
^ permalink raw reply related [flat|nested] 6+ messages in thread* Re: [PATCH] Documentation: remove 'linux' from dontdiff file 2012-04-13 22:52 [PATCH] Documentation: remove 'linux' from dontdiff file H Hartley Sweeten @ 2012-04-13 23:04 ` richard -rw- weinberger 2012-04-13 23:06 ` H Hartley Sweeten 2012-04-16 19:47 ` Rob Landley 1 sibling, 1 reply; 6+ messages in thread From: richard -rw- weinberger @ 2012-04-13 23:04 UTC (permalink / raw) To: H Hartley Sweeten; +Cc: Linux Kernel, linux-doc On Sat, Apr 14, 2012 at 12:52 AM, H Hartley Sweeten <hartleys@visionengravers.com> wrote: > The linux entry in the dontdiff file causes the include/linux > directory to be skipped. > > Signed-off-by: H Hartley Sweeten <hsweeten@visionengravers.com> > CC: Randy Dunlap <rdunlap@xenotime.net> NAK. UserModeLinux generates the linux file. -- Thanks, //richard ^ permalink raw reply [flat|nested] 6+ messages in thread
* RE: [PATCH] Documentation: remove 'linux' from dontdiff file 2012-04-13 23:04 ` richard -rw- weinberger @ 2012-04-13 23:06 ` H Hartley Sweeten 2012-04-13 23:09 ` richard -rw- weinberger 0 siblings, 1 reply; 6+ messages in thread From: H Hartley Sweeten @ 2012-04-13 23:06 UTC (permalink / raw) To: richard -rw- weinberger; +Cc: Linux Kernel, linux-doc On Friday, April 13, 2012 4:04 PM, richard -rw- Weinberger wrote: > On Sat, Apr 14, 2012 at 12:52 AM, H Hartley Sweeten wrote: >> The linux entry in the dontdiff file causes the include/linux >> directory to be skipped. >> >> Signed-off-by: H Hartley Sweeten <hsweeten@visionengravers.com> >> CC: Randy Dunlap <rdunlap@xenotime.net> > > NAK. > > UserModeLinux generates the linux file. Hmm.. So we are suppressing an entire branch of the directory tree (a fairly major one at that) for one file? Oh well... Regards, Hartley ^ permalink raw reply [flat|nested] 6+ messages in thread
* Re: [PATCH] Documentation: remove 'linux' from dontdiff file 2012-04-13 23:06 ` H Hartley Sweeten @ 2012-04-13 23:09 ` richard -rw- weinberger 2012-04-16 19:53 ` Rob Landley 0 siblings, 1 reply; 6+ messages in thread From: richard -rw- weinberger @ 2012-04-13 23:09 UTC (permalink / raw) To: H Hartley Sweeten; +Cc: Linux Kernel, linux-doc On Sat, Apr 14, 2012 at 1:06 AM, H Hartley Sweeten <hartleys@visionengravers.com> wrote: > Hmm.. So we are suppressing an entire branch of the directory tree (a > fairly major one at that) for one file? > No, we need a better solution. Your patch replaces a regression with another one... -- Thanks, //richard ^ permalink raw reply [flat|nested] 6+ messages in thread
* Re: [PATCH] Documentation: remove 'linux' from dontdiff file 2012-04-13 23:09 ` richard -rw- weinberger @ 2012-04-16 19:53 ` Rob Landley 0 siblings, 0 replies; 6+ messages in thread From: Rob Landley @ 2012-04-16 19:53 UTC (permalink / raw) To: richard -rw- weinberger; +Cc: H Hartley Sweeten, Linux Kernel, linux-doc On 04/13/2012 06:09 PM, richard -rw- weinberger wrote: > On Sat, Apr 14, 2012 at 1:06 AM, H Hartley Sweeten > <hartleys@visionengravers.com> wrote: >> Hmm.. So we are suppressing an entire branch of the directory tree (a >> fairly major one at that) for one file? >> > > No, we need a better solution. > Your patch replaces a regression with another one... Could somebody explain the purpose of this file to me? According to SubmittingPatches: > To create a patch for multiple files, you should unpack a "vanilla", > or unmodified kernel source tree, and generate a diff against your > own source tree. For example: > > MYSRC= /devel/linux-2.6 > > tar xvfz linux-2.6.12.tar.gz > mv linux-2.6.12 linux-2.6.12-vanilla > diff -uprN -X linux-2.6.12-vanilla/Documentation/dontdiff \ > linux-2.6.12-vanilla $MYSRC > /tmp/patch > > "dontdiff" is a list of files which are generated by the kernel during > the build process, and should be ignored in any diff(1)-generated > patch. The "dontdiff" file is included in the kernel tree in > 2.6.12 and later. For earlier kernel versions, you can get it > from <http://www.xenotime.net/linux/doc/dontdiff>. Allowing a vmlinux equivalent in there would produce "binary files differ", which is noise but not a regression. (The resulting patch wouldn't functionally differ when applied.) If it's really bothersome, possibly that hunk should have instructions that you should compare against a _clean_ tree you've done "make distclean" on? Rob -- GNU/Linux isn't: Linux=GPLv2, GNU=GPLv3+, they can't share code. Either it's "mere aggregation", or a license violation. Pick one. ^ permalink raw reply [flat|nested] 6+ messages in thread
* Re: [PATCH] Documentation: remove 'linux' from dontdiff file 2012-04-13 22:52 [PATCH] Documentation: remove 'linux' from dontdiff file H Hartley Sweeten 2012-04-13 23:04 ` richard -rw- weinberger @ 2012-04-16 19:47 ` Rob Landley 1 sibling, 0 replies; 6+ messages in thread From: Rob Landley @ 2012-04-16 19:47 UTC (permalink / raw) To: H Hartley Sweeten; +Cc: Linux Kernel, linux-doc On 04/13/2012 05:52 PM, H Hartley Sweeten wrote: > The linux entry in the dontdiff file causes the include/linux > directory to be skipped. > > Signed-off-by: H Hartley Sweeten <hsweeten@visionengravers.com> > CC: Randy Dunlap <rdunlap@xenotime.net> Acked-by: Rob Landley <rob@landley.net> Rob -- GNU/Linux isn't: Linux=GPLv2, GNU=GPLv3+, they can't share code. Either it's "mere aggregation", or a license violation. Pick one. ^ permalink raw reply [flat|nested] 6+ messages in thread
end of thread, other threads:[~2012-04-16 19:53 UTC | newest] Thread overview: 6+ messages (download: mbox.gz / follow: Atom feed) -- links below jump to the message on this page -- 2012-04-13 22:52 [PATCH] Documentation: remove 'linux' from dontdiff file H Hartley Sweeten 2012-04-13 23:04 ` richard -rw- weinberger 2012-04-13 23:06 ` H Hartley Sweeten 2012-04-13 23:09 ` richard -rw- weinberger 2012-04-16 19:53 ` Rob Landley 2012-04-16 19:47 ` Rob Landley
This is an external index of several public inboxes, see mirroring instructions on how to clone and mirror all data and code used by this external index.