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

[Stephen Rothwell]

Hi Zhang,

Today's linux-next merge of the thermal tree got a conflict in
drivers/thermal/rcar_thermal.c between commit 608f62b996c6 ("thermal:
solve compilation errors in rcar_thermal") from Linus' tree and commit
ebbf0f11e7b4 ("Thermal: Pass zone parameters as argument to
tzd_register") from the thermal tree.

I fixed it up (see below) and can carry the fix as necessary (no action
is required).

-- 
Cheers,
Stephen Rothwell                    sfr@xxxxxxxxxxxxxxxx

diff --cc drivers/thermal/rcar_thermal.c
index f7a1b57,b13fe5d..0000000
--- a/drivers/thermal/rcar_thermal.c
+++ b/drivers/thermal/rcar_thermal.c
@@@ -210,8 -210,8 +210,8 @@@ static int rcar_thermal_probe(struct pl
  		goto error_free_priv;
  	}
  
 -	zone = thermal_zone_device_register("rcar_thermal", 0, priv,
 +	zone = thermal_zone_device_register("rcar_thermal", 0, 0, priv,
- 					    &rcar_thermal_zone_ops, 0, 0);
+ 				    &rcar_thermal_zone_ops, NULL, 0, 0);
  	if (IS_ERR(zone)) {
  		dev_err(&pdev->dev, "thermal zone device is NULL\n");
  		ret = PTR_ERR(zone);

Attachment: pgp00000.pgp
Description: PGP signature