From: axboe@kernel.dk (Jens Axboe)
Subject: [GIT PULL] nvme fixes for 4.20
Date: Fri, 9 Nov 2018 10:12:31 -0700 [thread overview]
Message-ID: <42652118-45e5-a251-0c4b-bc22798f41d4@kernel.dk> (raw)
In-Reply-To: <332dc27f-96a9-e171-1f07-54961d443400@grimberg.me>
On 11/9/18 10:10 AM, Sagi Grimberg wrote:
>
>>> That is because your for-linus was still 4.20-rc based when
>>> I created it.
>>
>> It's never been 4.20-rc based. After the initial merge, it got based
>> on a random commit in the merge window:
>>
>> commit 3acbd2de6bc3af215c6ed7732dfc097d1e238503
>> Merge: d49f8a52b15b de7d83da84bd
>> Author: Linus Torvalds <torvalds at linux-foundation.org>
>> Date: Thu Oct 25 09:00:15 2018 -0700
>>
>> Merge tag 'sound-4.20-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound
>>
>> and has been ever since.
>
> That was because I rebased it when your for-linus didn't include Ming's
> buggy version of the brd commit. Sorry for the mixup..
No problem, it's pretty trivial to just do manually for cases like this.
--
Jens Axboe
next prev parent reply other threads:[~2018-11-09 17:12 UTC|newest]
Thread overview: 15+ messages / expand[flat|nested] mbox.gz Atom feed top
2018-11-09 6:56 [GIT PULL] nvme fixes for 4.20 Christoph Hellwig
2018-11-09 13:16 ` Jens Axboe
2018-11-09 13:20 ` Christoph Hellwig
2018-11-09 13:29 ` Jens Axboe
2018-11-09 17:10 ` Sagi Grimberg
2018-11-09 17:12 ` Jens Axboe [this message]
-- strict thread matches above, loose matches on Subject: below --
2018-12-07 15:38 Christoph Hellwig
2018-12-07 15:40 ` Jens Axboe
2018-11-30 15:24 Christoph Hellwig
2018-11-30 15:26 ` Jens Axboe
2018-11-30 15:37 ` Keith Busch
2018-11-30 16:26 ` Christoph Hellwig
2018-11-30 17:12 ` Jens Axboe
2018-11-02 6:37 Christoph Hellwig
2018-11-02 14:15 ` Jens Axboe
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=42652118-45e5-a251-0c4b-bc22798f41d4@kernel.dk \
--to=axboe@kernel.dk \
/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 a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).