Em Fri, May 29, 2015 at 02:47:39PM +0200, Martin Liška escreveu: > On 05/29/2015 02:43 PM, Arnaldo Carvalho de Melo wrote: > >Em Fri, May 29, 2015 at 09:42:41AM -0300, Arnaldo Carvalho de Melo escreveu: > >>Em Fri, May 29, 2015 at 02:06:44PM +0200, Martin Liška escreveu: > >>>Assign input_name, received from program arguments, to > >>>file data structure. > >> > >>Doesn't apply: > >> > >>pat[acme@zoo linux]$ patch -p1 < /wb/1.patch > >>patching file tools/perf/builtin-annotate.c > >>Hunk #1 FAILED at 289. > >>Hunk #2 FAILED at 346. > >>2 out of 2 hunks FAILED -- saving rejects to file > >>tools/perf/builtin-annotate.c.rej > >>[acme@zoo linux]$ > >> > >>What branch is this intended for? I.e. where have you cloned this from? > >> > >>Yeah, I reproduced the problem and will try to figure this out, but > >>please always be explicit where to apply this. > > > >I tried first on perf/core, then on perf/urgent, and it didn't apply in > >both cases :-( > > > >- Arnaldo > > > > Hello. > > I've just pulled perf, patch is a diff against perf/perf/core. > > $ git log --oneline | head -n2 > 95b12b3 perf annotate: fix -i option, which is currently ignored. > f1942b9 Merge tag 'perf-core-for-mingo' of > git://git.kernel.org/pub/scm/linux/kernel/git/acme/linux into perf/core
Rechecking... -- To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majord...@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/