From: Stephen Rothwell <sfr@canb.auug.org.au>
To: Daniel Lezcano <daniel.lezcano@linaro.org>
Cc: Linux Next Mailing List <linux-next@vger.kernel.org>,
Linux Kernel Mailing List <linux-kernel@vger.kernel.org>,
Thomas Gleixner <tglx@linutronix.de>,
Greg Kroah-Hartman <gregkh@linuxfoundation.org>,
Dmitry Osipenko <digetx@gmail.com>
Subject: linux-next: manual merge of the clockevents tree with Linus' tree
Date: Tue, 11 Jun 2019 15:24:02 +1000 [thread overview]
Message-ID: <20190611152402.59f9cc0b@canb.auug.org.au> (raw)
[-- 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 --]
next reply other threads:[~2019-06-11 5:24 UTC|newest]
Thread overview: 4+ messages / expand[flat|nested] mbox.gz Atom feed top
2019-06-11 5:24 Stephen Rothwell [this message]
-- strict thread matches above, loose matches on Subject: below --
2016-06-07 3:03 linux-next: manual merge of the clockevents tree with Linus' tree Stephen Rothwell
2016-02-17 2:38 Stephen Rothwell
2013-12-20 4:09 Stephen Rothwell
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20190611152402.59f9cc0b@canb.auug.org.au \
--to=sfr@canb.auug.org.au \
--cc=daniel.lezcano@linaro.org \
--cc=digetx@gmail.com \
--cc=gregkh@linuxfoundation.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-next@vger.kernel.org \
--cc=tglx@linutronix.de \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).