linux-kernel - linux-next: manual merge of the tip tree with the hwmon-staging tree

lists.openwall.net		lists / announce owl-users owl-dev john-users john-dev passwdqc-users yescrypt popa3d-users / oss-security kernel-hardening musl sabotage tlsify passwords / crypt-dev xvendor / Bugtraq Full-Disclosure linux-kernel linux-netdev linux-ext4 linux-hardening linux-cve-announce PHC
Open Source and information security mailing list archives

Hash Suite: Windows password security audit tool. GUI, reports in PDF.

[<prev] [next>] [day] [month] [year] [list]

Message-ID: <20181211143043.668c45c5@canb.auug.org.au>
Date:   Tue, 11 Dec 2018 14:30:43 +1100
From:   Stephen Rothwell <sfr@...b.auug.org.au>
To:     Thomas Gleixner <tglx@...utronix.de>, Ingo Molnar <mingo@...e.hu>,
        "H. Peter Anvin" <hpa@...or.com>,
        Peter Zijlstra <peterz@...radead.org>,
        Guenter Roeck <linux@...ck-us.net>
Cc:     Linux Next Mailing List <linux-next@...r.kernel.org>,
        Linux Kernel Mailing List <linux-kernel@...r.kernel.org>,
        Pu Wen <puwen@...on.cn>, Brian Woods <Brian.Woods@....com>,
        Borislav Petkov <bp@...e.de>
Subject: linux-next: manual merge of the tip tree with the hwmon-staging
 tree

Hi all,

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

  drivers/hwmon/k10temp.c

between commit:

  c552e29fdd63 ("hwmon: (k10temp) Add Hygon Dhyana support")

from the hwmon-staging tree and commit:

  210ba1201ff9 ("hwmon/k10temp: Add support for AMD family 17h, model 30h CPUs")

from the tip 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/hwmon/k10temp.c
index 1eb954daa2c8,9790f1f5eb98..000000000000
--- a/drivers/hwmon/k10temp.c
+++ b/drivers/hwmon/k10temp.c
@@@ -367,7 -360,7 +360,8 @@@ static const struct pci_device_id k10te
  	{ PCI_VDEVICE(AMD, PCI_DEVICE_ID_AMD_16H_M30H_NB_F3) },
  	{ PCI_VDEVICE(AMD, PCI_DEVICE_ID_AMD_17H_DF_F3) },
  	{ PCI_VDEVICE(AMD, PCI_DEVICE_ID_AMD_17H_M10H_DF_F3) },
 +	{ PCI_VDEVICE(HYGON, PCI_DEVICE_ID_AMD_17H_DF_F3) },
+ 	{ PCI_VDEVICE(AMD, PCI_DEVICE_ID_AMD_17H_M30H_DF_F3) },
  	{}
  };
  MODULE_DEVICE_TABLE(pci, k10temp_id_table);

Content of type "application/pgp-signature" skipped