linux-kernel - Re: linux-next: manual merge of the tip tree with the nfsd 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 for Android: free password hash cracker in your pocket

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

Message-ID: <20191121083523.GL4097@hirez.programming.kicks-ass.net>
Date:   Thu, 21 Nov 2019 09:35:23 +0100
From:   Peter Zijlstra <peterz@...radead.org>
To:     Stephen Rothwell <sfr@...b.auug.org.au>
Cc:     Thomas Gleixner <tglx@...utronix.de>, Ingo Molnar <mingo@...e.hu>,
        "H. Peter Anvin" <hpa@...or.com>,
        "J. Bruce Fields" <bfields@...ldses.org>,
        Linux Next Mailing List <linux-next@...r.kernel.org>,
        Linux Kernel Mailing List <linux-kernel@...r.kernel.org>,
        Chuck Lever <chuck.lever@...cle.com>
Subject: Re: linux-next: manual merge of the tip tree with the nfsd tree

On Thu, Nov 21, 2019 at 02:28:33PM +1100, Stephen Rothwell wrote:
> Hi all,
> 
> Today's linux-next merge of the tip tree got a conflict in:
> 
>   include/trace/events/rpcrdma.h
> 
> between commit:
> 
>   832b2cb95543 ("svcrdma: Improve DMA mapping trace points")
> 
> from the nfsd tree and commit:
> 
>   60fdad00827c ("ftrace: Rework event_create_dir()")
> 
> from the tip tree.
> 
> I fixed it up (I just used the former) and can carry the fix as

Yes, that looks right. All I did was remove that stray ';' anyway, which
the nfs patch did too.

Download attachment "signature.asc" of type "application/pgp-signature" (834 bytes)