diff for duplicates of <561B7E3C.4060908@xilinx.com> diff --git a/a/1.txt b/N1/1.txt index b78e306..ba9a73e 100644 --- a/a/1.txt +++ b/N1/1.txt @@ -12,7 +12,7 @@ On 10/09/2015 12:45 AM, Moritz Fischer wrote: > --- a/arch/arm/boot/dts/zynq-7000.dtsi > +++ b/arch/arm/boot/dts/zynq-7000.dtsi > @@ -294,6 +294,11 @@ -> devcfg: devcfg at f8007000 { +> devcfg: devcfg@f8007000 { > compatible = "xlnx,zynq-devcfg-1.0"; > reg = <0xf8007000 0x100>; > + interrupt-parent = <&intc>; @@ -22,7 +22,7 @@ On 10/09/2015 12:45 AM, Moritz Fischer wrote: > + syscon = <&slcr>; > }; > -> global_timer: timer at f8f00200 { +> global_timer: timer@f8f00200 { > This patch should go via arm-soc tree. That's why please remove it from diff --git a/a/content_digest b/N1/content_digest index 51243b7..39310c4 100644 --- a/a/content_digest +++ b/N1/content_digest @@ -1,9 +1,23 @@ "ref\01444344307-22509-1-git-send-email-moritz.fischer@ettus.com\0" "ref\01444344307-22509-3-git-send-email-moritz.fischer@ettus.com\0" - "From\0michal.simek@xilinx.com (Michal Simek)\0" - "Subject\0[PATCH 2/3] dts: Updated devicetree bindings for Zynq 7000 platform\0" + "From\0Michal Simek <michal.simek@xilinx.com>\0" + "Subject\0Re: [PATCH 2/3] dts: Updated devicetree bindings for Zynq 7000 platform\0" "Date\0Mon, 12 Oct 2015 11:32:44 +0200\0" - "To\0linux-arm-kernel@lists.infradead.org\0" + "To\0Moritz Fischer <moritz.fischer@ettus.com>" + " michal.simek@xilinx.com\0" + "Cc\0mark.rutland@arm.com" + devicetree@vger.kernel.org + linux@arm.linux.org.uk + pawel.moll@arm.com + ijc+devicetree@hellion.org.uk + atull@opensource.altera.com + gregkh@linuxfoundation.org + linux-kernel@vger.kernel.org + robh+dt@kernel.org + linux-arm-kernel@lists.infradead.org + galak@codeaurora.org + dinguyen@opensource.altera.com + " soren.brinkmann@xilinx.com\0" "\00:1\0" "b\0" "On 10/09/2015 12:45 AM, Moritz Fischer wrote:\n" @@ -20,7 +34,7 @@ "> --- a/arch/arm/boot/dts/zynq-7000.dtsi\n" "> +++ b/arch/arm/boot/dts/zynq-7000.dtsi\n" "> @@ -294,6 +294,11 @@\n" - "> \t\tdevcfg: devcfg at f8007000 {\n" + "> \t\tdevcfg: devcfg@f8007000 {\n" "> \t\t\tcompatible = \"xlnx,zynq-devcfg-1.0\";\n" "> \t\t\treg = <0xf8007000 0x100>;\n" "> +\t\t\tinterrupt-parent = <&intc>;\n" @@ -30,7 +44,7 @@ "> +\t\t\tsyscon = <&slcr>;\n" "> \t\t};\n" "> \n" - "> \t\tglobal_timer: timer at f8f00200 {\n" + "> \t\tglobal_timer: timer@f8f00200 {\n" "> \n" "\n" "This patch should go via arm-soc tree. That's why please remove it from\n" @@ -39,4 +53,4 @@ "Thanks,\n" Michal -4645fd284c73091c2a5eb708ae829d23aa8347477a3072202033660f27362b78 +e5cc620cbae423073690ac9784efe81a4faf2334ffcea88f5fa4a438837bc37e
diff --git a/a/1.txt b/N2/1.txt index b78e306..ba9a73e 100644 --- a/a/1.txt +++ b/N2/1.txt @@ -12,7 +12,7 @@ On 10/09/2015 12:45 AM, Moritz Fischer wrote: > --- a/arch/arm/boot/dts/zynq-7000.dtsi > +++ b/arch/arm/boot/dts/zynq-7000.dtsi > @@ -294,6 +294,11 @@ -> devcfg: devcfg at f8007000 { +> devcfg: devcfg@f8007000 { > compatible = "xlnx,zynq-devcfg-1.0"; > reg = <0xf8007000 0x100>; > + interrupt-parent = <&intc>; @@ -22,7 +22,7 @@ On 10/09/2015 12:45 AM, Moritz Fischer wrote: > + syscon = <&slcr>; > }; > -> global_timer: timer at f8f00200 { +> global_timer: timer@f8f00200 { > This patch should go via arm-soc tree. That's why please remove it from diff --git a/a/content_digest b/N2/content_digest index 51243b7..baf4064 100644 --- a/a/content_digest +++ b/N2/content_digest @@ -1,9 +1,23 @@ "ref\01444344307-22509-1-git-send-email-moritz.fischer@ettus.com\0" "ref\01444344307-22509-3-git-send-email-moritz.fischer@ettus.com\0" - "From\0michal.simek@xilinx.com (Michal Simek)\0" - "Subject\0[PATCH 2/3] dts: Updated devicetree bindings for Zynq 7000 platform\0" + "From\0Michal Simek <michal.simek@xilinx.com>\0" + "Subject\0Re: [PATCH 2/3] dts: Updated devicetree bindings for Zynq 7000 platform\0" "Date\0Mon, 12 Oct 2015 11:32:44 +0200\0" - "To\0linux-arm-kernel@lists.infradead.org\0" + "To\0Moritz Fischer <moritz.fischer@ettus.com>" + " <michal.simek@xilinx.com>\0" + "Cc\0<soren.brinkmann@xilinx.com>" + <robh+dt@kernel.org> + <pawel.moll@arm.com> + <mark.rutland@arm.com> + <ijc+devicetree@hellion.org.uk> + <galak@codeaurora.org> + <linux@arm.linux.org.uk> + <dinguyen@opensource.altera.com> + <atull@opensource.altera.com> + <devicetree@vger.kernel.org> + <linux-arm-kernel@lists.infradead.org> + <linux-kernel@vger.kernel.org> + " <gregkh@linuxfoundation.org>\0" "\00:1\0" "b\0" "On 10/09/2015 12:45 AM, Moritz Fischer wrote:\n" @@ -20,7 +34,7 @@ "> --- a/arch/arm/boot/dts/zynq-7000.dtsi\n" "> +++ b/arch/arm/boot/dts/zynq-7000.dtsi\n" "> @@ -294,6 +294,11 @@\n" - "> \t\tdevcfg: devcfg at f8007000 {\n" + "> \t\tdevcfg: devcfg@f8007000 {\n" "> \t\t\tcompatible = \"xlnx,zynq-devcfg-1.0\";\n" "> \t\t\treg = <0xf8007000 0x100>;\n" "> +\t\t\tinterrupt-parent = <&intc>;\n" @@ -30,7 +44,7 @@ "> +\t\t\tsyscon = <&slcr>;\n" "> \t\t};\n" "> \n" - "> \t\tglobal_timer: timer at f8f00200 {\n" + "> \t\tglobal_timer: timer@f8f00200 {\n" "> \n" "\n" "This patch should go via arm-soc tree. That's why please remove it from\n" @@ -39,4 +53,4 @@ "Thanks,\n" Michal -4645fd284c73091c2a5eb708ae829d23aa8347477a3072202033660f27362b78 +b3e374085c5d8771827a330d8a2e647149edd005ba3ecd85cf59388c186a418e
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.