Re: [GIT] Security subsystem upate for 3.18

[Linus Torvalds]

On Fri, Oct 10, 2014 at 4:23 AM, James Morris <jmorris@xxxxxxxxx> wrote:
>
> One of these is from merging with your v3.16, and the other from a merge
> of the keys tree.  That's about all I understand of it.

Please don't do back-merges. What was the reason for that v3.16 merge?
It only caused problems, and the merge message is this worthless
oneliner:

  "Merge commit 'v3.16' into next"

that's it. No reason why, and there doesn't seem to be any merge
conflicts fixed up either, so why was that merge done? The commit
message sure as hell doesn't explain it.

There's another one, by Paul Moore:

   "Merge tag 'v3.16' into next

    Linux 3.16"

and please tell me what that (now two-line) merge message adds to the
world, and why those merges were done at all?

People, stop doing these back-merges. You are doing them wrong, and
they cause problems. Just stop it. And if you have some seriously good
reason for why you are doing them, you should damn well *document*
that reason, rather than say "Merge v3.16" and leave it at that. If
you *don't* have a good reason for doing them, don't do them!

Also, James, *please* give a short description of what I'm merging,
and include both "git" and "pull" in the pull request. As it is, I see
the shortlog and the (completely incorrect, due to the back-merge)
diffstat, but I don't see *why* I should merge it at all. Give me a
synopsis of what has changed and why I should pull.

And finally - I didn't even find the pull request at all with my
normal "look for git pull requests" search that - not completely
randomly - looks for "in:inbox git pull". If I don't find a pull
request with that, it easily gets overlooked. So change your scripts
to add "Please pull" into the body of the message, or make the subject
line be "[GIT PULL]" or something.

These are all things I've ranted about many times before.  Please.

                   Linus
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/