* Re: [git:media_tree/master] [media] ARM: dts: exynos: add HDMI controller phandle to exynos4.dtsi [not found] <E1cxc0o-0003RE-PP@www.linuxtv.org> @ 2017-04-11 8:36 ` Krzysztof Kozlowski 2017-04-11 8:39 ` Hans Verkuil 2017-04-11 8:54 ` Mauro Carvalho Chehab 0 siblings, 2 replies; 4+ messages in thread From: Krzysztof Kozlowski @ 2017-04-11 8:36 UTC (permalink / raw) To: Mauro Carvalho Chehab Cc: linuxtv-commits, Marek Szyprowski, linux-samsung-soc, devicetree, Hans Verkuil, linux-media On Mon, Apr 10, 2017 at 6:12 PM, Mauro Carvalho Chehab <mchehab@s-opensource.com> wrote: > This is an automatic generated email to let you know that the following patch were queued: > > Subject: [media] ARM: dts: exynos: add HDMI controller phandle to exynos4.dtsi > Author: Hans Verkuil <hans.verkuil@cisco.com> > Date: Tue Dec 13 12:37:16 2016 -0200 > > Add the new hdmi phandle to exynos4.dtsi. This phandle is needed by the > s5p-cec driver to initialize the CEC notifier framework. > > Tested with my Odroid U3. > > Signed-off-by: Hans Verkuil <hans.verkuil@cisco.com> > Tested-by: Marek Szyprowski <m.szyprowski@samsung.com> > CC: linux-samsung-soc@vger.kernel.org > CC: devicetree@vger.kernel.org > CC: Krzysztof Kozlowski <krzk@kernel.org> > Signed-off-by: Mauro Carvalho Chehab <mchehab@s-opensource.com> > > arch/arm/boot/dts/exynos4.dtsi | 1 + > 1 file changed, 1 insertion(+) > Mauro, you should not apply it. It is already going through samsung-soc [1]. if you need this patch for bisectability or any other reasons, I provided a tag with it here: https://www.spinics.net/lists/devicetree/msg171182.html Please drop the patch because now it will get duplicated. Best regards, Krzysztof [1] https://www.spinics.net/lists/arm-kernel/msg575229.html ^ permalink raw reply [flat|nested] 4+ messages in thread
* Re: [git:media_tree/master] [media] ARM: dts: exynos: add HDMI controller phandle to exynos4.dtsi 2017-04-11 8:36 ` [git:media_tree/master] [media] ARM: dts: exynos: add HDMI controller phandle to exynos4.dtsi Krzysztof Kozlowski @ 2017-04-11 8:39 ` Hans Verkuil 2017-04-11 8:54 ` Mauro Carvalho Chehab 1 sibling, 0 replies; 4+ messages in thread From: Hans Verkuil @ 2017-04-11 8:39 UTC (permalink / raw) To: Krzysztof Kozlowski, Mauro Carvalho Chehab Cc: linuxtv-commits, Marek Szyprowski, linux-samsung-soc, devicetree, Hans Verkuil, linux-media On 04/11/17 10:36, Krzysztof Kozlowski wrote: > On Mon, Apr 10, 2017 at 6:12 PM, Mauro Carvalho Chehab > <mchehab@s-opensource.com> wrote: >> This is an automatic generated email to let you know that the following patch were queued: >> >> Subject: [media] ARM: dts: exynos: add HDMI controller phandle to exynos4.dtsi >> Author: Hans Verkuil <hans.verkuil@cisco.com> >> Date: Tue Dec 13 12:37:16 2016 -0200 >> >> Add the new hdmi phandle to exynos4.dtsi. This phandle is needed by the >> s5p-cec driver to initialize the CEC notifier framework. >> >> Tested with my Odroid U3. >> >> Signed-off-by: Hans Verkuil <hans.verkuil@cisco.com> >> Tested-by: Marek Szyprowski <m.szyprowski@samsung.com> >> CC: linux-samsung-soc@vger.kernel.org >> CC: devicetree@vger.kernel.org >> CC: Krzysztof Kozlowski <krzk@kernel.org> >> Signed-off-by: Mauro Carvalho Chehab <mchehab@s-opensource.com> >> >> arch/arm/boot/dts/exynos4.dtsi | 1 + >> 1 file changed, 1 insertion(+) >> > > Mauro, you should not apply it. It is already going through samsung-soc [1]. > if you need this patch for bisectability or any other reasons, I > provided a tag with it here: > https://www.spinics.net/lists/devicetree/msg171182.html > > Please drop the patch because now it will get duplicated. I apologize for that. I realized that I shouldn't have included this in my pull request when it was already merged. My fault completely. Regards, Hans ^ permalink raw reply [flat|nested] 4+ messages in thread
* Re: [git:media_tree/master] [media] ARM: dts: exynos: add HDMI controller phandle to exynos4.dtsi 2017-04-11 8:36 ` [git:media_tree/master] [media] ARM: dts: exynos: add HDMI controller phandle to exynos4.dtsi Krzysztof Kozlowski 2017-04-11 8:39 ` Hans Verkuil @ 2017-04-11 8:54 ` Mauro Carvalho Chehab 2017-04-11 9:02 ` Krzysztof Kozlowski 1 sibling, 1 reply; 4+ messages in thread From: Mauro Carvalho Chehab @ 2017-04-11 8:54 UTC (permalink / raw) To: Krzysztof Kozlowski Cc: linuxtv-commits, Marek Szyprowski, linux-samsung-soc, devicetree, Hans Verkuil, linux-media Em Tue, 11 Apr 2017 10:36:58 +0200 Krzysztof Kozlowski <krzk@kernel.org> escreveu: > On Mon, Apr 10, 2017 at 6:12 PM, Mauro Carvalho Chehab > <mchehab@s-opensource.com> wrote: > > This is an automatic generated email to let you know that the following patch were queued: > > > > Subject: [media] ARM: dts: exynos: add HDMI controller phandle to exynos4.dtsi > > Author: Hans Verkuil <hans.verkuil@cisco.com> > > Date: Tue Dec 13 12:37:16 2016 -0200 > > > > Add the new hdmi phandle to exynos4.dtsi. This phandle is needed by the > > s5p-cec driver to initialize the CEC notifier framework. > > > > Tested with my Odroid U3. > > > > Signed-off-by: Hans Verkuil <hans.verkuil@cisco.com> > > Tested-by: Marek Szyprowski <m.szyprowski@samsung.com> > > CC: linux-samsung-soc@vger.kernel.org > > CC: devicetree@vger.kernel.org > > CC: Krzysztof Kozlowski <krzk@kernel.org> > > Signed-off-by: Mauro Carvalho Chehab <mchehab@s-opensource.com> > > > > arch/arm/boot/dts/exynos4.dtsi | 1 + > > 1 file changed, 1 insertion(+) > > > > Mauro, you should not apply it. It is already going through samsung-soc [1]. > if you need this patch for bisectability or any other reasons, I > provided a tag with it here: > https://www.spinics.net/lists/devicetree/msg171182.html > > Please drop the patch because now it will get duplicated. Having exactly the same patch applied on multiple trees usually is not a problem, provided that it doesn't rise a non-trivial conflict. I avoid rebase the tree where this patch is applied, as rebasing it affect the workflow of other developers. I'm afraid that, if I revert this patch, it will cause more harm than good. So, I guess the best solution to fix the issue would be to pull from a stable branch on your tree with has this patch and solve conflicts, if any. This way, nothing will popup when merging upstream. Regards, Mauro > > Best regards, > Krzysztof > > [1] https://www.spinics.net/lists/arm-kernel/msg575229.html Thanks, Mauro ^ permalink raw reply [flat|nested] 4+ messages in thread
* Re: [git:media_tree/master] [media] ARM: dts: exynos: add HDMI controller phandle to exynos4.dtsi 2017-04-11 8:54 ` Mauro Carvalho Chehab @ 2017-04-11 9:02 ` Krzysztof Kozlowski 0 siblings, 0 replies; 4+ messages in thread From: Krzysztof Kozlowski @ 2017-04-11 9:02 UTC (permalink / raw) To: Mauro Carvalho Chehab Cc: linuxtv-commits, Marek Szyprowski, linux-samsung-soc, devicetree, Hans Verkuil, linux-media On Tue, Apr 11, 2017 at 10:54 AM, Mauro Carvalho Chehab <mchehab@s-opensource.com> wrote: > Em Tue, 11 Apr 2017 10:36:58 +0200 > Krzysztof Kozlowski <krzk@kernel.org> escreveu: > >> On Mon, Apr 10, 2017 at 6:12 PM, Mauro Carvalho Chehab >> <mchehab@s-opensource.com> wrote: >> > This is an automatic generated email to let you know that the following patch were queued: >> > >> > Subject: [media] ARM: dts: exynos: add HDMI controller phandle to exynos4.dtsi >> > Author: Hans Verkuil <hans.verkuil@cisco.com> >> > Date: Tue Dec 13 12:37:16 2016 -0200 >> > >> > Add the new hdmi phandle to exynos4.dtsi. This phandle is needed by the >> > s5p-cec driver to initialize the CEC notifier framework. >> > >> > Tested with my Odroid U3. >> > >> > Signed-off-by: Hans Verkuil <hans.verkuil@cisco.com> >> > Tested-by: Marek Szyprowski <m.szyprowski@samsung.com> >> > CC: linux-samsung-soc@vger.kernel.org >> > CC: devicetree@vger.kernel.org >> > CC: Krzysztof Kozlowski <krzk@kernel.org> >> > Signed-off-by: Mauro Carvalho Chehab <mchehab@s-opensource.com> >> > >> > arch/arm/boot/dts/exynos4.dtsi | 1 + >> > 1 file changed, 1 insertion(+) >> > >> >> Mauro, you should not apply it. It is already going through samsung-soc [1]. >> if you need this patch for bisectability or any other reasons, I >> provided a tag with it here: >> https://www.spinics.net/lists/devicetree/msg171182.html >> >> Please drop the patch because now it will get duplicated. > > Having exactly the same patch applied on multiple trees usually is > not a problem, provided that it doesn't rise a non-trivial > conflict. > > I avoid rebase the tree where this patch is applied, as rebasing it > affect the workflow of other developers. > > I'm afraid that, if I revert this patch, it will cause more harm than > good. Of course, revert is wrong. The patch should be dropped with rebase, assuming that you accept the rebase itself. But if you do not rebase... then it has to stay. > So, I guess the best solution to fix the issue would be to pull from > a stable branch on your tree with has this patch and solve conflicts, > if any. This way, nothing will popup when merging upstream. This is why I provided it in separate tag, in first place! That is a proper solution for avoiding any patch duplication and conflicts. Indeed you are right that duplication of commits should not do any harm... but it is not a proper way of development, right? Anyway, it is up to you. I provided you a tag with it so you can merge it if needed (which would require rebasing). If not, then of course please do not revert it. Best regards, Krzysztof ^ permalink raw reply [flat|nested] 4+ messages in thread
end of thread, other threads:[~2017-04-11 9:02 UTC | newest]
Thread overview: 4+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
[not found] <E1cxc0o-0003RE-PP@www.linuxtv.org>
2017-04-11 8:36 ` [git:media_tree/master] [media] ARM: dts: exynos: add HDMI controller phandle to exynos4.dtsi Krzysztof Kozlowski
2017-04-11 8:39 ` Hans Verkuil
2017-04-11 8:54 ` Mauro Carvalho Chehab
2017-04-11 9:02 ` Krzysztof Kozlowski
This is a public inbox, see mirroring instructions for how to clone and mirror all data and code used for this inbox