On Wed, Jan 31, 2018 at 9:47 AM, Jason Gunthorpe <jgg@xxxxxxxxxxxx> wrote:
>
> Since the conflict with v4.15 involves some code motion and is not so
> trivial, so I have included a merge to tag v4.15 as the top commit in
> this PR that has the resolution reviewed by the patch authors and
> tested in linux-next. The tag 'for-linus-unmerged' is available
> without this merge if you desire.
Thanks, this was well done. A thoughtful merge with explanation for
why the conflict happened and why back-merge was done, and taking a
sane merge point (v4.15 rather than some random daily point).
Maybe the back-merge commit itself could have had a slightly more
complete merge message (the kind you had in the pull request here),
but that's a small nit.
So I thought I'd send out a "good job" email just as a contrast to me
having to sometimes complain about back-merges.
Linus
--
To unsubscribe from this list: send the line "unsubscribe linux-rdma" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
