diff for duplicates of <20180424203239.21885-7-krzk@kernel.org> diff --git a/a/1.txt b/N1/1.txt index 10750cc..03fe724 100644 --- a/a/1.txt +++ b/N1/1.txt @@ -312,6 +312,3 @@ index 5149c2a3030c..f3f830edd79a 100644 - SOC_ARCH_EXYNOS5440, SOC_ARCH_EXYNOS7, }; - --- -2.14.1 diff --git a/a/content_digest b/N1/content_digest index 6fdbe16..fc145d5 100644 --- a/a/content_digest +++ b/N1/content_digest @@ -1,6 +1,5 @@ - "ref\020180424203239.21885-1-krzk@kernel.org\0" "From\0Krzysztof Kozlowski <krzk@kernel.org>\0" - "Subject\0[RFC 06/10] thermal: samsung: Remove support for Exynos5440\0" + "Subject\0[RFC,06/10] thermal: samsung: Remove support for Exynos5440\0" "Date\0Tue, 24 Apr 2018 22:32:35 +0200\0" "To\0Kukjin Kim <kgene@kernel.org>" Krzysztof Kozlowski <krzk@kernel.org> @@ -354,9 +353,6 @@ " \tSOC_ARCH_EXYNOS5433,\n" "-\tSOC_ARCH_EXYNOS5440,\n" " \tSOC_ARCH_EXYNOS7,\n" - " };\n" - " \n" - "-- \n" - 2.14.1 + }; -9540b68504bc673f158615ca28a2620dcb25a750509a80d2d8672eefaa729ca0 +b9fe85a4555c95e36396943ab5262ccff29d07abeace8516532985d4edca705c
diff --git a/a/1.txt b/N2/1.txt index 10750cc..3d66f61 100644 --- a/a/1.txt +++ b/N2/1.txt @@ -27,7 +27,7 @@ index b957acff57aa..ad648d93d961 100644 -Example 2): - -- tmuctrl_0: tmuctrl@160118 { +- tmuctrl_0: tmuctrl at 160118 { - compatible = "samsung,exynos5440-tmu"; - reg = <0x160118 0x230>, <0x160368 0x10>; - interrupts = <0 58 0>; @@ -38,7 +38,7 @@ index b957acff57aa..ad648d93d961 100644 - -Example 3): (In case of Exynos5420 "with misplaced TRIMINFO register") +Example 2): (In case of Exynos5420 "with misplaced TRIMINFO register") - tmu_cpu2: tmu@10068000 { + tmu_cpu2: tmu at 10068000 { compatible = "samsung,exynos5420-tmu-ext-triminfo"; reg = <0x10068000 0x100>, <0x1006c000 0x4>; diff --git a/drivers/thermal/samsung/exynos_tmu.c b/drivers/thermal/samsung/exynos_tmu.c diff --git a/a/content_digest b/N2/content_digest index 6fdbe16..bf2d8ce 100644 --- a/a/content_digest +++ b/N2/content_digest @@ -1,44 +1,8 @@ "ref\020180424203239.21885-1-krzk@kernel.org\0" - "From\0Krzysztof Kozlowski <krzk@kernel.org>\0" + "From\0krzk@kernel.org (Krzysztof Kozlowski)\0" "Subject\0[RFC 06/10] thermal: samsung: Remove support for Exynos5440\0" "Date\0Tue, 24 Apr 2018 22:32:35 +0200\0" - "To\0Kukjin Kim <kgene@kernel.org>" - Krzysztof Kozlowski <krzk@kernel.org> - Rob Herring <robh+dt@kernel.org> - Mark Rutland <mark.rutland@arm.com> - Tejun Heo <tj@kernel.org> - Sylwester Nawrocki <s.nawrocki@samsung.com> - Tomasz Figa <tomasz.figa@gmail.com> - Chanwoo Choi <cw00.choi@samsung.com> - Michael Turquette <mturquette@baylibre.com> - Stephen Boyd <sboyd@kernel.org> - Rafael J. Wysocki <rjw@rjwysocki.net> - Viresh Kumar <viresh.kumar@linaro.org> - Zhang Rui <rui.zhang@intel.com> - Eduardo Valentin <edubezval@gmail.com> - Russell King <linux@armlinux.org.uk> - Hans de Goede <hdegoede@redhat.com> - Linus Walleij <linus.walleij@linaro.org> - Andi Shyti <andi@etezian.org> - Mark Brown <broonie@kernel.org> - Bartlomiej Zolnierkiewicz <b.zolnierkie@samsung.com> - Alan Stern <stern@rowland.harvard.edu> - Greg Kroah-Hartman <gregkh@linuxfoundation.org> - linux-arm-kernel@lists.infradead.org - linux-samsung-soc@vger.kernel.org - devicetree@vger.kernel.org - linux-kernel@vger.kernel.org - linux-ide@vger.kernel.org - linux-clk@vger.kernel.org - linux-pm@vger.kernel.org - linux-i2c@vger.kernel.org - linux-gpio@vger.kernel.org - linux-spi@vger.kernel.org - " linux-usb@vger.kernel.org\0" - "Cc\0Marek Szyprowski <m.szyprowski@samsung.com>" - Arnd Bergmann <arnd@arndb.de> - Olof Johansson <olof@lixom.net> - " Jaehoon Chung <jh80.chung@samsung.com>\0" + "To\0linux-arm-kernel@lists.infradead.org\0" "\00:1\0" "b\0" "The Exynos5440 is not actively developed, there are no development\n" @@ -70,7 +34,7 @@ " \n" "-Example 2):\n" "-\n" - "-\ttmuctrl_0: tmuctrl@160118 {\n" + "-\ttmuctrl_0: tmuctrl at 160118 {\n" "-\t\tcompatible = \"samsung,exynos5440-tmu\";\n" "-\t\treg = <0x160118 0x230>, <0x160368 0x10>;\n" "-\t\tinterrupts = <0 58 0>;\n" @@ -81,7 +45,7 @@ "-\n" "-Example 3): (In case of Exynos5420 \"with misplaced TRIMINFO register\")\n" "+Example 2): (In case of Exynos5420 \"with misplaced TRIMINFO register\")\n" - " \ttmu_cpu2: tmu@10068000 {\n" + " \ttmu_cpu2: tmu at 10068000 {\n" " \t\tcompatible = \"samsung,exynos5420-tmu-ext-triminfo\";\n" " \t\treg = <0x10068000 0x100>, <0x1006c000 0x4>;\n" "diff --git a/drivers/thermal/samsung/exynos_tmu.c b/drivers/thermal/samsung/exynos_tmu.c\n" @@ -359,4 +323,4 @@ "-- \n" 2.14.1 -9540b68504bc673f158615ca28a2620dcb25a750509a80d2d8672eefaa729ca0 +10dc1e0448d96f31265fdc00f4cb3b7141eb324065b715905b6398533204a6cc
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.