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

From: Stephen Rothwell
Date: Wed Jun 05 2019 - 20:29:34 EST

Hi all,

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


between commit:

c942fddf8793 ("treewide: Replace GPLv2 boilerplate/reference with SPDX - rule 157")

from Linus' tree and commit:

7394ec51cf51 ("hwmon: (nct7904) Fix the incorrect value of tcpu_mask in nct7904_data struct.")

from the hwmon-staging 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.

Stephen Rothwell

diff --cc drivers/hwmon/nct7904.c
index 58a957445484,91d1eb822707..000000000000
--- a/drivers/hwmon/nct7904.c
+++ b/drivers/hwmon/nct7904.c
@@@ -4,6 -3,19 +4,9 @@@
* Copyright (c) 2015 Kontron
* Author: Vadim V. Vlasov <vvlasov@xxxxxxxxxxxxx>
+ *
+ * Copyright (c) 2019 Advantech
+ * Author: Amy.Shih <amy.shih@xxxxxxxxxxxxxxxx>
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * GNU General Public License for more details.

#include <linux/module.h>

Attachment: pgp7KRzGsSyuh.pgp
Description: OpenPGP digital signature