diff for duplicates of <20091124081840.6216.49419.stgit@angua> diff --git a/a/1.txt b/N1/1.txt index d87a73b..c99e45d 100644 --- a/a/1.txt +++ b/N1/1.txt @@ -54,7 +54,7 @@ index 7760186..7ee021f 100644 - -#ifdef CONFIG_CMDLINE -#ifndef CONFIG_CMDLINE_FORCE -- if (p == NULL || l == 0 || (l == 1 && (*p) == 0)) +- if (p = NULL || l = 0 || (l = 1 && (*p) = 0)) -#endif - strlcpy(cmd_line, CONFIG_CMDLINE, COMMAND_LINE_SIZE); -#endif /* CONFIG_CMDLINE */ @@ -131,7 +131,7 @@ index 43cdba2..2c7d4a3 100644 - strlcpy(cmd_line, p, min((int)l, COMMAND_LINE_SIZE)); - -#ifdef CONFIG_CMDLINE -- if (p == NULL || l == 0 || (l == 1 && (*p) == 0)) +- if (p = NULL || l = 0 || (l = 1 && (*p) = 0)) - strlcpy(cmd_line, CONFIG_CMDLINE, COMMAND_LINE_SIZE); -#endif /* CONFIG_CMDLINE */ - @@ -182,7 +182,7 @@ index ebce509..616a476 100644 + +#ifdef CONFIG_CMDLINE +#ifndef CONFIG_CMDLINE_FORCE -+ if (p == NULL || l == 0 || (l == 1 && (*p) == 0)) ++ if (p = NULL || l = 0 || (l = 1 && (*p) = 0)) +#endif + strlcpy(cmd_line, CONFIG_CMDLINE, COMMAND_LINE_SIZE); +#endif /* CONFIG_CMDLINE */ diff --git a/a/content_digest b/N1/content_digest index 02e0a53..e5732db 100644 --- a/a/content_digest +++ b/N1/content_digest @@ -1,15 +1,14 @@ "ref\020091124081316.6216.66310.stgit@angua\0" "From\0Grant Likely <grant.likely@secretlab.ca>\0" "Subject\0[PATCH 05/11] of/flattree: merge early_init_dt_scan_chosen()\0" - "Date\0Tue, 24 Nov 2009 01:18:48 -0700\0" + "Date\0Tue, 24 Nov 2009 08:18:48 +0000\0" "To\0linuxppc-dev@lists.ozlabs.org" devicetree-discuss@lists.ozlabs.org sparclinux@vger.kernel.org microblaze-uclinux@itee.uq.edu.au benh@kernel.crashing.org sfr@canb.auug.org.au - davem@davemloft.net - " monstr@monstr.eu\0" + " dave\0" "\00:1\0" "b\0" "Merge common code between PowerPC and Microblaze. This patch\n" @@ -68,7 +67,7 @@ "-\n" "-#ifdef CONFIG_CMDLINE\n" "-#ifndef CONFIG_CMDLINE_FORCE\n" - "-\tif (p == NULL || l == 0 || (l == 1 && (*p) == 0))\n" + "-\tif (p = NULL || l = 0 || (l = 1 && (*p) = 0))\n" "-#endif\n" "-\t\tstrlcpy(cmd_line, CONFIG_CMDLINE, COMMAND_LINE_SIZE);\n" "-#endif /* CONFIG_CMDLINE */\n" @@ -145,7 +144,7 @@ "-\t\tstrlcpy(cmd_line, p, min((int)l, COMMAND_LINE_SIZE));\n" "-\n" "-#ifdef CONFIG_CMDLINE\n" - "-\tif (p == NULL || l == 0 || (l == 1 && (*p) == 0))\n" + "-\tif (p = NULL || l = 0 || (l = 1 && (*p) = 0))\n" "-\t\tstrlcpy(cmd_line, CONFIG_CMDLINE, COMMAND_LINE_SIZE);\n" "-#endif /* CONFIG_CMDLINE */\n" "-\n" @@ -196,7 +195,7 @@ "+\n" "+#ifdef CONFIG_CMDLINE\n" "+#ifndef CONFIG_CMDLINE_FORCE\n" - "+\tif (p == NULL || l == 0 || (l == 1 && (*p) == 0))\n" + "+\tif (p = NULL || l = 0 || (l = 1 && (*p) = 0))\n" "+#endif\n" "+\t\tstrlcpy(cmd_line, CONFIG_CMDLINE, COMMAND_LINE_SIZE);\n" "+#endif /* CONFIG_CMDLINE */\n" @@ -226,4 +225,4 @@ " extern void early_init_dt_check_for_initrd(unsigned long node);\n" extern u64 dt_mem_next_cell(int s, u32 **cellp); -12f7057f8106beaa1cf6bc54b2f5b523cb49615b15807adfb8dbbcc3cf5bd9cb +86557578f09686a98ce06d863fdafba119054784e2127bc9a3556c1ba0c9dcd9
diff --git a/a/content_digest b/N2/content_digest index 02e0a53..0c3824c 100644 --- a/a/content_digest +++ b/N2/content_digest @@ -8,8 +8,7 @@ microblaze-uclinux@itee.uq.edu.au benh@kernel.crashing.org sfr@canb.auug.org.au - davem@davemloft.net - " monstr@monstr.eu\0" + " dave\0" "\00:1\0" "b\0" "Merge common code between PowerPC and Microblaze. This patch\n" @@ -226,4 +225,4 @@ " extern void early_init_dt_check_for_initrd(unsigned long node);\n" extern u64 dt_mem_next_cell(int s, u32 **cellp); -12f7057f8106beaa1cf6bc54b2f5b523cb49615b15807adfb8dbbcc3cf5bd9cb +b4400ca381cb089d1459e8e18f967d92a5e72e76eed6e7cbd14db297bfcd32bd
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.