lkml.org 
[lkml]   [2019]   [Jun]   [19]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    /
    SubjectRe: linux-next: manual merge of the rdma tree with Linus' tree
    From
    Date
    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@redhat.com>
    GPG KeyID: B826A3330E572FDD
    Fingerprint = AE6B 1BDA 122B 23B4 265B 1274 B826 A333 0E57 2FDD
    [unhandled content-type:application/pgp-signature]
    \
     
     \ /
      Last update: 2019-06-20 05:25    [W:2.976 / U:0.352 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site