diff for duplicates of <20180828073424.30247-8-paul.kocialkowski@bootlin.com>
diff --git a/a/1.txt b/N1/1.txt
index 175dd79..2e4b2ad 100644
--- a/a/1.txt
+++ b/N1/1.txt
@@ -6,7 +6,7 @@ pool has to be located in that area. Following Allwinner's decision in
downstream software, the last 96 MiB of the first 256 MiB of RAM are
reserved for this purpose.
-Signed-off-by: Paul Kocialkowski <paul.kocialkowski@bootlin.com>
+Signed-off-by: Paul Kocialkowski <paul.kocialkowski-LDxbnhwyfcJBDgjK7y7TUQ@public.gmane.org>
---
arch/arm/boot/dts/sun8i-a33.dtsi | 26 ++++++++++++++++++++++++++
1 file changed, 26 insertions(+)
diff --git a/a/content_digest b/N1/content_digest
index b27db83..aa63ecc 100644
--- a/a/content_digest
+++ b/N1/content_digest
@@ -2,7 +2,10 @@
"ref\00020180828073424.30247-1-paul.kocialkowski\@bootlin.com\0"
]
[
- "From\0Paul Kocialkowski <paul.kocialkowski\@bootlin.com>\0"
+ "ref\00020180828073424.30247-1-paul.kocialkowski-LDxbnhwyfcJBDgjK7y7TUQ\@public.gmane.org\0"
+]
+[
+ "From\0Paul Kocialkowski <paul.kocialkowski-LDxbnhwyfcJBDgjK7y7TUQ\@public.gmane.org>\0"
]
[
"Subject\0[PATCH v8 7/8] ARM: dts: sun8i-a33: Add Video Engine and reserved memory nodes\0"
@@ -11,30 +14,30 @@
"Date\0Tue, 28 Aug 2018 09:34:23 +0200\0"
]
[
- "To\0linux-media\@vger.kernel.org",
- " devicetree\@vger.kernel.org",
- " linux-kernel\@vger.kernel.org",
- " linux-arm-kernel\@lists.infradead.org",
- " devel\@driverdev.osuosl.org\0"
+ "To\0linux-media-u79uwXL29TY76Z2rM5mHXA\@public.gmane.org",
+ " devicetree-u79uwXL29TY76Z2rM5mHXA\@public.gmane.org",
+ " linux-kernel-u79uwXL29TY76Z2rM5mHXA\@public.gmane.org",
+ " linux-arm-kernel-IAPFreCvJWM7uuMidbF8XUB+6BGkLq7r\@public.gmane.org",
+ " devel-gWbeCf7V1WCQmaza687I9mD2FQJk+8+b\@public.gmane.org\0"
]
[
- "Cc\0Mauro Carvalho Chehab <mchehab\@kernel.org>",
- " Rob Herring <robh+dt\@kernel.org>",
- " Mark Rutland <mark.rutland\@arm.com>",
- " Maxime Ripard <maxime.ripard\@bootlin.com>",
- " Chen-Yu Tsai <wens\@csie.org>",
- " Greg Kroah-Hartman <gregkh\@linuxfoundation.org>",
- " Paul Kocialkowski <paul.kocialkowski\@bootlin.com>",
- " Thomas Petazzoni <thomas.petazzoni\@bootlin.com>",
- " Randy Li <ayaka\@soulik.info>",
- " Hans Verkuil <hverkuil\@xs4all.nl>",
- " Ezequiel Garcia <ezequiel\@collabora.com>",
- " Tomasz Figa <tfiga\@chromium.org>",
- " Alexandre Courbot <acourbot\@chromium.org>",
- " Philipp Zabel <p.zabel\@pengutronix.de>",
- " Laurent Pinchart <laurent.pinchart\@ideasonboard.com>",
- " Sakari Ailus <sakari.ailus\@linux.intel.com>",
- " linux-sunxi\@googlegroups.com\0"
+ "Cc\0Mauro Carvalho Chehab <mchehab-DgEjT+Ai2ygdnm+yROfE0A\@public.gmane.org>",
+ " Rob Herring <robh+dt-DgEjT+Ai2ygdnm+yROfE0A\@public.gmane.org>",
+ " Mark Rutland <mark.rutland-5wv7dgnIgG8\@public.gmane.org>",
+ " Maxime Ripard <maxime.ripard-LDxbnhwyfcJBDgjK7y7TUQ\@public.gmane.org>",
+ " Chen-Yu Tsai <wens-jdAy2FN1RRM\@public.gmane.org>",
+ " Greg Kroah-Hartman <gregkh-hQyY1W1yCW8ekmWlsbkhG0B+6BGkLq7r\@public.gmane.org>",
+ " Paul Kocialkowski <paul.kocialkowski-LDxbnhwyfcJBDgjK7y7TUQ\@public.gmane.org>",
+ " Thomas Petazzoni <thomas.petazzoni-LDxbnhwyfcJBDgjK7y7TUQ\@public.gmane.org>",
+ " Randy Li <ayaka-xPW3/0Ywev/iB9QmIjCX8w\@public.gmane.org>",
+ " Hans Verkuil <hverkuil-qWit8jRvyhVmR6Xm/wNWPw\@public.gmane.org>",
+ " Ezequiel Garcia <ezequiel-ZGY8ohtN/8qB+jHODAdFcQ\@public.gmane.org>",
+ " Tomasz Figa <tfiga-F7+t8E8rja9g9hUCZPvPmw\@public.gmane.org>",
+ " Alexandre Courbot <acourbot-F7+t8E8rja9g9hUCZPvPmw\@public.gmane.org>",
+ " Philipp Zabel <p.zabel-bIcnvbaLZ9MEGnE8C9+IrQ\@public.gmane.org>",
+ " Laurent Pinchart <laurent.pinchart-ryLnwIuWjnjg/C1BVhZhaw\@public.gmane.org>",
+ " Sakari Ailus <sakari.ailus-VuQAYsv1563Yd54FQh9/CA\@public.gmane.org>",
+ " linux-sunxi-/JYPxA39Uh5TLH3MbocFFw\@public.gmane.org\0"
]
[
"\0000:1\0"
@@ -51,7 +54,7 @@
"downstream software, the last 96 MiB of the first 256 MiB of RAM are\n",
"reserved for this purpose.\n",
"\n",
- "Signed-off-by: Paul Kocialkowski <paul.kocialkowski\@bootlin.com>\n",
+ "Signed-off-by: Paul Kocialkowski <paul.kocialkowski-LDxbnhwyfcJBDgjK7y7TUQ\@public.gmane.org>\n",
"---\n",
" arch/arm/boot/dts/sun8i-a33.dtsi | 26 ++++++++++++++++++++++++++\n",
" 1 file changed, 26 insertions(+)\n",
@@ -104,4 +107,4 @@
"2.18.0"
]
-b462d1ed13ec9a7d479bcd95be1fcc5947b876f39a51246a029c8eb7d1ff0e77
+31b6fbaad03295cd24ab13838b3737c789d317cd09031d666cee7d196fe4b985
diff --git a/a/1.txt b/N2/1.txt
index 175dd79..db04ff7 100644
--- a/a/1.txt
+++ b/N2/1.txt
@@ -25,7 +25,7 @@ index 8d278ee001e9..a212fbee14bc 100644
+ ranges;
+
+ /* Address must be kept in the lower 256 MiBs of DRAM for VE. */
-+ cma_pool: cma@4a000000 {
++ cma_pool: cma at 4a000000 {
+ compatible = "shared-dma-pool";
+ size = <0x6000000>;
+ alloc-ranges = <0x4a000000 0x6000000>;
@@ -41,7 +41,7 @@ index 8d278ee001e9..a212fbee14bc 100644
};
};
-+ video-codec@01c0e000 {
++ video-codec at 01c0e000 {
+ compatible = "allwinner,sun8i-a33-video-engine";
+ reg = <0x01c0e000 0x1000>;
+ clocks = <&ccu CLK_BUS_VE>, <&ccu CLK_VE>,
@@ -52,7 +52,7 @@ index 8d278ee001e9..a212fbee14bc 100644
+ allwinner,sram = <&ve_sram 1>;
+ };
+
- crypto: crypto-engine@1c15000 {
+ crypto: crypto-engine at 1c15000 {
compatible = "allwinner,sun4i-a10-crypto";
reg = <0x01c15000 0x1000>;
--
diff --git a/a/content_digest b/N2/content_digest
index b27db83..0aa7faa 100644
--- a/a/content_digest
+++ b/N2/content_digest
@@ -2,7 +2,7 @@
"ref\00020180828073424.30247-1-paul.kocialkowski\@bootlin.com\0"
]
[
- "From\0Paul Kocialkowski <paul.kocialkowski\@bootlin.com>\0"
+ "From\0paul.kocialkowski\@bootlin.com (Paul Kocialkowski)\0"
]
[
"Subject\0[PATCH v8 7/8] ARM: dts: sun8i-a33: Add Video Engine and reserved memory nodes\0"
@@ -11,30 +11,7 @@
"Date\0Tue, 28 Aug 2018 09:34:23 +0200\0"
]
[
- "To\0linux-media\@vger.kernel.org",
- " devicetree\@vger.kernel.org",
- " linux-kernel\@vger.kernel.org",
- " linux-arm-kernel\@lists.infradead.org",
- " devel\@driverdev.osuosl.org\0"
-]
-[
- "Cc\0Mauro Carvalho Chehab <mchehab\@kernel.org>",
- " Rob Herring <robh+dt\@kernel.org>",
- " Mark Rutland <mark.rutland\@arm.com>",
- " Maxime Ripard <maxime.ripard\@bootlin.com>",
- " Chen-Yu Tsai <wens\@csie.org>",
- " Greg Kroah-Hartman <gregkh\@linuxfoundation.org>",
- " Paul Kocialkowski <paul.kocialkowski\@bootlin.com>",
- " Thomas Petazzoni <thomas.petazzoni\@bootlin.com>",
- " Randy Li <ayaka\@soulik.info>",
- " Hans Verkuil <hverkuil\@xs4all.nl>",
- " Ezequiel Garcia <ezequiel\@collabora.com>",
- " Tomasz Figa <tfiga\@chromium.org>",
- " Alexandre Courbot <acourbot\@chromium.org>",
- " Philipp Zabel <p.zabel\@pengutronix.de>",
- " Laurent Pinchart <laurent.pinchart\@ideasonboard.com>",
- " Sakari Ailus <sakari.ailus\@linux.intel.com>",
- " linux-sunxi\@googlegroups.com\0"
+ "To\0linux-arm-kernel\@lists.infradead.org\0"
]
[
"\0000:1\0"
@@ -70,7 +47,7 @@
"+\t\tranges;\n",
"+\n",
"+\t\t/* Address must be kept in the lower 256 MiBs of DRAM for VE. */\n",
- "+\t\tcma_pool: cma\@4a000000 {\n",
+ "+\t\tcma_pool: cma at 4a000000 {\n",
"+\t\t\tcompatible = \"shared-dma-pool\";\n",
"+\t\t\tsize = <0x6000000>;\n",
"+\t\t\talloc-ranges = <0x4a000000 0x6000000>;\n",
@@ -86,7 +63,7 @@
" \t\t\t};\n",
" \t\t};\n",
" \n",
- "+\t\tvideo-codec\@01c0e000 {\n",
+ "+\t\tvideo-codec at 01c0e000 {\n",
"+\t\t\tcompatible = \"allwinner,sun8i-a33-video-engine\";\n",
"+\t\t\treg = <0x01c0e000 0x1000>;\n",
"+\t\t\tclocks = <&ccu CLK_BUS_VE>, <&ccu CLK_VE>,\n",
@@ -97,11 +74,11 @@
"+\t\t\tallwinner,sram = <&ve_sram 1>;\n",
"+\t\t};\n",
"+\n",
- " \t\tcrypto: crypto-engine\@1c15000 {\n",
+ " \t\tcrypto: crypto-engine at 1c15000 {\n",
" \t\t\tcompatible = \"allwinner,sun4i-a10-crypto\";\n",
" \t\t\treg = <0x01c15000 0x1000>;\n",
"-- \n",
"2.18.0"
]
-b462d1ed13ec9a7d479bcd95be1fcc5947b876f39a51246a029c8eb7d1ff0e77
+bcb2b1e2f90ce376ad1b78d2b23af9fb332061684112f6f00339f1e0ea8baed4
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.