[<prev] [next>] [<thread-prev] [thread-next>] [day] [month] [year] [list]
Message-ID: <b6f2adf4-5dab-f5e6-f6a9-db3366d40ef5@redhat.com>
Date: Tue, 3 Jan 2017 16:01:44 +0100
From: Daniel Bristot de Oliveira <bristot@...hat.com>
To: Arnaldo Carvalho de Melo <acme@...nel.org>
Cc: Steven Rostedt <rostedt@...dmis.org>, linux-kernel@...r.kernel.org,
Ingo Molnar <mingo@...hat.com>,
Peter Zijlstra <peterz@...radead.org>,
Alexander Shishkin <alexander.shishkin@...ux.intel.com>,
Jiri Olsa <jolsa@...hat.com>
Subject: Re: [PATCH] tools lib traceevent: Fix prev/next_prio for deadline
tasks
On 01/03/2017 03:46 PM, Arnaldo Carvalho de Melo wrote:
> you missed the delimiter here:
>
> ---
>
> Without it, I get:
>
> [acme@...et 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@...et 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?
-- Daniel
Powered by blists - more mailing lists