diff for duplicates of <517AF926.3020302@redhat.com> diff --git a/a/1.txt b/N1/1.txt index 152deef..c78ad45 100644 --- a/a/1.txt +++ b/N1/1.txt @@ -71,10 +71,3 @@ JIT implementation, i.e. because they do basically the same. So follow-up Also, I find it a bit weird that seccomp_filter_get_len() and some other _one-line_ functions from kernel/seccomp.c are not placed into the corresponding header file as inlines. --------------- next part -------------- -A non-text attachment was scrubbed... -Name: 0001-ARM-bpf_jit-seccomp-filtering-fixup-merge-conflict.patch -Type: text/x-patch -Size: 1668 bytes -Desc: not available -URL: <http://lists.infradead.org/pipermail/linux-arm-kernel/attachments/20130427/0d0a4f93/attachment-0001.bin> diff --git a/N1/2.hdr b/N1/2.hdr new file mode 100644 index 0000000..82e51ce --- /dev/null +++ b/N1/2.hdr @@ -0,0 +1,6 @@ +Content-Type: text/x-patch; + name="0001-ARM-bpf_jit-seccomp-filtering-fixup-merge-conflict.patch" +Content-Transfer-Encoding: 7bit +Content-Disposition: attachment; + filename*0="0001-ARM-bpf_jit-seccomp-filtering-fixup-merge-conflict.patc"; + filename*1="h" diff --git a/N1/2.txt b/N1/2.txt new file mode 100644 index 0000000..3b40e51 --- /dev/null +++ b/N1/2.txt @@ -0,0 +1,42 @@ +>From 655f4aabee7ccb909345ccfce92a405e3d173de5 Mon Sep 17 00:00:00 2001 +Message-Id: <655f4aabee7ccb909345ccfce92a405e3d173de5.1367012811.git.dborkman@redhat.com> +In-Reply-To: <cover.1367012811.git.dborkman@redhat.com> +References: <cover.1367012811.git.dborkman@redhat.com> +From: Daniel Borkmann <dborkman@redhat.com> +Date: Fri, 26 Apr 2013 23:41:06 +0200 +Subject: [PATCH linux-next -mm] ARM: bpf_jit: seccomp filtering: fixup merge conflict + +Commit e4c67f4c0479d8e3cb0 (ARM: net: bpf_jit: make code generation +less dependent on struct sk_filter.) caused a merge conflict with +commit 79617801ea0c0e6 (filter: bpf_jit_comp: refactor and unify +BPF JIT image dump output) resulting in a build failure: + +arch/arm/net/bpf_jit_32.c: In function '__bpf_jit_compile': +arch/arm/net/bpf_jit_32.c:930:16: error: 'fp' undeclared (first use in this function) + bpf_jit_dump(fp->len, alloc_size, 2, ctx.target); + +Fix this up by using ctx.prog_len that is being set before we enter +__bpf_jit_compile(). + +Reported-by: Arnd Bergmann <arnd@arndb.de> +Cc: Nicolas Schichan <nschichan@freebox.fr> +Signed-off-by: Daniel Borkmann <dborkman@redhat.com> +--- + arch/arm/net/bpf_jit_32.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/arch/arm/net/bpf_jit_32.c b/arch/arm/net/bpf_jit_32.c +index c5ef845..eb4daba 100644 +--- a/arch/arm/net/bpf_jit_32.c ++++ b/arch/arm/net/bpf_jit_32.c +@@ -927,7 +927,7 @@ static void __bpf_jit_compile(struct jit_ctx *out_ctx) + + if (bpf_jit_enable > 1) + /* there are 2 passes here */ +- bpf_jit_dump(fp->len, alloc_size, 2, ctx.target); ++ bpf_jit_dump(ctx.prog_len, alloc_size, 2, ctx.target); + out: + kfree(ctx.offsets); + +-- +1.7.11.7 diff --git a/a/content_digest b/N1/content_digest index 8556a7e..15b6cfc 100644 --- a/a/content_digest +++ b/N1/content_digest @@ -4,11 +4,22 @@ "ref\020130426122601.10ec05fcb4860df1b0a5b409@linux-foundation.org\0" "ref\0517AD9E2.2090704@redhat.com\0" "ref\020130426130948.cbfd2f6256afc0e3ee7abeed@linux-foundation.org\0" - "From\0dborkman@redhat.com (Daniel Borkmann)\0" - "Subject\0[PATCH V3 2/3] ARM: net: bpf_jit: make code generation less dependent on struct sk_filter.\0" + "From\0Daniel Borkmann <dborkman@redhat.com>\0" + "Subject\0Re: [PATCH V3 2/3] ARM: net: bpf_jit: make code generation less dependent on struct sk_filter.\0" "Date\0Sat, 27 Apr 2013 00:01:10 +0200\0" - "To\0linux-arm-kernel@lists.infradead.org\0" - "\00:1\0" + "To\0Andrew Morton <akpm@linux-foundation.org>\0" + "Cc\0Arnd Bergmann <arnd@arndb.de>" + Nicolas Schichan <nschichan@freebox.fr> + Will Drewry <wad@chromium.org> + Mircea Gherzan <mgherzan@gmail.com> + linux-kernel@vger.kernel.org + linux-arm-kernel@lists.infradead.org + Russell King <linux@arm.linux.org.uk> + David S. Miller <davem@davemloft.net> + Daniel Borkmann <daniel.borkmann@tik.ee.ethz.ch> + netdev@vger.kernel.org + " Xi Wang <xi.wang@gmail.com>\0" + "\01:1\0" "b\0" "On 04/26/2013 10:09 PM, Andrew Morton wrote:\n" "> On Fri, 26 Apr 2013 21:47:46 +0200 Daniel Borkmann <dborkman@redhat.com> wrote:\n" @@ -82,13 +93,51 @@ "\n" "Also, I find it a bit weird that seccomp_filter_get_len() and some other\n" "_one-line_ functions from kernel/seccomp.c are not placed into the\n" - "corresponding header file as inlines.\n" - "-------------- next part --------------\n" - "A non-text attachment was scrubbed...\n" - "Name: 0001-ARM-bpf_jit-seccomp-filtering-fixup-merge-conflict.patch\n" - "Type: text/x-patch\n" - "Size: 1668 bytes\n" - "Desc: not available\n" - URL: <http://lists.infradead.org/pipermail/linux-arm-kernel/attachments/20130427/0d0a4f93/attachment-0001.bin> + corresponding header file as inlines. + "\01:2\0" + "fn\00001-ARM-bpf_jit-seccomp-filtering-fixup-merge-conflict.patch\0" + "b\0" + ">From 655f4aabee7ccb909345ccfce92a405e3d173de5 Mon Sep 17 00:00:00 2001\n" + "Message-Id: <655f4aabee7ccb909345ccfce92a405e3d173de5.1367012811.git.dborkman@redhat.com>\n" + "In-Reply-To: <cover.1367012811.git.dborkman@redhat.com>\n" + "References: <cover.1367012811.git.dborkman@redhat.com>\n" + "From: Daniel Borkmann <dborkman@redhat.com>\n" + "Date: Fri, 26 Apr 2013 23:41:06 +0200\n" + "Subject: [PATCH linux-next -mm] ARM: bpf_jit: seccomp filtering: fixup merge conflict\n" + "\n" + "Commit e4c67f4c0479d8e3cb0 (ARM: net: bpf_jit: make code generation\n" + "less dependent on struct sk_filter.) caused a merge conflict with\n" + "commit 79617801ea0c0e6 (filter: bpf_jit_comp: refactor and unify\n" + "BPF JIT image dump output) resulting in a build failure:\n" + "\n" + "arch/arm/net/bpf_jit_32.c: In function '__bpf_jit_compile':\n" + "arch/arm/net/bpf_jit_32.c:930:16: error: 'fp' undeclared (first use in this function)\n" + " bpf_jit_dump(fp->len, alloc_size, 2, ctx.target);\n" + "\n" + "Fix this up by using ctx.prog_len that is being set before we enter\n" + "__bpf_jit_compile().\n" + "\n" + "Reported-by: Arnd Bergmann <arnd@arndb.de>\n" + "Cc: Nicolas Schichan <nschichan@freebox.fr>\n" + "Signed-off-by: Daniel Borkmann <dborkman@redhat.com>\n" + "---\n" + " arch/arm/net/bpf_jit_32.c | 2 +-\n" + " 1 file changed, 1 insertion(+), 1 deletion(-)\n" + "\n" + "diff --git a/arch/arm/net/bpf_jit_32.c b/arch/arm/net/bpf_jit_32.c\n" + "index c5ef845..eb4daba 100644\n" + "--- a/arch/arm/net/bpf_jit_32.c\n" + "+++ b/arch/arm/net/bpf_jit_32.c\n" + "@@ -927,7 +927,7 @@ static void __bpf_jit_compile(struct jit_ctx *out_ctx)\n" + " \n" + " \tif (bpf_jit_enable > 1)\n" + " \t\t/* there are 2 passes here */\n" + "-\t\tbpf_jit_dump(fp->len, alloc_size, 2, ctx.target);\n" + "+\t\tbpf_jit_dump(ctx.prog_len, alloc_size, 2, ctx.target);\n" + " out:\n" + " \tkfree(ctx.offsets);\n" + " \n" + "-- \n" + 1.7.11.7 -1ae89b283e5637698b3b6b5a3610f2e92c836edebfcc31ef6310d1cbfc26b506 +d8d64f542685bcdf1f61207463e21eedbcc54d09b9b16921d47064fe776a9af4
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.