[GIT PULL] Block driver changes for 4.6-rc

2016-03-19 Thread Jens Axboe
Hi Linus, This is the block driver pull request for this merge window. It sits on top of for-4.6/core, that was just sent out. With the amount of changes we ended up having after the merge window in 4.5, there's a non trivial amount of merging for this branch for NVMe. Even with resolving them

[GIT PULL] Block driver changes for 4.6-rc

2016-03-19 Thread Jens Axboe
Hi Linus, This is the block driver pull request for this merge window. It sits on top of for-4.6/core, that was just sent out. With the amount of changes we ended up having after the merge window in 4.5, there's a non trivial amount of merging for this branch for NVMe. Even with resolving them

Re: [GIT PULL] Block driver changes for 4.6-rc

2016-03-18 Thread Jens Axboe
On 03/18/2016 05:32 PM, Linus Torvalds wrote: On Fri, Mar 18, 2016 at 10:33 AM, Jens Axboe wrote: 1) Pull for-4.6/drivers and do the merges yourself. This is the original branch. 2) Pull for-4.6/drivers-merged, which is the above branch, but with v4.5 merged into it and

Re: [GIT PULL] Block driver changes for 4.6-rc

2016-03-18 Thread Jens Axboe
On 03/18/2016 05:32 PM, Linus Torvalds wrote: On Fri, Mar 18, 2016 at 10:33 AM, Jens Axboe wrote: 1) Pull for-4.6/drivers and do the merges yourself. This is the original branch. 2) Pull for-4.6/drivers-merged, which is the above branch, but with v4.5 merged into it and the merges

Re: [GIT PULL] Block driver changes for 4.6-rc

2016-03-18 Thread Linus Torvalds
On Fri, Mar 18, 2016 at 10:33 AM, Jens Axboe wrote: > > 1) Pull for-4.6/drivers and do the merges yourself. This is the original >branch. > > 2) Pull for-4.6/drivers-merged, which is the above branch, but with v4.5 >merged into it and the merges resolved cleanly. I don't

Re: [GIT PULL] Block driver changes for 4.6-rc

2016-03-18 Thread Linus Torvalds
On Fri, Mar 18, 2016 at 10:33 AM, Jens Axboe wrote: > > 1) Pull for-4.6/drivers and do the merges yourself. This is the original >branch. > > 2) Pull for-4.6/drivers-merged, which is the above branch, but with v4.5 >merged into it and the merges resolved cleanly. I don't think your merge