Messages in this thread | | | Subject | Re: linux-next: manual merge of the thermal tree with Linus' tree | From | Zhang Rui <> | Date | Mon, 05 Nov 2012 14:47:58 +0800 |
| |
Hi, Stephen,
On Mon, 2012-11-05 at 11:46 +1100, Stephen Rothwell wrote: > 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). > I've rebased my -next branch on top of 3.7-rc4. so please drop this fix.
thanks, rui
| |