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

[Mark Brown]

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: signature.asc
Description: PGP signature