Skip to contentSkip to conversation

commit "Thermal: CPU Package temperature thermal" has reject files

DISCUSSION Paul Gortmaker 2 participants 2 messages Jun 17, 2013 Linux-next tree

lore
Share & tools
lore
#0 lore raw

Hi Guys,

Can you please respin this linux-next commit to not contain reject files?

$ git show  37056864a02dd6c79d8f2842e42576a4bfb694b2|diffstat -p0
 b/drivers/thermal/Kconfig                |   12 
 b/drivers/thermal/Makefile               |    2 
 b/drivers/thermal/cpu_cooling.c.rej      |   11 
 b/drivers/thermal/exynos_thermal.c.rej   |   96 ++++
 b/drivers/thermal/rcar_thermal.c.rej     |   59 ++
 b/drivers/thermal/thermal_core.c.rej     |   10 
 b/drivers/thermal/x86_pkg_temp_thermal.c |  642 +++++++++++++++++++++++++++++++
 7 files changed, 831 insertions(+), 1 deletion(-)
$ 

Thanks,
Paul.

#1 lore raw
Quoted 4 lines · Paul Gortmaker

Hi Guys,

Can you please respin this linux-next commit to not contain reject files?

fixed in thermal -next.

thanks,
rui

Quoted 13 lines
$ git show  37056864a02dd6c79d8f2842e42576a4bfb694b2|diffstat -p0
 b/drivers/thermal/Kconfig                |   12 
 b/drivers/thermal/Makefile               |    2 
 b/drivers/thermal/cpu_cooling.c.rej      |   11 
 b/drivers/thermal/exynos_thermal.c.rej   |   96 ++++
 b/drivers/thermal/rcar_thermal.c.rej     |   59 ++
 b/drivers/thermal/thermal_core.c.rej     |   10 
 b/drivers/thermal/x86_pkg_temp_thermal.c |  642 +++++++++++++++++++++++++++++++
 7 files changed, 831 insertions(+), 1 deletion(-)
$ 

Thanks,
Paul.