lkml.org 
[lkml]   [2016]   [Dec]   [13]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
/
SubjectRe: [GIT PULL] Block core changes for 4.10
From
Date
On 12/11/2016 06:52 PM, Jens Axboe wrote:
> Note that this pull will throw 3 trivial merge conflicts, since we had
> patches that went into mainline after 4.9-rc1 (upon which this branch is
> based), and one that will not show up in block/blk-flush.c. The latter
> is due to a fix that went in for the flush code using an old request
> flag that is now changed to a per-request one. To ensure that this all
> goes smoothly, I just merged 4.9 with this branch and provide that as a
> reference:
>
> git://git.kernel.dk/linux-block.git for-4.10/merge
>
> But really, the only one you to watch for is this line in
> block/blk-flush.c:
>
> /* for avoiding double accounting */
> rq->cmd_flags &= ~REQ_STARTED;
>
> which should now be:
>
> rq->rq_flags &= ~RQF_STARTED;
>
> and the three merge conflicts that do show up are trivially resolvable.

Since you have merged trees since that contain block drivers, you are
going to get a new merge conflict. There's one with mmc block now, which
is again just a switch from rq->cmd_flags to rq->rq_flags and using
RQF_foo instead of REQ_foo.

--
Jens Axboe

\
 
 \ /
  Last update: 2016-12-13 21:20    [W:0.052 / U:1.612 seconds]
©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site