From: Greg Kroah-Hartman Date: Tue, 14 Apr 2020 07:39:55 +0000 (+0200) Subject: fix up a bpf patch's comments as quilt does not like it :( X-Git-Tag: v4.19.116~96 X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=d645b8cf3129238fe4663e3e19244405f74bf1cf;p=thirdparty%2Fkernel%2Fstable-queue.git fix up a bpf patch's comments as quilt does not like it :( --- diff --git a/queue-5.4/bpf-fix-deadlock-with-rq_lock-in-bpf_send_signal.patch b/queue-5.4/bpf-fix-deadlock-with-rq_lock-in-bpf_send_signal.patch index f559556cc8f..2e885eee46f 100644 --- a/queue-5.4/bpf-fix-deadlock-with-rq_lock-in-bpf_send_signal.patch +++ b/queue-5.4/bpf-fix-deadlock-with-rq_lock-in-bpf_send_signal.patch @@ -105,8 +105,8 @@ used tracepoint point sched/sched_switch so the issue can be easily caught. and the following command: 1. run `stress_test /bin/ls` in one windown 2. hack bcc trace.py with the following change: - --- a/tools/trace.py - +++ b/tools/trace.py +# --- a/tools/trace.py +# +++ b/tools/trace.py @@ -513,6 +513,7 @@ BPF_PERF_OUTPUT(%s); __data.tgid = __tgid; __data.pid = __pid; @@ -178,12 +178,11 @@ Signed-off-by: Alexei Starovoitov Cc: Song Liu Link: https://lore.kernel.org/bpf/20200304191104.2796501-1-yhs@fb.com Signed-off-by: Sasha Levin +Signed-off-by: Greg Kroah-Hartman --- - kernel/trace/bpf_trace.c | 2 +- + kernel/trace/bpf_trace.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) -diff --git a/kernel/trace/bpf_trace.c b/kernel/trace/bpf_trace.c -index 89bdac61233db..2372b861f2cfa 100644 --- a/kernel/trace/bpf_trace.c +++ b/kernel/trace/bpf_trace.c @@ -650,7 +650,7 @@ BPF_CALL_1(bpf_send_signal, u32, sig) @@ -195,6 +194,3 @@ index 89bdac61233db..2372b861f2cfa 100644 /* Do an early check on signal validity. Otherwise, * the error is lost in deferred irq_work. */ --- -2.20.1 - diff --git a/queue-5.5/bpf-fix-deadlock-with-rq_lock-in-bpf_send_signal.patch b/queue-5.5/bpf-fix-deadlock-with-rq_lock-in-bpf_send_signal.patch index 286fa11f0d2..2d477668180 100644 --- a/queue-5.5/bpf-fix-deadlock-with-rq_lock-in-bpf_send_signal.patch +++ b/queue-5.5/bpf-fix-deadlock-with-rq_lock-in-bpf_send_signal.patch @@ -105,8 +105,8 @@ used tracepoint point sched/sched_switch so the issue can be easily caught. and the following command: 1. run `stress_test /bin/ls` in one windown 2. hack bcc trace.py with the following change: - --- a/tools/trace.py - +++ b/tools/trace.py +# --- a/tools/trace.py +# +++ b/tools/trace.py @@ -513,6 +513,7 @@ BPF_PERF_OUTPUT(%s); __data.tgid = __tgid; __data.pid = __pid; @@ -178,12 +178,11 @@ Signed-off-by: Alexei Starovoitov Cc: Song Liu Link: https://lore.kernel.org/bpf/20200304191104.2796501-1-yhs@fb.com Signed-off-by: Sasha Levin +Signed-off-by: Greg Kroah-Hartman --- - kernel/trace/bpf_trace.c | 2 +- + kernel/trace/bpf_trace.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) -diff --git a/kernel/trace/bpf_trace.c b/kernel/trace/bpf_trace.c -index e5ef4ae9edb50..0e553b1706d37 100644 --- a/kernel/trace/bpf_trace.c +++ b/kernel/trace/bpf_trace.c @@ -731,7 +731,7 @@ BPF_CALL_1(bpf_send_signal, u32, sig) @@ -195,6 +194,3 @@ index e5ef4ae9edb50..0e553b1706d37 100644 /* Do an early check on signal validity. Otherwise, * the error is lost in deferred irq_work. */ --- -2.20.1 -