diff for duplicates of <20100830000614.0d571f10@debxo> diff --git a/a/1.txt b/N1/1.txt index 4ac71b6..8ac86e8 100644 --- a/a/1.txt +++ b/N1/1.txt @@ -25,7 +25,7 @@ index 5458380..0a656b9 100644 + static inline int irq_canonicalize(int irq) { - return ((irq = 2) ? 9 : irq); + return ((irq == 2) ? 9 : irq); diff --git a/arch/x86/kernel/irq.c b/arch/x86/kernel/irq.c index 91fd0c7..d53f639 100644 --- a/arch/x86/kernel/irq.c diff --git a/a/content_digest b/N1/content_digest index d963004..35c9427 100644 --- a/a/content_digest +++ b/N1/content_digest @@ -1,19 +1,21 @@ "ref\020100628215407.2017bf2f@debian\0" "ref\020100829235100.6dcedcb8@debxo\0" "From\0Andres Salomon <dilinger@queued.net>\0" - "Subject\0[PATCH 8/9] x86: of: irq additions to make drivers/of/* build on\0" - "Date\0Mon, 30 Aug 2010 04:06:14 +0000\0" - "To\0devicetree-discuss-uLR06cmDAlY/bJ5BZ2RsiQ@public.gmane.org\0" - "Cc\0pgf-2X9k7bc8m7Mdnm+yROfE0A@public.gmane.org" - x86-DgEjT+Ai2ygdnm+yROfE0A@public.gmane.org - linux-kernel-u79uwXL29TY76Z2rM5mHXA@public.gmane.org - Mitch Bradley <wmb-2X9k7bc8m7Mdnm+yROfE0A@public.gmane.org> - mingo-H+wXaHxf7aLQT0dZR+AlfA@public.gmane.org - hpa-YMNOUZJC4hwAvxtiuMwx3w@public.gmane.org - sparclinux-u79uwXL29TY76Z2rM5mHXA@public.gmane.org - tglx-hfZtesqFncYOwBW4kG4KsQ@public.gmane.org - cjb-2X9k7bc8m7Mdnm+yROfE0A@public.gmane.org - " davem-fT/PcQaiUtIeIZ0/mPfg9Q@public.gmane.org\0" + "Subject\0[PATCH 8/9] x86: of: irq additions to make drivers/of/* build on x86\0" + "Date\0Mon, 30 Aug 2010 00:06:14 -0400\0" + "To\0devicetree-discuss@lists.ozlabs.org\0" + "Cc\0sparclinux@vger.kernel.org" + x86@kernel.org + tglx@linutronix.de + mingo@redhat.com + hpa@zytor.com + cjb@laptop.org + Mitch Bradley <wmb@laptop.org> + pgf@laptop.org + linux-kernel@vger.kernel.org + davem@davemloft.net + grant.likely@secretlab.ca + " Stephen Neuendorffer <stephen.neuendorffer@xilinx.com>\0" "\00:1\0" "b\0" "\n" @@ -43,7 +45,7 @@ "+\n" " static inline int irq_canonicalize(int irq)\n" " {\n" - " \treturn ((irq = 2) ? 9 : irq);\n" + " \treturn ((irq == 2) ? 9 : irq);\n" "diff --git a/arch/x86/kernel/irq.c b/arch/x86/kernel/irq.c\n" "index 91fd0c7..d53f639 100644\n" "--- a/arch/x86/kernel/irq.c\n" @@ -85,4 +87,4 @@ "-- \n" 1.5.6.5 -e5c2f27fedd65f297b55d7d80ed151edfc9e881ca8f76dd7b5e4b7dee1a11c7e +4c272fee7820ee8a650a1312d8ed21dbe39fa3b312f271dd86eb68082399bda7
diff --git a/a/1.txt b/N2/1.txt index 4ac71b6..258f182 100644 --- a/a/1.txt +++ b/N2/1.txt @@ -3,7 +3,7 @@ This functionality overlaps with patches previously submitted by Stephen Neuendorffer. I don't care whose eventually get applied, so long as drivers/of/* becomes buildable on x86. -Signed-off-by: Andres Salomon <dilinger@queued.net> +Signed-off-by: Andres Salomon <dilinger-pFFUokh25LWsTnJN9+BGXg@public.gmane.org> --- arch/x86/include/asm/irq.h | 5 +++++ arch/x86/kernel/irq.c | 8 ++++++++ @@ -25,7 +25,7 @@ index 5458380..0a656b9 100644 + static inline int irq_canonicalize(int irq) { - return ((irq = 2) ? 9 : irq); + return ((irq == 2) ? 9 : irq); diff --git a/arch/x86/kernel/irq.c b/arch/x86/kernel/irq.c index 91fd0c7..d53f639 100644 --- a/arch/x86/kernel/irq.c diff --git a/a/content_digest b/N2/content_digest index d963004..97debde 100644 --- a/a/content_digest +++ b/N2/content_digest @@ -1,8 +1,8 @@ "ref\020100628215407.2017bf2f@debian\0" "ref\020100829235100.6dcedcb8@debxo\0" - "From\0Andres Salomon <dilinger@queued.net>\0" - "Subject\0[PATCH 8/9] x86: of: irq additions to make drivers/of/* build on\0" - "Date\0Mon, 30 Aug 2010 04:06:14 +0000\0" + "From\0Andres Salomon <dilinger-pFFUokh25LWsTnJN9+BGXg@public.gmane.org>\0" + "Subject\0[PATCH 8/9] x86: of: irq additions to make drivers/of/* build on x86\0" + "Date\0Mon, 30 Aug 2010 00:06:14 -0400\0" "To\0devicetree-discuss-uLR06cmDAlY/bJ5BZ2RsiQ@public.gmane.org\0" "Cc\0pgf-2X9k7bc8m7Mdnm+yROfE0A@public.gmane.org" x86-DgEjT+Ai2ygdnm+yROfE0A@public.gmane.org @@ -21,7 +21,7 @@ "by Stephen Neuendorffer. I don't care whose eventually get applied,\n" "so long as drivers/of/* becomes buildable on x86.\n" "\n" - "Signed-off-by: Andres Salomon <dilinger@queued.net>\n" + "Signed-off-by: Andres Salomon <dilinger-pFFUokh25LWsTnJN9+BGXg@public.gmane.org>\n" "---\n" " arch/x86/include/asm/irq.h | 5 +++++\n" " arch/x86/kernel/irq.c | 8 ++++++++\n" @@ -43,7 +43,7 @@ "+\n" " static inline int irq_canonicalize(int irq)\n" " {\n" - " \treturn ((irq = 2) ? 9 : irq);\n" + " \treturn ((irq == 2) ? 9 : irq);\n" "diff --git a/arch/x86/kernel/irq.c b/arch/x86/kernel/irq.c\n" "index 91fd0c7..d53f639 100644\n" "--- a/arch/x86/kernel/irq.c\n" @@ -85,4 +85,4 @@ "-- \n" 1.5.6.5 -e5c2f27fedd65f297b55d7d80ed151edfc9e881ca8f76dd7b5e4b7dee1a11c7e +6a312bdb2f4abb42d273e0f4aeab7afeb593fb24793ab0cfd03313cdaff44ef3
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.