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

Message-ID: <20211025152034.69923d51@canb.auug.org.au>
Date:   Mon, 25 Oct 2021 15:20:34 +1100
From:   Stephen Rothwell <sfr@...b.auug.org.au>
To:     Steven Rostedt <rostedt@...dmis.org>, Helge Deller <deller@....de>,
        Parisc List <linux-parisc@...r.kernel.org>
Cc:     Linux Kernel Mailing List <linux-kernel@...r.kernel.org>,
        Linux Next Mailing List <linux-next@...r.kernel.org>,
        Sven Schnelle <svens@...ckframe.org>,
        Weizhao Ouyang <o451686892@...il.com>
Subject: linux-next: manual merge of the ftrace tree with the parisc-hd tree

Hi all,

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

  arch/parisc/kernel/ftrace.c

between commit:

  e1e134bf1eb6 ("parisc/ftrace: set function trace function")

from the parisc-hd tree and commit:

  6644c654ea70 ("ftrace: Cleanup ftrace_dyn_arch_init()")

from the ftrace tree.

I fixed it up (see below) 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

diff --cc arch/parisc/kernel/ftrace.c
index 8b9b8ce95d8d,01581f715737..000000000000
--- a/arch/parisc/kernel/ftrace.c
+++ b/arch/parisc/kernel/ftrace.c
@@@ -92,15 -94,8 +92,9 @@@ int ftrace_disable_ftrace_graph_caller(
  #endif
  
  #ifdef CONFIG_DYNAMIC_FTRACE
- 
- int __init ftrace_dyn_arch_init(void)
- {
- 	return 0;
- }
- 
  int ftrace_update_ftrace_func(ftrace_func_t func)
  {
 +	ftrace_func = func;
  	return 0;
  }
  

Content of type "application/pgp-signature" skipped