linux-kernel - linux-next: manual merge of the rdma-leon tree with Linus' tree

lists.openwall.net		lists / announce owl-users owl-dev john-users john-dev passwdqc-users yescrypt popa3d-users / oss-security kernel-hardening musl sabotage tlsify passwords / crypt-dev xvendor / Bugtraq Full-Disclosure linux-kernel linux-netdev linux-ext4 linux-hardening linux-cve-announce PHC
Open Source and information security mailing list archives

Hash Suite: Windows password security audit tool. GUI, reports in PDF.

[<prev] [next>] [day] [month] [year] [list]

Message-ID: <20170213103029.60176142@canb.auug.org.au>
Date:   Mon, 13 Feb 2017 10:30:29 +1100
From:   Stephen Rothwell <sfr@...b.auug.org.au>
To:     Leon Romanovsky <leon@...nel.org>
Cc:     linux-next@...r.kernel.org, linux-kernel@...r.kernel.org,
        Doug Ledford <dledford@...hat.com>
Subject: linux-next: manual merge of the rdma-leon tree with Linus' tree

Hi Leon,

Today's linux-next merge of the rdma-leon tree got a conflict in:

  include/uapi/rdma/ib_user_verbs.h

between commit:

  646ebd4166ca ("RDMA: Don't reference kernel private header from UAPI header")

from Linus' tree and commit:

  39bfb78f4acb ("RDMA: Remove kernel private defines and reference to header from UAPI")

from the rdma-leon tree.

More or less the same patch.

I fixed it up (I used the version from Linus' tree (as it contains
explanatory comments)) 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.

-- 
Cheers,
Stephen Rothwell