* linux-next: manual merge of the reset tree with the arm-soc tree
@ 2021-01-24 21:28 Stephen Rothwell
0 siblings, 0 replies; 2+ messages in thread
From: Stephen Rothwell @ 2021-01-24 21:28 UTC (permalink / raw)
To: Philipp Zabel, Olof Johansson, Arnd Bergmann, ARM
Cc: Linux Kernel Mailing List, Linux Next Mailing List,
Rafał Miłecki
[-- Attachment #1: Type: text/plain, Size: 1571 bytes --]
Hi all,
Today's linux-next merge of the reset tree got a conflict in:
drivers/reset/Kconfig
between commit:
89d4f98ae90d ("ARM: remove zte zx platform")
from the arm-soc tree and commit:
def26913b66f ("reset: simple: add BCM4908 MISC PCIe reset controller support")
from the reset 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 drivers/reset/Kconfig
index 8dd99ca2192c,752bef7e564f..000000000000
--- a/drivers/reset/Kconfig
+++ b/drivers/reset/Kconfig
@@@ -173,7 -173,7 +173,7 @@@ config RESET_SCM
config RESET_SIMPLE
bool "Simple Reset Controller Driver" if COMPILE_TEST
- default ARCH_AGILEX || ARCH_ASPEED || ARCH_BITMAIN || ARCH_REALTEK || ARCH_STM32 || ARCH_STRATIX10 || ARCH_SUNXI || ARC
- default ARCH_AGILEX || ARCH_ASPEED || ARCH_BCM4908 || ARCH_BITMAIN || ARCH_REALTEK || ARCH_STM32 || ARCH_STRATIX10 || ARCH_SUNXI || ARCH_ZX || ARC
++ default ARCH_AGILEX || ARCH_ASPEED || ARCH_BCM4908 || ARCH_BITMAIN || ARCH_REALTEK || ARCH_STM32 || ARCH_STRATIX10 || ARCH_SUNXI || ARC
help
This enables a simple reset controller driver for reset lines that
that can be asserted and deasserted by toggling bits in a contiguous,
[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 488 bytes --]
^ permalink raw reply [flat|nested] 2+ messages in thread* linux-next: manual merge of the reset tree with the arm-soc tree
@ 2018-12-02 22:26 Stephen Rothwell
0 siblings, 0 replies; 2+ messages in thread
From: Stephen Rothwell @ 2018-12-02 22:26 UTC (permalink / raw)
To: Philipp Zabel, Olof Johansson, Arnd Bergmann, ARM
Cc: Linux Next Mailing List, Linux Kernel Mailing List,
Clément Péron, Dinh Nguyen
[-- Attachment #1: Type: text/plain, Size: 1534 bytes --]
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;
[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 488 bytes --]
^ permalink raw reply [flat|nested] 2+ messages in thread
end of thread, other threads:[~2021-01-24 21:29 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2021-01-24 21:28 linux-next: manual merge of the reset tree with the arm-soc tree Stephen Rothwell
-- strict thread matches above, loose matches on Subject: below --
2018-12-02 22:26 Stephen Rothwell
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox