From: Will Deacon <will.deacon@arm.com>
To: Thierry Reding <thierry.reding@gmail.com>
Cc: Jean Pihet <jean.pihet@linaro.org>,
Ingo Molnar <mingo@kernel.org>,
Thomas Gleixner <tglx@linutronix.de>,
"H. Peter Anvin" <hpa@zytor.com>,
Peter Zijlstra <peterz@infradead.org>,
"linux-next@vger.kernel.org" <linux-next@vger.kernel.org>,
"linux-kernel@vger.kernel.org" <linux-kernel@vger.kernel.org>
Subject: Re: linux-next: manual merge of the tip tree
Date: Fri, 25 Oct 2013 14:25:54 +0100 [thread overview]
Message-ID: <20131025132553.GE9999@mudshark.cambridge.arm.com> (raw)
In-Reply-To: <1382706224-8859-4-git-send-email-treding@nvidia.com>
On Fri, Oct 25, 2013 at 02:03:42PM +0100, Thierry Reding wrote:
> Today's linux-next merge of the tip tree got conflicts in
>
> tools/perf/config/Makefile
> tools/perf/config/feature-tests.mak
>
> caused by commits 405ffbd (perf tools: Check libunwind for availability of
> dwarf parsing feature) and mostly 308e1e7 (tools/perf/build: Clean up the
> libunwind logic in config/Makefile) as well as various follow-up patches.
>
> I fixed it up (see below). Please verify that the resolution looks good.
> Also note that this isn't really a trivial resolution of a conflict, but
> required modifying various other files. That causes rerere magic not to
> work and needs part of conflict to be resolved manually. Perhaps a good
> idea would be to rebase Jean's patch on top of the cleanups going on in
> the tip tree? Perhaps even carry the patch in the tip tree?
These came via my tree (arm perf) after discussion here:
http://lists.infradead.org/pipermail/linux-arm-kernel/2013-October/203077.html
Now that they've been pulled by rmk, we can't back them out with ugly
reverts, so I'm not sure what we can do to resolve in the ARM tree; it looks
like the perf Makefile has changed significantly in -tip.
Will
next prev parent reply other threads:[~2013-10-25 13:26 UTC|newest]
Thread overview: 53+ messages / expand[flat|nested] mbox.gz Atom feed top
2013-10-24 16:31 linux-next: Tree for Oct 24 Thierry Reding
2013-10-24 20:02 ` linux-next: Tree for Oct 24 (xilinx_uartps) Randy Dunlap
2013-10-25 5:02 ` linux-next: Tree for Oct 24 Guenter Roeck
2013-10-25 8:35 ` Thierry Reding
2013-10-25 13:16 ` Olof Johansson
2013-10-25 13:24 ` Mark Brown
2013-10-25 13:33 ` Olof Johansson
2013-10-25 15:45 ` Mark Brown
2013-10-25 13:35 ` Thierry Reding
2013-10-25 13:43 ` Olof Johansson
2013-10-25 14:17 ` Thierry Reding
2013-10-25 15:02 ` Guenter Roeck
2013-10-25 15:17 ` Thierry Reding
2013-10-25 17:17 ` Guenter Roeck
2013-10-25 18:04 ` Geert Uytterhoeven
2013-10-25 13:03 ` linux-next: manual merge of the c6x tree Thierry Reding
2013-10-25 13:03 ` linux-next: manual merge of the h8300-remove tree Thierry Reding
2013-10-25 13:35 ` Mark Salter
2013-10-25 15:09 ` Guenter Roeck
2013-10-25 13:03 ` linux-next: manual merge of the mfd-lj tree Thierry Reding
2013-10-25 13:03 ` linux-next: manual merge of the tip tree Thierry Reding
2013-10-25 13:25 ` Will Deacon [this message]
2013-10-26 8:40 ` Ingo Molnar
2013-10-26 14:01 ` Will Deacon
2013-10-27 7:12 ` Ingo Molnar
2013-10-27 10:00 ` Russell King - ARM Linux
2013-10-28 7:47 ` Thierry Reding
2013-10-28 8:45 ` Russell King - ARM Linux
2013-10-25 13:03 ` linux-next: manual merge of the kvm-arm tree Thierry Reding
2013-10-25 13:07 ` Marc Zyngier
2013-10-25 13:03 ` linux-next: manual merge of the imx-mxs tree Thierry Reding
2013-10-25 13:22 ` linux-next: manual merge of the c6x tree Mark Salter
2013-10-25 13:36 ` Thierry Reding
2013-10-26 13:19 ` Russell King - ARM Linux
2013-10-28 7:34 ` Thierry Reding
-- strict thread matches above, loose matches on Subject: below --
2013-10-17 21:23 linux-next: manual merge of the tip tree Mark Brown
2013-10-17 21:50 ` Cyrill Gorcunov
2013-10-16 18:51 linux-next: Tree for Oct 16 Thierry Reding
2013-10-16 18:51 ` linux-next: manual merge of the tip tree Thierry Reding
2013-10-16 20:06 ` Peter Zijlstra
2013-10-16 20:14 ` Peter Zijlstra
2013-10-16 20:31 ` NeilBrown
2013-10-16 20:35 ` Peter Zijlstra
2013-10-16 20:51 ` Thierry Reding
2013-10-16 21:00 ` Peter Zijlstra
2013-10-16 20:52 ` Peter Zijlstra
2013-10-17 1:28 ` NeilBrown
2013-10-17 9:23 ` Peter Zijlstra
2013-10-22 2:09 ` NeilBrown
2013-10-16 20:40 ` Thierry Reding
2013-10-16 20:44 ` Thierry Reding
2013-10-16 21:30 ` Peter Zijlstra
2013-10-17 1:29 ` NeilBrown
2013-09-30 11:26 linux-next: manual merge of the bcon tree Thierry Reding
2013-09-30 11:26 ` linux-next: manual merge of the tip tree Thierry Reding
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20131025132553.GE9999@mudshark.cambridge.arm.com \
--to=will.deacon@arm.com \
--cc=hpa@zytor.com \
--cc=jean.pihet@linaro.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-next@vger.kernel.org \
--cc=mingo@kernel.org \
--cc=peterz@infradead.org \
--cc=tglx@linutronix.de \
--cc=thierry.reding@gmail.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).