Groups | Search | Server Info | Keyboard shortcuts | Login | Register [http] [https] [nntp] [nntps]
Groups > linux.kernel > #1673209
| From | Jens Axboe <axboe@kernel.dk> |
|---|---|
| Newsgroups | linux.kernel |
| Subject | Re: linux-next: manual merge of the block tree with Linus' tree |
| Date | 2017-06-23 06:00 +0200 |
| Message-ID | <tVnVf-5pm-11@gated-at.bofh.it> (permalink) |
| References | <tVn8R-593-5@gated-at.bofh.it> <tVn8R-593-3@gated-at.bofh.it> <tVnsd-5g3-3@gated-at.bofh.it> <tVnsd-5g3-1@gated-at.bofh.it> <tVnBT-5iX-3@gated-at.bofh.it> |
| Organization | linux.* mail to news gateway |
On 06/22/2017 09:33 PM, Stephen Rothwell wrote: > Hi Jens, > > On Thu, 22 Jun 2017 21:27:04 -0600 Jens Axboe <axboe@kernel.dk> wrote: >> >> On 06/22/2017 09:24 PM, Stephen Rothwell wrote: >>> Hi Jens, >>> >>> On Thu, 22 Jun 2017 21:09:22 -0600 Jens Axboe <axboe@kernel.dk> wrote: >>>> >>>> I'll cherry pick that commit into the 4.13 branch to get this resolved. >>> >>> Merging commit 8e8320c9315c might give a better result ... >> >> I don't want to pull the whole thing in, just that offending commit. > > Your tree is already based on v4.12-rc5 so you are not really pulling > much in at all: > > $ git rev-list --count --no-merges 8e8320c9315c ^block/for-next > 14 Yeah good point, I guess not a lot has happened since -rc5. -- Jens Axboe
Back to linux.kernel | Previous | Next — Previous in thread | Next in thread | Find similar | Unroll thread
Re: linux-next: manual merge of the block tree with Linus' tree Jens Axboe <axboe@kernel.dk> - 2017-06-23 05:10 +0200
Re: linux-next: manual merge of the block tree with Linus' tree Jens Axboe <axboe@kernel.dk> - 2017-06-23 05:30 +0200
Re: linux-next: manual merge of the block tree with Linus' tree Stephen Rothwell <sfr@canb.auug.org.au> - 2017-06-23 05:40 +0200
Re: linux-next: manual merge of the block tree with Linus' tree Jens Axboe <axboe@kernel.dk> - 2017-06-23 06:00 +0200
Re: linux-next: manual merge of the block tree with Linus' tree Stephen Rothwell <sfr@canb.auug.org.au> - 2017-06-23 05:30 +0200
Re: linux-next: manual merge of the block tree with Linus' tree Jens Axboe <axboe@kernel.dk> - 2017-06-23 05:30 +0200
csiph-web