Re: linux-next: manual merge of the akpm-current tree with the block tree

[Jens Axboe]

On 07/12/2016 11:14 PM, Stephen Rothwell wrote:
> Hi Andrew,
>
> Today's linux-next merge of the akpm-current tree got a conflict in:
>
>    drivers/nvme/host/core.c
>
> between commit:
>
>    f80ec966c19b ("nvme: Limit command retries")
>
> from the block tree and commit:
>
>    8cc07e463b0c ("NVMe: don't allocate unused nvme_major")
>
> from the akpm-current tree.
>
> I fixed it up (see below) and can carry the fix as necessary. This
> is now fixed as far as linux-next is concerned, but any non trivial
> conflicts should be mentioned to your upstream maintainer when your tree
> is submitted for merging.  You may also want to consider cooperating
> with the maintainer of the conflicting tree to minimise any particularly
> complex conflicts.

Usually I'm not that picky with trivial stuff going through other trees, 
but with the amount of churn we have in NVMe, it really should go 
through the block tree.

--
Jens Axboe