Skip to contentSkip to conversation

Documentation: remove 'linux' from dontdiff file

PATCH NAK H Hartley Sweeten 3 participants 6 messages Apr 13, 2012 – Apr 16, 2012 Documentation

lore
Share & tools
lore
#0 lore raw

PATCH 1/1 Documentation: remove 'linux' from dontdiff file

The linux entry in the dontdiff file causes the include/linux directory to be skipped.

---

Documentation/dontdiff +0 -1
index b4a898f..a25f35a 100644
@@ -153,7 +153,6 @@ kxgettext
 lkc_defs.h
 lex.c
 lex.*.c
-linux
 logo_*.c
 logo_*_clut224.c
 logo_*_mono.c
#2 lore raw
Quoted 10 lines · richard -rw- Weinberger
Quoted 5 lines · H Hartley Sweeten

The linux entry in the dontdiff file causes the include/linux directory to be skipped.

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

#3 lore raw
Quoted 3 lines · H Hartley Sweeten

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...

Signature · 2 lines
Thanks,
//richard
#4 lore raw
Quoted 8 lines · richard -rw- weinberger
Quoted 3 lines · H Hartley Sweeten

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:

Quoted 11 lines

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
Quoted 5 lines

"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

Signature · 2 lines
GNU/Linux isn't: Linux=GPLv2, GNU=GPLv3+, they can't share code.
Either it's "mere aggregation", or a license violation.  Pick one.