[<prev] [next>] [<thread-prev] [thread-next>] [day] [month] [year] [list]
Message-ID: <fb5aa2db6b54edab69a8abad254b346dd3d7b205.camel@kernel.crashing.org>
Date: Fri, 23 Aug 2019 10:41:49 +1000
From: Benjamin Herrenschmidt <benh@...nel.crashing.org>
To: Sagi Grimberg <sagi@...mberg.me>, Christoph Hellwig <hch@....de>
Cc: linux-nvme@...ts.infradead.org, Jens Axboe <axboe@...com>,
Keith Busch <keith.busch@...el.com>,
linux-kernel@...r.kernel.org, Paul Pawlowski <paul@...rm.io>
Subject: Re: [PATCH v4 2/4] nvme-pci: Add support for variable IO SQ element
size
On Thu, 2019-08-22 at 11:02 -0700, Sagi Grimberg wrote:
> > >
> I'll fix it. Note that I'm going to take it out of the tree soon
> because it will have conflicts with Jens for-5.4/block, so we
> will send it to Jens after the initial merge window, after he
> rebases off of Linus.
Conflicts too hard to fixup at merge time ? Otherwise I could just
rebase on top of Jens and put in a topic branch...
Whatever works for you.
Cheers,
Ben.
Powered by blists - more mailing lists