All of lore.kernel.org
 help / color / mirror / Atom feed
From: Jens Axboe <axboe@kernel.dk>
To: Christoph Hellwig <hch@infradead.org>
Cc: Keith Busch <keith.busch@intel.com>,
	linux-block@vger.kernel.org, Sagi Grimberg <sagi@grimberg.me>,
	linux-nvme@lists.infradead.org
Subject: Re: [GIT PULL] nvme fixes for 4.20
Date: Fri, 9 Nov 2018 06:29:58 -0700	[thread overview]
Message-ID: <e1f4b4f5-6679-941f-638f-cdf3394ce773@kernel.dk> (raw)
In-Reply-To: <20181109132011.GA2706@infradead.org>

On 11/9/18 6:20 AM, Christoph Hellwig wrote:
> On Fri, Nov 09, 2018 at 06:16:09AM -0700, Jens Axboe wrote:
>> On 11/8/18 11:56 PM, Christoph Hellwig wrote:
>>>  - revert an RDMA commit that didn't help but caused problems
>>>  - fix another minor P2P fallout
>>>  - make sure the multipath device inherits the devices limits of
>>>    the controllers below
>>>
>>> The following changes since commit 651022382c7f8da46cb4872a545ee1da6d097d2a:
>>>
>>>   Linux 4.20-rc1 (2018-11-04 15:37:52 -0800)
>>>
>>> are available in the Git repository at:
>>>
>>>   git://git.infradead.org/nvme.git nvme-4.20
>>
>> This is based on 4.20-rc1 for some reason, not my for-linus. So I get
>> a few thousand extra commits... I pulled the patches and applied
>> manually.
> 
> 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@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.

-- 
Jens Axboe

WARNING: multiple messages have this Message-ID (diff)
From: axboe@kernel.dk (Jens Axboe)
Subject: [GIT PULL] nvme fixes for 4.20
Date: Fri, 9 Nov 2018 06:29:58 -0700	[thread overview]
Message-ID: <e1f4b4f5-6679-941f-638f-cdf3394ce773@kernel.dk> (raw)
In-Reply-To: <20181109132011.GA2706@infradead.org>

On 11/9/18 6:20 AM, Christoph Hellwig wrote:
> On Fri, Nov 09, 2018@06:16:09AM -0700, Jens Axboe wrote:
>> On 11/8/18 11:56 PM, Christoph Hellwig wrote:
>>>  - revert an RDMA commit that didn't help but caused problems
>>>  - fix another minor P2P fallout
>>>  - make sure the multipath device inherits the devices limits of
>>>    the controllers below
>>>
>>> The following changes since commit 651022382c7f8da46cb4872a545ee1da6d097d2a:
>>>
>>>   Linux 4.20-rc1 (2018-11-04 15:37:52 -0800)
>>>
>>> are available in the Git repository at:
>>>
>>>   git://git.infradead.org/nvme.git nvme-4.20
>>
>> This is based on 4.20-rc1 for some reason, not my for-linus. So I get
>> a few thousand extra commits... I pulled the patches and applied
>> manually.
> 
> 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.

-- 
Jens Axboe

  reply	other threads:[~2018-11-09 13:29 UTC|newest]

Thread overview: 30+ 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  6:56 ` Christoph Hellwig
2018-11-09 13:16 ` Jens Axboe
2018-11-09 13:16   ` Jens Axboe
2018-11-09 13:20   ` Christoph Hellwig
2018-11-09 13:20     ` Christoph Hellwig
2018-11-09 13:29     ` Jens Axboe [this message]
2018-11-09 13:29       ` Jens Axboe
2018-11-09 17:10       ` Sagi Grimberg
2018-11-09 17:10         ` Sagi Grimberg
2018-11-09 17:12         ` Jens Axboe
2018-11-09 17:12           ` Jens Axboe
  -- strict thread matches above, loose matches on Subject: below --
2018-12-07 15:38 Christoph Hellwig
2018-12-07 15:38 ` Christoph Hellwig
2018-12-07 15:40 ` Jens Axboe
2018-12-07 15:40   ` Jens Axboe
2018-11-30 15:24 Christoph Hellwig
2018-11-30 15:24 ` Christoph Hellwig
2018-11-30 15:26 ` Jens Axboe
2018-11-30 15:26   ` Jens Axboe
2018-11-30 15:37   ` Keith Busch
2018-11-30 15:37     ` Keith Busch
2018-11-30 16:26   ` Christoph Hellwig
2018-11-30 16:26     ` Christoph Hellwig
2018-11-30 17:12     ` Jens Axboe
2018-11-30 17:12       ` Jens Axboe
2018-11-02  6:37 Christoph Hellwig
2018-11-02  6:37 ` Christoph Hellwig
2018-11-02 14:15 ` Jens Axboe
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=e1f4b4f5-6679-941f-638f-cdf3394ce773@kernel.dk \
    --to=axboe@kernel.dk \
    --cc=hch@infradead.org \
    --cc=keith.busch@intel.com \
    --cc=linux-block@vger.kernel.org \
    --cc=linux-nvme@lists.infradead.org \
    --cc=sagi@grimberg.me \
    /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.