[<prev] [next>] [<thread-prev] [day] [month] [year] [list]
Message-ID: <2443017de714630058322853d4fff5213f039e56.camel@redhat.com>
Date: Wed, 19 Jun 2019 23:24:33 -0400
From: Doug Ledford <dledford@...hat.com>
To: Stephen Rothwell <sfr@...b.auug.org.au>,
Jason Gunthorpe <jgg@...lanox.com>
Cc: Linux Next Mailing List <linux-next@...r.kernel.org>,
Linux Kernel Mailing List <linux-kernel@...r.kernel.org>,
Leon Romanovsky <leonro@...lanox.com>
Subject: Re: linux-next: manual merge of the rdma tree with Linus' tree
On Thu, 2019-06-20 at 12:06 +1000, Stephen Rothwell wrote:
> Hi all,
>
> Today's linux-next merge of the rdma tree got a conflict in:
>
> include/rdma/ib_verbs.h
>
> between commit:
>
> dc1435c00fcd ("RDMA/srp: Rename SRP sysfs name after IB device
> rename trigger")
>
> from Linus' tree and commit:
>
> 0e2d00eb6fd4 ("RDMA: Add NLDEV_GET_CHARDEV to allow char dev
> discovery and autoload")
>
> 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.
>
Yep, this one was expected. Thanks.
--
Doug Ledford <dledford@...hat.com>
GPG KeyID: B826A3330E572FDD
Fingerprint = AE6B 1BDA 122B 23B4 265B 1274 B826 A333 0E57 2FDD
Download attachment "signature.asc" of type "application/pgp-signature" (834 bytes)
Powered by blists - more mailing lists