[git pull] documentation: fix almost duplicate filenames (io/IO-mapping.txt)

[git pull] documentation: fix almost duplicate filenames (io/IO-mapping.txt)

[Randy Dunlap]

Please pull from
	git://git.kernel.org/pub/scm/linux/kernel/git/rdunlap/linux-docs/ #linuxdocs

for one changeset:

commit c4eb8054dc4298c588658579622ac095bce86473
Author: Randy Dunlap <rdunlap@hera.kernel.org>
Date:   Mon Jul 19 22:20:27 2010 +0000

    From: Randy Dunlap <randy.dunlap@oracle.com>
    
    Having both IO-mapping.txt and io-mapping.txt in Documentation/
    was confusing and/or bothersome to some people, so rename
    IO-mapping.txt to bus-virt-phys-mapping.txt.  Also update
    Documentation/00-INDEX for both of these files.

    Signed-off-by: Randy Dunlap <randy.dunlap@oracle.com>
---
patch summary:
 Documentation/00-INDEX                             |    6 ++++--
 .../{IO-mapping.txt => bus-virt-phys-mapping.txt}  |    0
 2 files changed, 4 insertions(+), 2 deletions(-)
 rename Documentation/{IO-mapping.txt => bus-virt-phys-mapping.txt} (100%)



---
(hopefully I got this right.  I'm not a big git user.)

Re: [git pull] documentation: fix almost duplicate filenames (io/IO-mapping.txt)

[Linus Torvalds]

On Mon, Jul 19, 2010 at 6:12 PM, Randy Dunlap <randy.dunlap@oracle.com> wrote:
>
> (hopefully I got this right.  I'm not a big git user.)

Hmm. No.

The commit otherwise looks correct, but the commit message is
buggered. The first line of the message is

   From: Randy Dunlap <randy.dunlap@oracle.com>

rather than the subject of the patch itself.

No fear. Practice makes perfect. Just try again ;)

                Linus

Re: [git pull] documentation: fix almost duplicate filenames (io/IO-mapping.txt)

[Randy Dunlap]

On Mon, 19 Jul 2010 19:27:13 -0700 Linus Torvalds wrote:

> On Mon, Jul 19, 2010 at 6:12 PM, Randy Dunlap <randy.dunlap@oracle.com> wrote:
> >
> > (hopefully I got this right.  I'm not a big git user.)
> 
> Hmm. No.
> 
> The commit otherwise looks correct, but the commit message is
> buggered. The first line of the message is
> 
>    From: Randy Dunlap <randy.dunlap@oracle.com>
> 
> rather than the subject of the patch itself.
> 
> No fear. Practice makes perfect. Just try again ;)


Will do... but how do I edit the commit message?

thanks,
---
~Randy
*** Remember to use Documentation/SubmitChecklist when testing your code ***

Re: [git pull] documentation: fix almost duplicate filenames (io/IO-mapping.txt)

[Borislav Petkov]

From: Randy Dunlap <randy.dunlap@oracle.com>
Date: Mon, Jul 19, 2010 at 10:05:45PM -0700

> On Mon, 19 Jul 2010 19:27:13 -0700 Linus Torvalds wrote:
> 
> > On Mon, Jul 19, 2010 at 6:12 PM, Randy Dunlap <randy.dunlap@oracle.com> wrote:
> > >
> > > (hopefully I got this right.  I'm not a big git user.)
> > 
> > Hmm. No.
> > 
> > The commit otherwise looks correct, but the commit message is
> > buggered. The first line of the message is
> > 
> >    From: Randy Dunlap <randy.dunlap@oracle.com>
> > 
> > rather than the subject of the patch itself.
> > 
> > No fear. Practice makes perfect. Just try again ;)
> 
> 
> Will do... but how do I edit the commit message?

git commit --amend

after you've made sure that the commit you want to edit is at the tip of
the current branch.

-- 
Regards/Gruss,
    Boris.

Re: [git pull] documentation: fix almost duplicate filenames (io/IO-mapping.txt)

[Linus Torvalds]

On Mon, Jul 19, 2010 at 11:59 PM, Borislav Petkov <bp@alien8.de> wrote:
>>
>> Will do... but how do I edit the commit message?
>
> git commit --amend
>
> after you've made sure that the commit you want to edit is at the tip of
> the current branch.

.. and if it's not at the top (like it is this time), do "man
git-rebase" and then you can use "git rebase -i origin" (where
"origin" is whatever your upstream is).

And yeah, this is not something you really should do to anything
you've published, but you'll know better next time and fix it all up
_before_ you publish it and ask me to pull ;)

              Linus

[git pull v2] documentation: fix almost duplicate filenames (io/IO-mapping.txt)

[Randy Dunlap]

Please pull from
	git://git.kernel.org/pub/scm/linux/kernel/git/rdunlap/linux-docs/ #linuxdocs

for one changeset:

commit f0e4984f0df34e344809c35387d895b57eab5dcc
Author: Randy Dunlap <randy.dunlap@oracle.com>
Date:   Mon Jul 19 22:20:27 2010 +0000

    Subject: documentation: fix almost duplicate filenames (IO/io-mapping.txt)
    From: Randy Dunlap <randy.dunlap@oracle.com>
    
    Having both IO-mapping.txt and io-mapping.txt in Documentation/
    was confusing and/or bothersome to some people, so rename
    IO-mapping.txt to bus-virt-phys-mapping.txt.  Also update
    Documentation/00-INDEX for both of these files.
    
    Signed-off-by: Randy Dunlap <randy.dunlap@oracle.com>

---
patch summary:

 Documentation/00-INDEX                             |    6 ++++--
 .../{IO-mapping.txt => bus-virt-phys-mapping.txt}  |    0
 2 files changed, 4 insertions(+), 2 deletions(-)
 rename Documentation/{IO-mapping.txt => bus-virt-phys-mapping.txt} (100%)


and thanks for your help.

Re: [git pull v2] documentation: fix almost duplicate filenames (io/IO-mapping.txt)

[Linus Torvalds]

On Tue, Jul 20, 2010 at 8:39 AM, Randy Dunlap <randy.dunlap@oracle.com> wrote:
>
>    Subject: documentation: fix almost duplicate filenames (IO/io-mapping.txt)
>    From: Randy Dunlap <randy.dunlap@oracle.com>

This is still wrong.

The commit message should not have email headers, and it shouldn't
have a From: in it. The authorship (and committer) information is
separate to the message, so the message _should_ look just something
like:

    documentation: fix almost duplicate filenames (IO/io-mapping.txt)

    Having both IO-mapping.txt and io-mapping.txt in Documentation/
    was confusing and/or bothersome to some people, so rename
    IO-mapping.txt to bus-virt-phys-mapping.txt.  Also update
    Documentation/00-INDEX for both of these files.

    Signed-off-by: Randy Dunlap <randy.dunlap@oracle.com>

and nothing else.

Try using "gitk" on your tree, you'll see how it looks. The first line
is always used as a summary of the whole thing, which is why you want
a single line that describes the thing, and then an empty line,
followed by the more complete description.

The "From: " and "Subject: " lines are just for _emails_ - various git
tools will take an email, and use that email to fill in the commit
information correctly (ie the "Subject:" line of an email becomes that
first summary line, and the "From:" line becomes authorship). But when
you edit the messages directly, don't use those things.

(If you want to set author information that isn't yourself, you'd use
'git commit --author="xyz <xyz@example.com>"' etc, but normally you'd
never need that, since normally if you do "git commit" you're
obviously committing your own work).

              Linus

                 Linus

Re: [git pull v2] documentation: fix almost duplicate filenames (io/IO-mapping.txt)

[Kees Bakker]

On 20 Jul, 2010, at 17:39 , Randy Dunlap wrote:

