linux-next: manual merge of the clockevents tree with Linus' tree

linux-next: manual merge of the clockevents tree with Linus' tree

[Stephen Rothwell]

[-- Attachment #1: Type: text/plain, Size: 1346 bytes --]

Hi all,

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

  drivers/clocksource/timer-tegra.c

between commit:

  9c92ab619141 ("treewide: Replace GPLv2 boilerplate/reference with SPDX - rule 282")

from Linus' tree and commit:

  75e9f7c6dca8 ("clocksource/drivers/tegra: Use SPDX identifier")

from the clockevents 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/clocksource/timer-tegra.c
index 1e7ece279730,9406855781ff..000000000000
--- a/drivers/clocksource/timer-tegra.c
+++ b/drivers/clocksource/timer-tegra.c
@@@ -1,11 -1,11 +1,11 @@@
 -// SPDX-License-Identifier: GPL-2.0
 +// SPDX-License-Identifier: GPL-2.0-only
  /*
   * Copyright (C) 2010 Google, Inc.
-  *
-  * Author:
-  *	Colin Cross <ccross@google.com>
+  * Author: Colin Cross <ccross@google.com>
   */
  
+ #define pr_fmt(fmt)	"tegra-timer: " fmt
+ 
  #include <linux/clk.h>
  #include <linux/clockchips.h>
  #include <linux/cpu.h>

[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 488 bytes --]

linux-next: manual merge of the clockevents tree with Linus' tree

[Stephen Rothwell]

Hi Daniel,

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

  drivers/clocksource/arm_arch_timer.c

between commit:

  d9b5e41591ca ("clocksource: arm_arch_timer: Extend arch_timer_kvm_info to get the virtual IRQ")

from Linus' tree and commit:

  e6f3cf51efde ("clocksource/drivers/arm_arch_timer: Convert init function to return error")

from the clockevents 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/clocksource/arm_arch_timer.c
index 4814446a0024,51042ed0d9ab..000000000000
--- a/drivers/clocksource/arm_arch_timer.c
+++ b/drivers/clocksource/arm_arch_timer.c
@@@ -743,13 -743,14 +744,18 @@@ static int __init arch_timer_init(void
  		}
  	}
  
- 	arch_timer_register();
- 	arch_timer_common_init();
+ 	ret = arch_timer_register();
+ 	if (ret)
+ 		return ret;
+ 
 -	return arch_timer_common_init();
++	ret = arch_timer_common_init();
 +
 +	arch_timer_kvm_info.virtual_irq = arch_timer_ppi[VIRT_PPI];
++
++	return ret;
  }
  
- static void __init arch_timer_of_init(struct device_node *np)
+ static int __init arch_timer_of_init(struct device_node *np)
  {
  	int i;
  

linux-next: manual merge of the clockevents tree with Linus' tree

[Stephen Rothwell]

Hi Daniel,

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

  drivers/clocksource/Kconfig

between commit:

  863ee050726b ("clocksource/drivers: Fix dependencies for !HAS_IOMEM archs")

from Linus' tree and commit:

  0219c41c9e0a ("clocksource/drivers/lpc32xx: Support timer-based ARM delay")

from the clockevents tree.

I fixed it up (see below) and can carry the fix as necessary (no action
is required).

-- 
Cheers,
Stephen Rothwell

diff --cc drivers/clocksource/Kconfig
index 33db7406c0e2,04954877d227..000000000000
--- a/drivers/clocksource/Kconfig
+++ b/drivers/clocksource/Kconfig
@@@ -159,7 -152,8 +159,8 @@@ config CLKSRC_EFM3
  
  config CLKSRC_LPC32XX
  	bool "Clocksource for LPC32XX" if COMPILE_TEST
 -	depends on GENERIC_CLOCKEVENTS
 +	depends on GENERIC_CLOCKEVENTS && HAS_IOMEM
+ 	depends on ARM
  	select CLKSRC_MMIO
  	select CLKSRC_OF
  	help

linux-next: manual merge of the clockevents tree with Linus' tree

[Stephen Rothwell]

[-- Attachment #1: Type: text/plain, Size: 942 bytes --]

Hi Daniel,

Today's linux-next merge of the clockevents tree got a conflict in
drivers/clocksource/clksrc-of.c between commit 4c4b053235fa
("clocksource: clksrc-of: Do not drop unheld reference on device node")
from Linus' tree and commit fdca679d87bb ("clocksource: clksrc-of: Warn
if no clock sources are found") from the clockevents tree.

I fixed it up (see below) and can carry the fix as necessary (no action
is required).

-- 
Cheers,
Stephen Rothwell                    sfr@canb.auug.org.au

diff --cc drivers/clocksource/clksrc-of.c
index b9ddd9e3a2f5,a30b42c3ac3b..000000000000
--- a/drivers/clocksource/clksrc-of.c
+++ b/drivers/clocksource/clksrc-of.c
@@@ -35,5 -36,9 +36,8 @@@ void __init clocksource_of_init(void
  
  		init_func = match->data;
  		init_func(np);
 -		of_node_put(np);
+ 		clocksources++;
  	}
+ 	if (!clocksources)
+ 		pr_crit("%s: no matching clocksources found\n", __func__);
  }

[-- Attachment #2: Type: application/pgp-signature, Size: 836 bytes --]