diff for duplicates of <1479212695.2224.12.camel@intel.com> diff --git a/a/1.txt b/N1/1.txt index 6899e60..307e914 100644 --- a/a/1.txt +++ b/N1/1.txt @@ -24,25 +24,25 @@ rui > > > > Signed-off-by: Leo Yan <leo.yan@linaro.org> > > --- -> > drivers/thermal/Kconfig | 4 +++- -> > 1 file changed, 3 insertions(+), 1 deletion(-) +> > ?drivers/thermal/Kconfig | 4 +++- +> > ?1 file changed, 3 insertions(+), 1 deletion(-) > > > > diff --git a/drivers/thermal/Kconfig b/drivers/thermal/Kconfig > > index 2d702ca..91ebab3 100644 > > --- a/drivers/thermal/Kconfig > > +++ b/drivers/thermal/Kconfig > > @@ -177,8 +177,10 @@ config THERMAL_EMULATION -> > -> > config HISI_THERMAL -> > tristate "Hisilicon thermal driver" +> > ? +> > ?config HISI_THERMAL +> > ? tristate "Hisilicon thermal driver" > > - depends on (ARCH_HISI && CPU_THERMAL && OF) || > > COMPILE_TEST > > + depends on ARCH_HISI || COMPILE_TEST -> > depends on HAS_IOMEM +> > ? depends on HAS_IOMEM > > + depends on OF > > + default y -> > help -> > Enable this to plug hisilicon's thermal sensor driver +> > ? help +> > ? ??Enable this to plug hisilicon's thermal sensor driver > > into the Linux -> > thermal framework. cpufreq is used as the cooling device +> > ? ??thermal framework. cpufreq is used as the cooling device > > to throttle diff --git a/a/content_digest b/N1/content_digest index 383033c..8869ca6 100644 --- a/a/content_digest +++ b/N1/content_digest @@ -1,29 +1,10 @@ "ref\01472633417-9330-1-git-send-email-leo.yan@linaro.org\0" "ref\01472633417-9330-3-git-send-email-leo.yan@linaro.org\0" "ref\020161112120534.GC23848@leoy-linaro\0" - "From\0Zhang Rui <rui.zhang@intel.com>\0" - "Subject\0Re: [PATCH 2/3] thermal: hisilicon: fix for dependency\0" + "From\0rui.zhang@intel.com (Zhang Rui)\0" + "Subject\0[PATCH 2/3] thermal: hisilicon: fix for dependency\0" "Date\0Tue, 15 Nov 2016 20:24:55 +0800\0" - "To\0Leo Yan <leo.yan@linaro.org>" - Catalin Marinas <catalin.marinas@arm.com> - Will Deacon <will.deacon@arm.com> - Michael Turquette <mturquette@baylibre.com> - Stephen Boyd <sboyd@codeaurora.org> - Eduardo Valentin <edubezval@gmail.com> - Arnd Bergmann <arnd@arndb.de> - Simon Horman <horms+renesas@verge.net.au> - Krzysztof Kozlowski <krzk@kernel.org> - Thierry Reding <treding@nvidia.com> - Riku Voipio <riku.voipio@linaro.org> - Srinivas Kandagatla <srinivas.kandagatla@linaro.org> - Rob Herring <robh@kernel.org> - " Philipp Zabel <p.zabel@pengutronix.de>\0" - "Cc\0linux-arm-kernel@lists.infradead.org" - linux-kernel@vger.kernel.org - linux-clk@vger.kernel.org - linux-pm@vger.kernel.org - Guodong Xu <guodong.xu@linaro.org> - " Amit Kucheria <amit.kucheria@linaro.org>\0" + "To\0linux-arm-kernel@lists.infradead.org\0" "\00:1\0" "b\0" "On Sat, 2016-11-12 at 20:05 +0800, Leo Yan wrote:\n" @@ -52,27 +33,27 @@ "> > \n" "> > Signed-off-by: Leo Yan <leo.yan@linaro.org>\n" "> > ---\n" - "> > \302\240drivers/thermal/Kconfig | 4 +++-\n" - "> > \302\2401 file changed, 3 insertions(+), 1 deletion(-)\n" + "> > ?drivers/thermal/Kconfig | 4 +++-\n" + "> > ?1 file changed, 3 insertions(+), 1 deletion(-)\n" "> > \n" "> > diff --git a/drivers/thermal/Kconfig b/drivers/thermal/Kconfig\n" "> > index 2d702ca..91ebab3 100644\n" "> > --- a/drivers/thermal/Kconfig\n" "> > +++ b/drivers/thermal/Kconfig\n" "> > @@ -177,8 +177,10 @@ config THERMAL_EMULATION\n" - "> > \302\240\n" - "> > \302\240config HISI_THERMAL\n" - "> > \302\240\ttristate \"Hisilicon thermal driver\"\n" + "> > ?\n" + "> > ?config HISI_THERMAL\n" + "> > ?\ttristate \"Hisilicon thermal driver\"\n" "> > -\tdepends on (ARCH_HISI && CPU_THERMAL && OF) ||\n" "> > COMPILE_TEST\n" "> > +\tdepends on ARCH_HISI || COMPILE_TEST\n" - "> > \302\240\tdepends on HAS_IOMEM\n" + "> > ?\tdepends on HAS_IOMEM\n" "> > +\tdepends on OF\n" "> > +\tdefault y\n" - "> > \302\240\thelp\n" - "> > \302\240\t\302\240\302\240Enable this to plug hisilicon's thermal sensor driver\n" + "> > ?\thelp\n" + "> > ?\t??Enable this to plug hisilicon's thermal sensor driver\n" "> > into the Linux\n" - "> > \302\240\t\302\240\302\240thermal framework. cpufreq is used as the cooling device\n" + "> > ?\t??thermal framework. cpufreq is used as the cooling device\n" > > to throttle -e6044cc7d8473b7a042c8714fe0e143aabf2979415dc209a9f83f387c2ec543a +25616c26fd8a21a51e4d32e3de344a48b3f7f03e7b61600c39369789b124b9c9
This is an external index of several public inboxes, see mirroring instructions on how to clone and mirror all data and code used by this external index.