linux-next: bad merge resolution in the tip tree (Was: Linux-next: 20191022: perf: bpf_helpers_doc.py: not found)

[Stephen Rothwell]

Hi Ingo,

On Thu, 24 Oct 2019 13:05:54 -0500 Daniel DÃaz <daniel.diaz@xxxxxxxxxx> 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@xxxxxxxxxx>
>   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@xxxxxxxxxx

-- 
Cheers,
Stephen Rothwell

Attachment: pgpWFSSTlG9ZM.pgp
Description: OpenPGP digital signature