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

From: Stephen Rothwell <[email-masked]>
Date: Tue, 11 Jun 2019 15:24:02 +1000

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 <[email-masked]>
+  * Author: Colin Cross <[email-masked]>
   */
  
+ #define pr_fmt(fmt)	"tegra-timer: " fmt
+ 
  #include <linux/clk.h>
  #include <linux/clockchips.h>
  #include <linux/cpu.h>