All of lore.kernel.org
 help / color / mirror / Atom feed
From: Jens Axboe <axboe@kernel.dk>
To: Linus Torvalds <torvalds@linux-foundation.org>
Cc: "linux-block@vger.kernel.org" <linux-block@vger.kernel.org>,
	"linux-kernel@vger.kernel.org" <linux-kernel@vger.kernel.org>
Subject: Re: [GIT PULL] Block pull request for- 4.11-rc1
Date: Tue, 21 Feb 2017 12:34:43 -0700	[thread overview]
Message-ID: <c536bde0-af28-bae3-3d6c-9ffb66139d6c@kernel.dk> (raw)
In-Reply-To: <CA+55aFw-SYg8nOqEx=i1meGzifojYWVbLtVHEnVqQxPsvus7qg@mail.gmail.com>

On 02/21/2017 12:11 PM, Linus Torvalds wrote:
> On Sun, Feb 19, 2017 at 4:10 PM, Jens Axboe <axboe@kernel.dk> wrote:
>>
>> Please pull! Either this pre-merged branch:
>>
>>   git://git.kernel.dk/linux-block.git for-4.11/linus-merge-signed
>>
>> or
>>
>>   git://git.kernel.dk/linux-block.git for-4.11/block-signed
>>   git://git.kernel.dk/linux-block.git for-4.11/next-signed
> 
> So normally I'd merge them separately, but since you didn't actually
> give me explanations for what the two branches were (ie "block-signed
> does X, next-signed does Y") I didn't feel like I could write a sane
> merge message for the two branches - so I took the pre-merged one.
> 
> Which does bring me to my next issue: *your* merge messages suck too.
> They don't actually talk about what you are merging and why.
> 
> A merge is a commit, and needs to have a message, unless it's really
> really obvious (and they seldom are - merges are generally a lot less
> obvious than most non-merge commits). So just saying
> 
>     Merge branch 'for-4.11/block' into for-4.11/linus-merge
> 
>     Signed-off-by: Jens Axboe <axboe@fb.com>
> 
> is simply not an acceptable merge message. What are you merging, and why?
> 
> Please. We've been very good at having good commit messages in the
> kernel. Merges need good commit messages too!

You are right, and honestly I don't think I've ever done merge commit
messages for my own merges, I only do it when I merge other peoples
branches. I'll improve on it.

-- 
Jens Axboe

  reply	other threads:[~2017-02-21 19:34 UTC|newest]

Thread overview: 43+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2017-02-20  0:10 [GIT PULL] Block pull request for- 4.11-rc1 Jens Axboe
2017-02-20  1:09 ` Bart Van Assche
2017-02-20  1:09   ` Bart Van Assche
2017-02-20  1:15   ` Jens Axboe
2017-02-20  2:12     ` James Bottomley
2017-02-20  2:12       ` James Bottomley
2017-02-20  2:59       ` Jens Axboe
2017-02-20  3:02         ` Jens Axboe
2017-02-20  7:35     ` Christoph Hellwig
2017-02-20 16:16       ` Bart Van Assche
2017-02-20 16:16         ` Bart Van Assche
2017-02-20 16:32         ` Jens Axboe
2017-02-21  1:18           ` Bart Van Assche
2017-02-21  1:18             ` Bart Van Assche
2017-02-24 17:39           ` Bart Van Assche
2017-02-24 17:39             ` Bart Van Assche
2017-02-24 17:51             ` Jens Axboe
2017-02-24 19:43             ` Linus Torvalds
2017-02-24 20:00               ` Jens Axboe
2017-02-24 20:22                 ` Jens Axboe
2017-02-24 21:15                   ` Bart Van Assche
2017-02-24 21:15                     ` Bart Van Assche
2017-02-25 18:17                   ` hch
2017-02-25 18:22                     ` Jens Axboe
2017-02-21 19:11 ` Linus Torvalds
2017-02-21 19:34   ` Jens Axboe [this message]
2017-02-21 23:02   ` Linus Torvalds
2017-02-21 23:15     ` Jens Axboe
2017-02-21 23:23       ` Linus Torvalds
2017-02-22 18:14         ` Jens Axboe
2017-02-22 18:26           ` Linus Torvalds
2017-02-22 18:41             ` Jens Axboe
2017-02-22 18:45               ` Linus Torvalds
2017-02-22 18:52                 ` Jens Axboe
2017-02-22 18:56                   ` Linus Torvalds
2017-02-22 18:58                     ` Jens Axboe
2017-02-22 19:04                       ` Linus Torvalds
2017-02-22 21:29                         ` Jens Axboe
2017-02-22 18:42             ` Linus Torvalds
2017-02-22 18:44               ` Jens Axboe
2017-02-22 21:50                 ` Markus Trippelsdorf
2017-02-22 21:55                   ` Jens Axboe
2017-02-23  0:16                   ` Linus Torvalds

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=c536bde0-af28-bae3-3d6c-9ffb66139d6c@kernel.dk \
    --to=axboe@kernel.dk \
    --cc=linux-block@vger.kernel.org \
    --cc=linux-kernel@vger.kernel.org \
    --cc=torvalds@linux-foundation.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
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.