linux-kernel - Re: linux-next: manual merge of the arm64 tree with Linus' tree

lists.openwall.net		lists / announce owl-users owl-dev john-users john-dev passwdqc-users yescrypt popa3d-users / oss-security kernel-hardening musl sabotage tlsify passwords / crypt-dev xvendor / Bugtraq Full-Disclosure linux-kernel linux-netdev linux-ext4 linux-hardening linux-cve-announce PHC
Open Source and information security mailing list archives

Hash Suite: Windows password security audit tool. GUI, reports in PDF.

[<prev] [next>] [<thread-prev] [day] [month] [year] [list]

Date:   Fri, 5 Nov 2021 09:34:37 +0000
From:   Will Deacon <will@...nel.org>
To:     Stephen Rothwell <sfr@...b.auug.org.au>
Cc:     Catalin Marinas <catalin.marinas@....com>,
        Linux Kernel Mailing List <linux-kernel@...r.kernel.org>,
        Linux Next Mailing List <linux-next@...r.kernel.org>,
        Mark Rutland <mark.rutland@....com>,
        Masami Hiramatsu <mhiramat@...nel.org>,
        "Steven Rostedt (VMware)" <rostedt@...dmis.org>
Subject: Re: linux-next: manual merge of the arm64 tree with Linus' tree

On Thu, Nov 04, 2021 at 09:32:08AM +1100, Stephen Rothwell wrote:
> Hi all,
> 
> Today's linux-next merge of the arm64 tree got conflicts in:
> 
>   arch/arm64/include/asm/stacktrace.h
>   arch/arm64/kernel/stacktrace.c
> 
> between commit:
> 
>   cd9bc2c92588 ("arm64: Recover kretprobe modified return address in stacktrace")
> 
> from Linus' tree and commit:
> 
>   552e196d88e5 ("arm64: ftrace: use HAVE_FUNCTION_GRAPH_RET_ADDR_PTR")
> 
> from the arm64 tree.

D'oh, having realised this conflict last week, I completely forgot about
it when queuing that fix from Mark. I'll just drop it and wait until -rc1.

Cheers,

Will