diff for duplicates of <20141128083706.GT25249@lukather> diff --git a/a/1.txt b/N1/1.txt index b5b7bce..88f4a46 100644 --- a/a/1.txt +++ b/N1/1.txt @@ -15,7 +15,7 @@ On Fri, Nov 28, 2014 at 10:36:17AM +1100, Stephen Rothwell wrote: > > -- > Cheers, -> Stephen Rothwell sfr@canb.auug.org.au +> Stephen Rothwell sfr at canb.auug.org.au > > diff --cc arch/arm/boot/dts/sun6i-a31.dtsi > index 529c73803976,f47156b6572b..000000000000 @@ -25,8 +25,8 @@ On Fri, Nov 28, 2014 at 10:36:17AM +1100, Stephen Rothwell wrote: > "apb1_daudio1"; > }; > -> - apb2: clk@01c20058 { -> + apb2_mux: apb2_mux@01c20058 { +> - apb2: clk at 01c20058 { +> + apb2_mux: apb2_mux at 01c20058 { > + #clock-cells = <0>; > + compatible = "allwinner,sun4i-a10-apb1-mux-clk"; > + reg = <0x01c20058 0x4>; @@ -34,7 +34,7 @@ On Fri, Nov 28, 2014 at 10:36:17AM +1100, Stephen Rothwell wrote: > + clock-output-names = "apb2_mux"; > + }; > + -> + apb2: apb2@01c20058 { +> + apb2: apb2 at 01c20058 { > #clock-cells = <0>; > - compatible = "allwinner,sun6i-a31-apb2-div-clk"; > + compatible = "allwinner,sun4i-a10-apb1-clk"; @@ -49,7 +49,7 @@ I'm not exactly sure why there is still conflicts between my branches and arm-soc, since the previous branch that generates these conflicts was supposed to be dropped, but the correct fix is: - apb2: clk@01c20058 { + apb2: clk at 01c20058 { #clock-cells = <0>; compatible = "allwinner,sun4i-a10-apb1-clk"; reg = <0x01c20058 0x4>; @@ -66,3 +66,10 @@ Maxime Maxime Ripard, Free Electrons Embedded Linux, Kernel and Android engineering http://free-electrons.com +-------------- next part -------------- +A non-text attachment was scrubbed... +Name: signature.asc +Type: application/pgp-signature +Size: 819 bytes +Desc: Digital signature +URL: <http://lists.infradead.org/pipermail/linux-arm-kernel/attachments/20141128/63f17231/attachment-0001.sig> diff --git a/a/2.bin b/a/2.bin deleted file mode 100644 index 59685cc..0000000 --- a/a/2.bin +++ /dev/null @@ -1,17 +0,0 @@ ------BEGIN PGP SIGNATURE----- -Version: GnuPG v1 - -iQIcBAEBAgAGBQJUeDQyAAoJEBx+YmzsjxAgA9EQAL3wd58qbe08NZaZT8xhq7lX -gwDIDEM0n4buH/cVOAdsrWGmvn8ZdNDeSS7K+n0SMpghiV0DLfuEKhTkmt+tRUpZ -tTIc+jF+c5onS23RpxCTF7YYfucXSUMzxZ1oRa8WlaRQR60TENiX6DI6z20LjgxK -q3/apUscyyl72ncBPRfH89UYHv3d4+RCSLTLVYvbGXaeA+5cA6/RrFKzF0DIjyGd -5Tdn5W/ZrbhKvNqMVzxP7MBPuxOAdqNFTUuy+lPIudobIR8Mi1BHhocA46LD+h3a -hhCddDZl3glLWjSofeubnuTIroOZER8QOXrIiK5kcJDspUFaoX2+GyDYJwhlI4wl -Bml23UVGaf5lWI7MRXlWhQiWkiY90FptlxGWn8Hm9+0SCLnh/C0eGM9CltSE+rvd -5N8sxHnDFjZVpGFbjwQmXFBccXAj4Wp82+Z+2XiC3fkwgb1ptJYiNS+VBZpm6nEy -AtI1de8e59rX85TLqLUr5I+ZgPHFraqL1RIkGv9rLyXaixjkaR8N4XkfZ8jOQV1R -7FZOig4RuZvgGog8qh4ohLOFQcVxWUbBEKN7pPi4Ii+fxckb8XtodV0SJzaSTyQq -7yETbfxLvo2VKNgIXCansc/8eDjk5tSbdgpu5baHHukDAw6xoxQF/3QigaImf9+W -8P43wylwxFmMDRrCcH8N -=xTCB ------END PGP SIGNATURE----- diff --git a/a/2.hdr b/a/2.hdr deleted file mode 100644 index 3237378..0000000 --- a/a/2.hdr +++ /dev/null @@ -1,2 +0,0 @@ -Content-Type: application/pgp-signature; name="signature.asc" -Content-Description: Digital signature diff --git a/a/content_digest b/N1/content_digest index bc135b2..b302612 100644 --- a/a/content_digest +++ b/N1/content_digest @@ -1,15 +1,9 @@ "ref\020141128103617.13a1821c@canb.auug.org.au\0" - "From\0Maxime Ripard <maxime.ripard@free-electrons.com>\0" - "Subject\0Re: linux-next: manual merge of the sunxi tree with the arm-soc tree\0" + "From\0maxime.ripard@free-electrons.com (Maxime Ripard)\0" + "Subject\0linux-next: manual merge of the sunxi tree with the arm-soc tree\0" "Date\0Fri, 28 Nov 2014 09:37:06 +0100\0" - "To\0Stephen Rothwell <sfr@canb.auug.org.au>\0" - "Cc\0Olof Johansson <olof@lixom.net>" - Arnd Bergmann <arnd@arndb.de> - linux-arm-kernel@lists.infradead.org - linux-next@vger.kernel.org - linux-kernel@vger.kernel.org - " Chen-Yu Tsai <wens@csie.org>\0" - "\01:1\0" + "To\0linux-arm-kernel@lists.infradead.org\0" + "\00:1\0" "b\0" "Hi,\n" "\n" @@ -28,7 +22,7 @@ "> \n" "> -- \n" "> Cheers,\n" - "> Stephen Rothwell sfr@canb.auug.org.au\n" + "> Stephen Rothwell sfr at canb.auug.org.au\n" "> \n" "> diff --cc arch/arm/boot/dts/sun6i-a31.dtsi\n" "> index 529c73803976,f47156b6572b..000000000000\n" @@ -38,8 +32,8 @@ "> \t\t\t\t\t\"apb1_daudio1\";\n" "> \t\t};\n" "> \n" - "> -\t\tapb2: clk@01c20058 {\n" - "> +\t\tapb2_mux: apb2_mux@01c20058 {\n" + "> -\t\tapb2: clk at 01c20058 {\n" + "> +\t\tapb2_mux: apb2_mux at 01c20058 {\n" "> +\t\t\t#clock-cells = <0>;\n" "> +\t\t\tcompatible = \"allwinner,sun4i-a10-apb1-mux-clk\";\n" "> +\t\t\treg = <0x01c20058 0x4>;\n" @@ -47,7 +41,7 @@ "> +\t\t\tclock-output-names = \"apb2_mux\";\n" "> +\t\t};\n" "> +\n" - "> +\t\tapb2: apb2@01c20058 {\n" + "> +\t\tapb2: apb2 at 01c20058 {\n" "> \t\t\t#clock-cells = <0>;\n" "> - \t\t\tcompatible = \"allwinner,sun6i-a31-apb2-div-clk\";\n" "> + \t\t\tcompatible = \"allwinner,sun4i-a10-apb1-clk\";\n" @@ -62,7 +56,7 @@ "and arm-soc, since the previous branch that generates these conflicts\n" "was supposed to be dropped, but the correct fix is:\n" "\n" - "\t\tapb2: clk@01c20058 {\n" + "\t\tapb2: clk at 01c20058 {\n" "\t\t\t#clock-cells = <0>;\n" "\t\t\tcompatible = \"allwinner,sun4i-a10-apb1-clk\";\n" "\t\t\treg = <0x01c20058 0x4>;\n" @@ -78,27 +72,13 @@ "-- \n" "Maxime Ripard, Free Electrons\n" "Embedded Linux, Kernel and Android engineering\n" - http://free-electrons.com - "\01:2\0" - "fn\0signature.asc\0" - "d\0Digital signature\0" - "b\0" - "-----BEGIN PGP SIGNATURE-----\n" - "Version: GnuPG v1\n" - "\n" - "iQIcBAEBAgAGBQJUeDQyAAoJEBx+YmzsjxAgA9EQAL3wd58qbe08NZaZT8xhq7lX\n" - "gwDIDEM0n4buH/cVOAdsrWGmvn8ZdNDeSS7K+n0SMpghiV0DLfuEKhTkmt+tRUpZ\n" - "tTIc+jF+c5onS23RpxCTF7YYfucXSUMzxZ1oRa8WlaRQR60TENiX6DI6z20LjgxK\n" - "q3/apUscyyl72ncBPRfH89UYHv3d4+RCSLTLVYvbGXaeA+5cA6/RrFKzF0DIjyGd\n" - "5Tdn5W/ZrbhKvNqMVzxP7MBPuxOAdqNFTUuy+lPIudobIR8Mi1BHhocA46LD+h3a\n" - "hhCddDZl3glLWjSofeubnuTIroOZER8QOXrIiK5kcJDspUFaoX2+GyDYJwhlI4wl\n" - "Bml23UVGaf5lWI7MRXlWhQiWkiY90FptlxGWn8Hm9+0SCLnh/C0eGM9CltSE+rvd\n" - "5N8sxHnDFjZVpGFbjwQmXFBccXAj4Wp82+Z+2XiC3fkwgb1ptJYiNS+VBZpm6nEy\n" - "AtI1de8e59rX85TLqLUr5I+ZgPHFraqL1RIkGv9rLyXaixjkaR8N4XkfZ8jOQV1R\n" - "7FZOig4RuZvgGog8qh4ohLOFQcVxWUbBEKN7pPi4Ii+fxckb8XtodV0SJzaSTyQq\n" - "7yETbfxLvo2VKNgIXCansc/8eDjk5tSbdgpu5baHHukDAw6xoxQF/3QigaImf9+W\n" - "8P43wylwxFmMDRrCcH8N\n" - "=xTCB\n" - "-----END PGP SIGNATURE-----\n" + "http://free-electrons.com\n" + "-------------- next part --------------\n" + "A non-text attachment was scrubbed...\n" + "Name: signature.asc\n" + "Type: application/pgp-signature\n" + "Size: 819 bytes\n" + "Desc: Digital signature\n" + URL: <http://lists.infradead.org/pipermail/linux-arm-kernel/attachments/20141128/63f17231/attachment-0001.sig> -1d422f11e2627cdf5d65a42715188fc3d6077391b7a067e72bebfd64d8576581 +db471c59cdddf389f648c1ece16bbe61dab7cbd0de005d24327fedb2ee524673
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.