From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S935453AbdACPCU (ORCPT ); Tue, 3 Jan 2017 10:02:20 -0500 Received: from mail-qk0-f178.google.com ([209.85.220.178]:36104 "EHLO mail-qk0-f178.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S935399AbdACPBt (ORCPT ); Tue, 3 Jan 2017 10:01:49 -0500 Subject: Re: [PATCH] tools lib traceevent: Fix prev/next_prio for deadline tasks To: Arnaldo Carvalho de Melo References: <866ef75bcebf670ae91c6a96daa63597ba981f0d.1483443552.git.bristot@redhat.com> <20170103144623.GG27864@kernel.org> Cc: Steven Rostedt , linux-kernel@vger.kernel.org, Ingo Molnar , Peter Zijlstra , Alexander Shishkin , Jiri Olsa From: Daniel Bristot de Oliveira Message-ID: Date: Tue, 3 Jan 2017 16:01:44 +0100 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:45.0) Gecko/20100101 Thunderbird/45.5.1 MIME-Version: 1.0 In-Reply-To: <20170103144623.GG27864@kernel.org> Content-Type: text/plain; charset=windows-1252 Content-Transfer-Encoding: 7bit Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org 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? -- Daniel