> Please pull from
> 	git://git.kernel.org/pub/scm/linux/kernel/git/rdunlap/linux-docs/ #linuxdocs
> 
> for one changeset:
> 
> commit f0e4984f0df34e344809c35387d895b57eab5dcc
> Author: Randy Dunlap <randy.dunlap@oracle.com>
> Date:   Mon Jul 19 22:20:27 2010 +0000
> 
>    Subject: documentation: fix almost duplicate filenames (IO/io-mapping.txt)
>    From: Randy Dunlap <randy.dunlap@oracle.com>
> 
>    Having both IO-mapping.txt and io-mapping.txt in Documentation/
>    was confusing and/or bothersome to some people, so rename
>    IO-mapping.txt to bus-virt-phys-mapping.txt.  Also update
>    Documentation/00-INDEX for both of these files.
[...]

Thanks Randy, for making this change. However, there are 13 other pairs of
files that have a similar name conflict (all in the netfilter area). And it
seems to me that these files cannot simply be renamed, because these files
are also part of libc, or perhaps some other public library. Damn. Too late
to complain now.

The files I'm talking about are:
net/ipv4/netfilter/ipt_ECN.c            net/ipv4/netfilter/ipt_ecn.c
net/netfilter/xt_tcpmss.c               net/netfilter/xt_TCPMSS.c
net/netfilter/xt_DSCP.c                 net/netfilter/xt_dscp.c
net/netfilter/xt_rateest.c              net/netfilter/xt_RATEEST.c
net/netfilter/xt_HL.c                   net/netfilter/xt_hl.c
include/linux/netfilter_ipv6/ip6t_hl.h  include/linux/netfilter_ipv6/ip6t_HL.h
include/linux/netfilter/xt_tcpmss.h     include/linux/netfilter/xt_TCPMSS.h
include/linux/netfilter/xt_rateest.h    include/linux/netfilter/xt_RATEEST.h
include/linux/netfilter/xt_MARK.h       include/linux/netfilter/xt_mark.h
include/linux/netfilter/xt_CONNMARK.h   include/linux/netfilter/xt_connmark.h
include/linux/netfilter/xt_DSCP.h       include/linux/netfilter/xt_dscp.h
include/linux/netfilter_ipv4/ipt_ECN.h  include/linux/netfilter_ipv4/ipt_ecn.h
include/linux/netfilter_ipv4/ipt_ttl.h  include/linux/netfilter_ipv4/ipt_TTL.h

What this means is that you cannot do a git-clone of the kernel tree on a Mac
(which has case insensitive filesystem). It's not a huge deal, but to me it
seemed like an unnecessary limitation. (That was when I thought it was just
io-mapping.txt)

	Kees

[git pull v3] documentation: fix almost duplicate filenames (io/IO-mapping.txt)

[Randy Dunlap]

OK, I'll try this one more time...


Please pull from
	git://git.kernel.org/pub/scm/linux/kernel/git/rdunlap/linux-docs/ #linuxdocs

for one changeset:

commit 9fe41e4197f351bc78547ab2d8808e1aca30d87c
Author: Randy Dunlap <randy.dunlap@oracle.com>
Date:   Mon Jul 19 22:20:27 2010 +0000

    documentation: fix almost duplicate filenames (IO/io-mapping.txt)
    
    Having both IO-mapping.txt and io-mapping.txt in Documentation/
    was confusing and/or bothersome to some people, so rename
    IO-mapping.txt to bus-virt-phys-mapping.txt.  Also update
    Documentation/00-INDEX for both of these files.
    
    Signed-off-by: Randy Dunlap <randy.dunlap@oracle.com>

---
patch summary:

 Documentation/00-INDEX                             |    6 ++++--
 .../{IO-mapping.txt => bus-virt-phys-mapping.txt}  |    0
 2 files changed, 4 insertions(+), 2 deletions(-)
 rename Documentation/{IO-mapping.txt => bus-virt-phys-mapping.txt} (100%)