Groups | Search | Server Info | Keyboard shortcuts | Login | Register [http] [https] [nntp] [nntps]

Groups > linux.kernel > #1549878

Re: [PATCH] tools lib traceevent: Fix prev/next_prio for deadline tasks

Show all headers | View raw

Em Tue, Jan 03, 2017 at 04:01:44PM +0100, Daniel Bristot de Oliveira escreveu:
> On 01/03/2017 03:46 PM, Arnaldo Carvalho de Melo wrote:
> > you missed the delimiter here:
> > 
> > ---
> > 
> > Without it, I get:
> > 
> > [acme@jouet linux]$ am /wb/1.patch 
> > Applying: tools lib traceevent: Fix prev/next_prio for deadline tasks
> > fatal: patch with only garbage at line 3
> > Patch failed at 0001 tools lib traceevent: Fix prev/next_prio for deadline tasks
> > The copy of the patch that failed is found in: .git/rebase-apply/patch
> > When you have resolved this problem, run "git am --continue".
> > If you prefer to skip this patch, run "git am --skip" instead.
> > To restore the original branch and stop patching, run "git am --abort".
> > [acme@jouet linux]$ git am --abort
> > 
> > I added it manually and applied, please consider using 'git format-patch' next time :-)
> 
> Odd, I applied this patch using git am before send it to be
> sure git would not remove lines starting with "   #". It worked fine.
> 
> I did everything using git.. git commit, format-patch, tested with git
> am on another branch, then send it using git send-email... it worked fine.
> 
> Am I missing something?

So maybe this is just my git-am frontend script, that expects a '---',
but then, here, if I use:

[acme@jouet linux]$ git format-patch -n --cover-letter tip/perf/urgent..

I get:

[acme@jouet linux]$ vim 0001-perf-sched-timehist-Show-total-scheduling-time.patch 
<SNIP>
Suggested-by: David Ahern <dsahern@gmail.com>
Signed-off-by: Namhyung Kim <namhyung@kernel.org>
Cc: Jiri Olsa <jolsa@kernel.org>
Cc: Peter Zijlstra <a.p.zijlstra@chello.nl>
Link: http://lkml.kernel.org/r/20161222060350.17655-3-namhyung@kernel.org
Signed-off-by: Arnaldo Carvalho de Melo <acme@redhat.com>
---
 tools/perf/builtin-sched.c | 17 ++++++++++++++---
 1 file changed, 14 insertions(+), 3 deletions(-)

diff --git a/tools/perf/builtin-sched.c b/tools/perf/builtin-sched.c
index d53e706a6f17..5b134b0d1ff3 100644
--- a/tools/perf/builtin-sched.c
+++ b/tools/perf/builtin-sched.c
@@ -209,6 +209,7 @@ struct perf_sched {
        u64             skipped_samples;

Back to linux.kernel | Previous | Next — Previous in thread | Next in thread | Find similar | Unroll thread

Thread

[PATCH] tools lib traceevent: Fix prev/next_prio for deadline tasks Daniel Bristot de Oliveira <bristot@redhat.com> - 2017-01-03 12:50 +0100
  Re: [PATCH] tools lib traceevent: Fix prev/next_prio for deadline  tasks Arnaldo Carvalho de Melo <acme@kernel.org> - 2017-01-03 15:50 +0100
    Re: [PATCH] tools lib traceevent: Fix prev/next_prio for deadline  tasks Daniel Bristot de Oliveira <bristot@redhat.com> - 2017-01-03 16:10 +0100
      Re: [PATCH] tools lib traceevent: Fix prev/next_prio for deadline  tasks Arnaldo Carvalho de Melo <acme@kernel.org> - 2017-01-03 16:20 +0100
        Re: [PATCH] tools lib traceevent: Fix prev/next_prio for deadline  tasks Daniel Bristot de Oliveira <bristot@redhat.com> - 2017-01-03 17:10 +0100
  Re: [PATCH] tools lib traceevent: Fix prev/next_prio for deadline  tasks Steven Rostedt <rostedt@goodmis.org> - 2017-01-03 16:10 +0100
  [tip:perf/urgent] tools lib traceevent: Fix prev/next_prio for  deadline tasks tip-bot for Daniel Bristot de Oliveira <tipbot@zytor.com> - 2017-01-05 09:00 +0100

csiph-web