From: Jason Gunthorpe <jgg@mellanox•com>
To: Stephen Rothwell <sfr@canb•auug.org.au>
Cc: Doug Ledford <dledford@redhat•com>,
Mauro Carvalho Chehab <mchehab@kernel•org>,
Linux Next Mailing List <linux-next@vger•kernel.org>,
Linux Kernel Mailing List <linux-kernel@vger•kernel.org>
Subject: Re: linux-next: manual merge of the rdma tree with the v4l-dvb-next tree
Date: Tue, 16 Jul 2019 12:26:40 +0000 [thread overview]
Message-ID: <20190716122637.GA29741@mellanox.com> (raw)
In-Reply-To: <20190716104614.2ec8b57c@canb.auug.org.au>
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
next prev parent reply other threads:[~2019-07-16 12:26 UTC|newest]
Thread overview: 3+ messages / expand[flat|nested] mbox.gz Atom feed top
2019-07-16 0:46 linux-next: manual merge of the rdma tree with the v4l-dvb-next tree Stephen Rothwell
2019-07-16 12:26 ` Jason Gunthorpe [this message]
2019-07-16 12:40 ` Mauro Carvalho Chehab
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20190716122637.GA29741@mellanox.com \
--to=jgg@mellanox$(echo .)com \
--cc=dledford@redhat$(echo .)com \
--cc=linux-kernel@vger$(echo .)kernel.org \
--cc=linux-next@vger$(echo .)kernel.org \
--cc=mchehab@kernel$(echo .)org \
--cc=sfr@canb$(echo .)auug.org.au \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox