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

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

[Stephen Rothwell]

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

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);

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

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

[Stephen Rothwell]

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

Hi all,

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

  drivers/hwmon/coretemp.c

between commit:

  601fdf7e6635 ("hwmon: Correct struct allocation style")

from the hwmon-staging tree and commit:

  835896a59b95 ("hwmon/coretemp: Cosmetic: Rename internal variables to zones from packages")

from the tip tree.

I fixed it up (the comment fixed in the latter was also fixed in the
former) 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

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

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

[Stephen Rothwell]

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

Hi all,

On Mon, 1 Jul 2019 17:15:24 +1000 Stephen Rothwell <sfr@canb.auug.org.au> wrote:
>
> Today's linux-next merge of the tip tree got a conflict in:
> 
>   drivers/hwmon/coretemp.c
> 
> between commit:
> 
>   601fdf7e6635 ("hwmon: Correct struct allocation style")
> 
> from the hwmon-staging tree and commit:
> 
>   835896a59b95 ("hwmon/coretemp: Cosmetic: Rename internal variables to zones from packages")
> 
> from the tip tree.
> 
> I fixed it up (the comment fixed in the latter was also fixed in the
> former) 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.

I am still getting this conflict (the commit ids may have changed).
Just a reminder in case you think Linus may need to know.

-- 
Cheers,
Stephen Rothwell

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

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

[Guenter Roeck]

On 7/8/19 5:17 PM, Stephen Rothwell wrote:
> Hi all,
> 
> On Mon, 1 Jul 2019 17:15:24 +1000 Stephen Rothwell <sfr@canb.auug.org.au> wrote:
>>
>> Today's linux-next merge of the tip tree got a conflict in:
>>
>>    drivers/hwmon/coretemp.c
>>
>> between commit:
>>
>>    601fdf7e6635 ("hwmon: Correct struct allocation style")
>>
>> from the hwmon-staging tree and commit:
>>
>>    835896a59b95 ("hwmon/coretemp: Cosmetic: Rename internal variables to zones from packages")
>>
>> from the tip tree.
>>
>> I fixed it up (the comment fixed in the latter was also fixed in the
>> former) 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.
> 
> I am still getting this conflict (the commit ids may have changed).
> Just a reminder in case you think Linus may need to know.
> 

Thanks a lot for the reminder.

I had a quick look into the actual conflicts. I thought they are trivial,
but that is not the case. I'll drop commit 601fdf7e6635 from my queue.
In the future, to reduce the chance of similar problems, I won't accept
cosmetic changes to the coretemp driver anymore since I only have limited
if any control over it.

Guenter

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

[Mark Brown]

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

Hi all,

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

  drivers/hwmon/coretemp.c

between commit:

  1b16a26e79433 ("hwmon: (coretemp) fix coding style issues")

from the hwmon-staging tree and commit:

  91660aae2f864 ("x86/msr: Switch rdmsr_safe_on_cpu() users to rdmsrq_safe_on_cpu()")

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.

diff --cc drivers/hwmon/coretemp.c
index 02b4e46d965b9,70711a7cca123..0000000000000
--- a/drivers/hwmon/coretemp.c
+++ b/drivers/hwmon/coretemp.c
@@@ -220,13 -220,14 +220,13 @@@ static int adjust_tjmax(struct cpuinfo_
  		 * http://softwarecommunity.intel.com/Wiki/Mobility/720.htm
  		 * For Core2 cores, check MSR 0x17, bit 28 1 = Mobile CPU
  		 */
- 		err = rdmsr_safe_on_cpu(id, 0x17, &eax, &edx);
+ 		err = rdmsrq_safe_on_cpu(id, 0x17, &val);
  		if (err) {
  			dev_warn(dev,
 -				 "Unable to access MSR 0x17, assuming desktop"
 -				 " CPU\n");
 +				 "Unable to access MSR 0x17, assuming desktop CPU\n");
  			usemsr_ee = 0;
  		} else if (c->x86_vfm < INTEL_CORE2_PENRYN &&
- 			   !(eax & 0x10000000)) {
+ 			   !(val & 0x10000000)) {
  			/*
  			 * Trust bit 28 up to Penryn, I could not find any
  			 * documentation on that; if you happen to know
@@@ -254,11 -255,12 +254,11 @@@
  	}
  
  	if (usemsr_ee) {
- 		err = rdmsr_safe_on_cpu(id, 0xee, &eax, &edx);
+ 		err = rdmsrq_safe_on_cpu(id, 0xee, &val);
  		if (err) {
  			dev_warn(dev,
 -				 "Unable to access MSR 0xEE, for Tjmax, left"
 -				 " at default\n");
 +				 "Unable to access MSR 0xEE, for Tjmax, left at default\n");
- 		} else if (eax & 0x40000000) {
+ 		} else if (val & 0x40000000) {
  			tjmax = tjmax_ee;
  		}
  	} else if (tjmax == 100000) {
@@@ -352,9 -354,9 +352,9 @@@ static ssize_t show_label(struct devic
  }
  
  static ssize_t show_crit_alarm(struct device *dev,
 -				struct device_attribute *devattr, char *buf)
 +			       struct device_attribute *devattr, char *buf)
  {
- 	u32 eax, edx;
+ 	struct msr val;
  	struct temp_data *tdata = container_of(devattr, struct temp_data,
  						sd_attrs[ATTR_CRIT_ALARM]);
  
@@@ -394,9 -396,9 +394,9 @@@ static ssize_t show_ttarget(struct devi
  }
  
  static ssize_t show_temp(struct device *dev,
 -			struct device_attribute *devattr, char *buf)
 +			 struct device_attribute *devattr, char *buf)
  {
- 	u32 eax, edx;
+ 	struct msr val;
  	struct temp_data *tdata = container_of(devattr, struct temp_data, sd_attrs[ATTR_TEMP]);
  	int tjmax;
  

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

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

[Ingo Molnar]

* Mark Brown <broonie@kernel.org> wrote:

> Hi all,
> 
> Today's linux-next merge of the tip tree got a conflict in:
> 
>   drivers/hwmon/coretemp.c
> 
> between commit:
> 
>   1b16a26e79433 ("hwmon: (coretemp) fix coding style issues")
> 
> from the hwmon-staging tree and commit:
> 
>   91660aae2f864 ("x86/msr: Switch rdmsr_safe_on_cpu() users to rdmsrq_safe_on_cpu()")
> 
> 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.
> 
> diff --cc drivers/hwmon/coretemp.c
> index 02b4e46d965b9,70711a7cca123..0000000000000
> --- a/drivers/hwmon/coretemp.c
> +++ b/drivers/hwmon/coretemp.c
> @@@ -220,13 -220,14 +220,13 @@@ static int adjust_tjmax(struct cpuinfo_
>   		 * http://softwarecommunity.intel.com/Wiki/Mobility/720.htm
>   		 * For Core2 cores, check MSR 0x17, bit 28 1 = Mobile CPU
>   		 */
> - 		err = rdmsr_safe_on_cpu(id, 0x17, &eax, &edx);
> + 		err = rdmsrq_safe_on_cpu(id, 0x17, &val);

> - 		err = rdmsr_safe_on_cpu(id, 0xee, &eax, &edx);
> + 		err = rdmsrq_safe_on_cpu(id, 0xee, &val);

> - 	u32 eax, edx;
> + 	struct msr val;

> - 	u32 eax, edx;
> + 	struct msr val;

Looks good, thank you!

	Ingo