linux-kernel - linux-next: please clean up 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: <20180321111140.618e1e6c@canb.auug.org.au>
Date:   Wed, 21 Mar 2018 11:11:40 +1100
From:   Stephen Rothwell <sfr@...b.auug.org.au>
To:     Anna Schumaker <Anna.Schumaker@...app.com>,
        Trond Myklebust <trond.myklebust@....uio.no>,
        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>
Subject: linux-next: please clean up the nfs-anna tree

Hi all,

It only seems to contain commits that have been upsreamed as different
commits and is causing conflicts:

CONFLICT (content): Merge conflict in net/sunrpc/xprtrdma/transport.c
CONFLICT (content): Merge conflict in net/sunrpc/xprt.c

-- 
Cheers,
Stephen Rothwell

Content of type "application/pgp-signature" skipped