linux-kernel - 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-next>] [day] [month] [year] [list]

Message-ID: <20191121142833.2c9ffd62@canb.auug.org.au>
Date:   Thu, 21 Nov 2019 14:28:33 +1100
From:   Stephen Rothwell <sfr@...b.auug.org.au>
To:     Thomas Gleixner <tglx@...utronix.de>, Ingo Molnar <mingo@...e.hu>,
        "H. Peter Anvin" <hpa@...or.com>,
        Peter Zijlstra <peterz@...radead.org>,
        "J. Bruce Fields" <bfields@...ldses.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>
Subject: linux-next: manual merge of the tip tree with the nfsd tree

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
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