linux-kernel - linux-next: manual merge of the kspp-gustavo tree with the ftrace 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>] [day] [month] [year] [list]

Message-ID: <20211025182423.723b70c6@canb.auug.org.au>
Date:   Mon, 25 Oct 2021 18:24:23 +1100
From:   Stephen Rothwell <sfr@...b.auug.org.au>
To:     "Gustavo A. R. Silva" <gustavo@...eddedor.com>,
        Steven Rostedt <rostedt@...dmis.org>
Cc:     "Gustavo A. R. Silva" <gustavoars@...nel.org>,
        Linux Kernel Mailing List <linux-kernel@...r.kernel.org>,
        Linux Next Mailing List <linux-next@...r.kernel.org>
Subject: linux-next: manual merge of the kspp-gustavo tree with the ftrace
 tree

Hi all,

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

  include/linux/ftrace.h

between commit:

  34cdd18b8d24 ("tracing: Use linker magic instead of recasting ftrace_ops_list_func()")

from the ftrace tree and commit:

  c45ede6c2781 ("ftrace: Fix -Wmissing-prototypes errors")

from the kspp-gustavo tree.

I fixed it up (I just used the former version) 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