linux-kernel - linux-next: manual merge of the rdma tree with the nfs-anna 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>] [thread-next>] [day] [month] [year] [list]

Message-ID: <20181224141352.461303be@canb.auug.org.au>
Date:   Mon, 24 Dec 2018 14:13:52 +1100
From:   Stephen Rothwell <sfr@...b.auug.org.au>
To:     Doug Ledford <dledford@...hat.com>,
        Jason Gunthorpe <jgg@...lanox.com>,
        Anna Schumaker <Anna.Schumaker@...app.com>,
        Trond Myklebust <trondmy@...il.com>,
        NFS Mailing List <linux-nfs@...r.kernel.org>
Cc:     Linux Next Mailing List <linux-next@...r.kernel.org>,
        Linux Kernel Mailing List <linux-kernel@...r.kernel.org>,
        Chuck Lever <chuck.lever@...cle.com>,
        Kamal Heib <kamalheib1@...il.com>
Subject: linux-next: manual merge of the rdma tree with the nfs-anna tree

Hi all,

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

  net/sunrpc/xprtrdma/fmr_ops.c

between commit:

  d31f8deac38d ("xprtrdma: Remove support for FMR memory registration")

from the nfs-anna tree and commit:

  3023a1e93656 ("RDMA: Start use ib_device_ops")

from the rdma tree.

I fixed it up (the former removed the file, so I did that) 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

Content of type "application/pgp-signature" skipped