Re: [PATCH v2] thermal: intel_pch_thermal: Support skylake PCH 100 series thermal

[Zhang Rui <rui.zhang@intel.com>]

On Tue, 2016-10-18 at 15:04 -0600, Pandruvada, Srinivas wrote:
> On Wed, 2016-10-19 at 05:59 +0900, OGAWA Hirofumi wrote:
> > 
> > This patch uses .driver_data and board_info[] to make per pci device
> > behavior table (name and ops), instead of adding the code for each
> > pci
> > device in switch-case. This will make easier to add new pci device
> > ids.
> > 
> > Then this adds new device id actually for skylake PCH 100 series
> > (using registers are compatible with currently driver, so no need to
> > change except adding device id to table).
> > 
> > Signed-off-by: OGAWA Hirofumi <hirofumi@mail.parknet.co.jp>
> Reviewed-by: Srinivas Pandruvada <srinivas.pandruvada@linux.intel.com>
hmmm, this patch is queued in my tree for some time.
However, it conflicts with
commit 33086a9a3071812a829d4b63bed826736a5d8b17
Author: Srinivas Pandruvada <srinivas.pandruvada@linux.intel.com>
Date:   Mon Oct 3 12:36:02 2016 -0700

    thermal: intel_pch_thermal: Enable Haswell PCH
    
    Added missing support for Haswell PCH thermal sensor.
which has been shipped in v4.9-rc3.

Rebased patch sent, please double check.

thanks,
rui