Subject: linux-next: manual merge of the reset tree with the arm-soc tree

From: Stephen Rothwell <[email-masked]>
Date: Mon, 3 Dec 2018 09:26:26 +1100

Hi Philipp,

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

  arch/arm/mach-socfpga/socfpga.c

between commit:

  8f6f8c77fc4d ("reset: socfpga: add an early reset driver for SoCFPGA")

from the arm-soc tree and commit:

  48e2bab90d8e ("ARM: socfpga: Clean unused functions")

from the reset tree.

Note that it is generally a bad idea to declare extern functions in c
files ... the declaration should be in some header file that is included
by the files containing the definition and usage.  That would
have also removed the need for the forward declaration in
drivers/reset/reset-socfpga.c.

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/arm/mach-socfpga/socfpga.c
index 5fb6f79059a8,cc64576c102b..000000000000
--- a/arch/arm/mach-socfpga/socfpga.c
+++ b/arch/arm/mach-socfpga/socfpga.c
@@@ -32,7 -32,9 +32,9 @@@ void __iomem *rst_manager_base_addr
  void __iomem *sdr_ctl_base_addr;
  unsigned long socfpga_cpu1start_addr;
  
+ extern void __init socfpga_reset_init(void);
+ 
 -void __init socfpga_sysmgr_init(void)
 +static void __init socfpga_sysmgr_init(void)
  {
  	struct device_node *np;