diff for duplicates of <20101206001310.658304531@vergenet.net> diff --git a/a/1.txt b/N1/1.txt index d0a0c3d..5b43c96 100644 --- a/a/1.txt +++ b/N1/1.txt @@ -4,8 +4,7 @@ Cc: Magnus Damm <magnus.damm@gmail.com> Signed-off-by: Simon Horman <horms@verge.net.au> Index: linux-2.6-ap4/arch/sh/boot/romimage/mmcif-sh7724.c -=================================================================== ---- linux-2.6-ap4.orig/arch/sh/boot/romimage/mmcif-sh7724.c 2010-12-06 08:59:11.000000000 +0900 +=================================--- linux-2.6-ap4.orig/arch/sh/boot/romimage/mmcif-sh7724.c 2010-12-06 08:59:11.000000000 +0900 +++ linux-2.6-ap4/arch/sh/boot/romimage/mmcif-sh7724.c 2010-12-06 08:59:16.000000000 +0900 @@ -21,9 +21,6 @@ #define HIZCRC 0xa405015c @@ -18,8 +17,7 @@ Index: linux-2.6-ap4/arch/sh/boot/romimage/mmcif-sh7724.c * * loads the romImage from an MMC card starting from block 512 Index: linux-2.6-ap4/include/linux/mmc/sh_mmcif.h -=================================================================== ---- linux-2.6-ap4.orig/include/linux/mmc/sh_mmcif.h 2010-12-06 08:59:11.000000000 +0900 +=================================--- linux-2.6-ap4.orig/include/linux/mmc/sh_mmcif.h 2010-12-06 08:59:11.000000000 +0900 +++ linux-2.6-ap4/include/linux/mmc/sh_mmcif.h 2010-12-06 08:59:16.000000000 +0900 @@ -97,6 +97,9 @@ static inline void sh_mmcif_writel(void diff --git a/a/content_digest b/N1/content_digest index 90cac4a..609f536 100644 --- a/a/content_digest +++ b/N1/content_digest @@ -1,18 +1,9 @@ "ref\020101206001243.949375995@vergenet.net\0" "From\0Simon Horman <horms@verge.net.au>\0" "Subject\0[patch 1/3] mmc, sh: Move MMCIF_PROGRESS_* into sh_mmcif.h\0" - "Date\0Mon, 06 Dec 2010 09:12:44 +0900\0" - "To\0linux-mmc@vger.kernel.org" - linux-sh@vger.kernel.org - " linux-arm-kernel@lists.infradead.org\0" - "Cc\0Russell King - ARM Linux <linux@arm.linux.org.uk>" - Chris Ball <cjb@laptop.org> - Yusuke Goda <yusuke.goda.sx@renesas.com> - Kuninori Morimoto <kuninori.morimoto.gx@renesas.com> - Magnus Damm <magnus.damm@gmail.com> - " Paul Mundt <lethal@linux-sh.org>\0" + "Date\0Mon, 06 Dec 2010 00:12:44 +0000\0" + "To\0linux-arm-kernel@lists.infradead.org\0" "\00:1\0" - "fn\0MMCIF_PROGRESS-header.patch\0" "b\0" "Allow MMCIF_PROGRESS_* to be shared.\n" "\n" @@ -20,8 +11,7 @@ "Signed-off-by: Simon Horman <horms@verge.net.au>\n" "\n" "Index: linux-2.6-ap4/arch/sh/boot/romimage/mmcif-sh7724.c\n" - "===================================================================\n" - "--- linux-2.6-ap4.orig/arch/sh/boot/romimage/mmcif-sh7724.c\t2010-12-06 08:59:11.000000000 +0900\n" + "=================================--- linux-2.6-ap4.orig/arch/sh/boot/romimage/mmcif-sh7724.c\t2010-12-06 08:59:11.000000000 +0900\n" "+++ linux-2.6-ap4/arch/sh/boot/romimage/mmcif-sh7724.c\t2010-12-06 08:59:16.000000000 +0900\n" "@@ -21,9 +21,6 @@\n" " #define HIZCRC\t\t0xa405015c\n" @@ -34,8 +24,7 @@ " *\n" " * loads the romImage from an MMC card starting from block 512\n" "Index: linux-2.6-ap4/include/linux/mmc/sh_mmcif.h\n" - "===================================================================\n" - "--- linux-2.6-ap4.orig/include/linux/mmc/sh_mmcif.h\t2010-12-06 08:59:11.000000000 +0900\n" + "=================================--- linux-2.6-ap4.orig/include/linux/mmc/sh_mmcif.h\t2010-12-06 08:59:11.000000000 +0900\n" "+++ linux-2.6-ap4/include/linux/mmc/sh_mmcif.h\t2010-12-06 08:59:16.000000000 +0900\n" "@@ -97,6 +97,9 @@ static inline void sh_mmcif_writel(void\n" " \n" @@ -48,4 +37,4 @@ " \t\t\t\t\t unsigned long cmd, unsigned long arg)\n" { -4f9124a50fdc9091eb13ad0e4fce2837adf758ca5d3557a55f908cc552b3d635 +d3fcf651a00a9d928386d8a4ebaeb1aa08875ba194412b5bdabed61dc0f692b7
diff --git a/a/1.txt b/N2/1.txt index d0a0c3d..3607011 100644 --- a/a/1.txt +++ b/N2/1.txt @@ -1,33 +1,3 @@ -Allow MMCIF_PROGRESS_* to be shared. - -Cc: Magnus Damm <magnus.damm@gmail.com> -Signed-off-by: Simon Horman <horms@verge.net.au> - -Index: linux-2.6-ap4/arch/sh/boot/romimage/mmcif-sh7724.c -=================================================================== ---- linux-2.6-ap4.orig/arch/sh/boot/romimage/mmcif-sh7724.c 2010-12-06 08:59:11.000000000 +0900 -+++ linux-2.6-ap4/arch/sh/boot/romimage/mmcif-sh7724.c 2010-12-06 08:59:16.000000000 +0900 -@@ -21,9 +21,6 @@ - #define HIZCRC 0xa405015c - #define DRVCRA 0xa405018a - --enum { MMCIF_PROGRESS_ENTER, MMCIF_PROGRESS_INIT, -- MMCIF_PROGRESS_LOAD, MMCIF_PROGRESS_DONE }; -- - /* SH7724 specific MMCIF loader - * - * loads the romImage from an MMC card starting from block 512 -Index: linux-2.6-ap4/include/linux/mmc/sh_mmcif.h -=================================================================== ---- linux-2.6-ap4.orig/include/linux/mmc/sh_mmcif.h 2010-12-06 08:59:11.000000000 +0900 -+++ linux-2.6-ap4/include/linux/mmc/sh_mmcif.h 2010-12-06 08:59:16.000000000 +0900 -@@ -97,6 +97,9 @@ static inline void sh_mmcif_writel(void - - #define SH_MMCIF_BBS 512 /* boot block size */ - -+enum { MMCIF_PROGRESS_ENTER, MMCIF_PROGRESS_INIT, -+ MMCIF_PROGRESS_LOAD, MMCIF_PROGRESS_DONE }; -+ - static inline void sh_mmcif_boot_cmd_send(void __iomem *base, - unsigned long cmd, unsigned long arg) - { +An embedded and charset-unspecified text was scrubbed... +Name: MMCIF_PROGRESS-header.patch +URL: <http://lists.infradead.org/pipermail/linux-arm-kernel/attachments/20101206/5613a8a3/attachment.ksh> diff --git a/a/content_digest b/N2/content_digest index 90cac4a..103ed66 100644 --- a/a/content_digest +++ b/N2/content_digest @@ -1,51 +1,12 @@ "ref\020101206001243.949375995@vergenet.net\0" - "From\0Simon Horman <horms@verge.net.au>\0" + "From\0horms@verge.net.au (Simon Horman)\0" "Subject\0[patch 1/3] mmc, sh: Move MMCIF_PROGRESS_* into sh_mmcif.h\0" "Date\0Mon, 06 Dec 2010 09:12:44 +0900\0" - "To\0linux-mmc@vger.kernel.org" - linux-sh@vger.kernel.org - " linux-arm-kernel@lists.infradead.org\0" - "Cc\0Russell King - ARM Linux <linux@arm.linux.org.uk>" - Chris Ball <cjb@laptop.org> - Yusuke Goda <yusuke.goda.sx@renesas.com> - Kuninori Morimoto <kuninori.morimoto.gx@renesas.com> - Magnus Damm <magnus.damm@gmail.com> - " Paul Mundt <lethal@linux-sh.org>\0" + "To\0linux-arm-kernel@lists.infradead.org\0" "\00:1\0" - "fn\0MMCIF_PROGRESS-header.patch\0" "b\0" - "Allow MMCIF_PROGRESS_* to be shared.\n" - "\n" - "Cc: Magnus Damm <magnus.damm@gmail.com>\n" - "Signed-off-by: Simon Horman <horms@verge.net.au>\n" - "\n" - "Index: linux-2.6-ap4/arch/sh/boot/romimage/mmcif-sh7724.c\n" - "===================================================================\n" - "--- linux-2.6-ap4.orig/arch/sh/boot/romimage/mmcif-sh7724.c\t2010-12-06 08:59:11.000000000 +0900\n" - "+++ linux-2.6-ap4/arch/sh/boot/romimage/mmcif-sh7724.c\t2010-12-06 08:59:16.000000000 +0900\n" - "@@ -21,9 +21,6 @@\n" - " #define HIZCRC\t\t0xa405015c\n" - " #define DRVCRA\t\t0xa405018a\n" - " \n" - "-enum { MMCIF_PROGRESS_ENTER, MMCIF_PROGRESS_INIT,\n" - "- MMCIF_PROGRESS_LOAD, MMCIF_PROGRESS_DONE };\n" - "-\n" - " /* SH7724 specific MMCIF loader\n" - " *\n" - " * loads the romImage from an MMC card starting from block 512\n" - "Index: linux-2.6-ap4/include/linux/mmc/sh_mmcif.h\n" - "===================================================================\n" - "--- linux-2.6-ap4.orig/include/linux/mmc/sh_mmcif.h\t2010-12-06 08:59:11.000000000 +0900\n" - "+++ linux-2.6-ap4/include/linux/mmc/sh_mmcif.h\t2010-12-06 08:59:16.000000000 +0900\n" - "@@ -97,6 +97,9 @@ static inline void sh_mmcif_writel(void\n" - " \n" - " #define SH_MMCIF_BBS 512 /* boot block size */\n" - " \n" - "+enum { MMCIF_PROGRESS_ENTER, MMCIF_PROGRESS_INIT,\n" - "+ MMCIF_PROGRESS_LOAD, MMCIF_PROGRESS_DONE };\n" - "+\n" - " static inline void sh_mmcif_boot_cmd_send(void __iomem *base,\n" - " \t\t\t\t\t unsigned long cmd, unsigned long arg)\n" - { + "An embedded and charset-unspecified text was scrubbed...\n" + "Name: MMCIF_PROGRESS-header.patch\n" + URL: <http://lists.infradead.org/pipermail/linux-arm-kernel/attachments/20101206/5613a8a3/attachment.ksh> -4f9124a50fdc9091eb13ad0e4fce2837adf758ca5d3557a55f908cc552b3d635 +ae4686beb738ced023c2268dd590a1b547a518bf5c35260ac35fc55e65e83b80
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.