lkml.org 
[lkml]   [2019]   [Jul]   [16]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
/
From
SubjectRe: linux-next: manual merge of the rdma tree with the v4l-dvb-next tree
Date
On Tue, Jul 16, 2019 at 10:46:14AM +1000, Stephen Rothwell wrote:
> Hi all,
>
> Today's linux-next merge of the rdma tree got a conflict in:
>
> Documentation/index.rst
>
> between commit:
>
> 09fdc957ad0d ("docs: leds: add it to the driver-api book")
> (and others following)
>
> from the v4l-dvb-next tree and commit:
>
> a3a400da206b ("docs: infiniband: add it to the driver-api bookset")
>
> from the rdma 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.

I'm surprised this is coming from a v4l tree..

> diff --cc Documentation/index.rst
> index f379e43fcda0,869616b57aa8..000000000000
> --- a/Documentation/index.rst
> +++ b/Documentation/index.rst
> @@@ -96,23 -90,9 +96,24 @@@ needed)
>
> driver-api/index
> core-api/index
> + locking/index
> + accounting/index
> + block/index
> + cdrom/index
> + ide/index
> + fb/index
> + fpga/index
> + hid/index
> + iio/index
> + leds/index
> + infiniband/index

This should be kept sorted, Mauro rdma is already merged you'll need
to tell Linus about this trivial conflict when you send your patches.

Thanks,
Jason

\
 
 \ /
  Last update: 2019-07-16 14:27    [W:0.038 / U:22.796 seconds]
©2003-2018 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site