From: Stephen Rothwell <sfr@canb.auug.org.au>
To: Ingo Molnar <mingo@kernel.org>
Cc: "Daniel Díaz" <daniel.diaz@linaro.org>,
"Leo Yan" <leo.yan@linaro.org>,
"Naresh Kamboju" <naresh.kamboju@linaro.org>,
"Linux-Next Mailing List" <linux-next@vger.kernel.org>,
"Arnaldo Carvalho de Melo" <acme@kernel.org>,
"open list" <linux-kernel@vger.kernel.org>,
linux-perf-users@vger.kernel.org,
"Arnaldo Carvalho de Melo" <acme@redhat.com>,
lkft-triage@lists.linaro.org
Subject: linux-next: bad merge resolution in the tip tree (Was: Linux-next: 20191022: perf: bpf_helpers_doc.py: not found)
Date: Fri, 25 Oct 2019 09:14:12 +1100 [thread overview]
Message-ID: <20191025091412.77bea416@canb.auug.org.au> (raw)
In-Reply-To: <CAEUSe79P0z4N=3TnF9ytWfemX8NqY1Mr_zt6PDgMAZQb=4ChpA@mail.gmail.com>
[-- Attachment #1: Type: text/plain, Size: 1368 bytes --]
Hi Ingo,
On Thu, 24 Oct 2019 13:05:54 -0500 Daniel Díaz <daniel.diaz@linaro.org> wrote:
>
> By the way, while looking at this, we found this unresolved conflict
> in the tree:
> -----8<----------8<----------8<-----
> $ git show 2b5d5b1927a8c
> commit 2b5d5b1927a8c17bf3ce5b4f781c6ba11e02cadd
> Merge: c1e45431c592 ae79d5588a04
> Author: Ingo Molnar <mingo@kernel.org>
> Date: Mon Oct 21 07:13:15 2019 +0200
>
> Merge branch 'perf/core'
>
> Conflicts:
> tools/perf/check-headers.sh
>
> diff --cc tools/perf/check-headers.sh
> index 499235a41162,93c46d38024e..1f73e6f7438c
> --- a/tools/perf/check-headers.sh
> +++ b/tools/perf/check-headers.sh
> @@@ -28,7 -28,7 +28,11 @@@ arch/x86/include/asm/disabled-features.
> arch/x86/include/asm/required-features.h
> arch/x86/include/asm/cpufeatures.h
> arch/x86/include/asm/inat_types.h
> ++<<<<<<< HEAD
> +arch/x86/include/asm/emulate_prefix.h
> ++=======
> + arch/x86/include/asm/msr-index.h
> ++>>>>>>> perf/core
> arch/x86/include/uapi/asm/prctl.h
> arch/x86/lib/x86-opcode-map.txt
> arch/x86/tools/gen-insn-attr-x86.awk
> ----->8---------->8---------->8-----
>
> That's still on next-20191024.
>
> Greetings!
>
> Daniel Díaz
> daniel.diaz@linaro.org
--
Cheers,
Stephen Rothwell
[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 488 bytes --]
prev parent reply other threads:[~2019-10-24 22:14 UTC|newest]
Thread overview: 4+ messages / expand[flat|nested] mbox.gz Atom feed top
2019-10-22 15:34 Linux-next: 20191022: perf: bpf_helpers_doc.py: not found Naresh Kamboju
2019-10-23 2:41 ` Leo Yan
2019-10-24 18:05 ` Daniel Díaz
2019-10-24 22:14 ` Stephen Rothwell [this message]
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=20191025091412.77bea416@canb.auug.org.au \
--to=sfr@canb.auug.org.au \
--cc=acme@kernel.org \
--cc=acme@redhat.com \
--cc=daniel.diaz@linaro.org \
--cc=leo.yan@linaro.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-next@vger.kernel.org \
--cc=linux-perf-users@vger.kernel.org \
--cc=lkft-triage@lists.linaro.org \
--cc=mingo@kernel.org \
--cc=naresh.kamboju@linaro.org \
/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).