Re: linux-next: manual merge of the userns tree with the arm64 tree

[Catalin Marinas]

On Fri, Sep 28, 2018 at 01:49:29PM +1000, Stephen Rothwell wrote:
> diff --cc arch/arm64/kernel/traps.c
> index 21689c6a985f,856b32aa03d8..000000000000
> --- a/arch/arm64/kernel/traps.c
> +++ b/arch/arm64/kernel/traps.c
> @@@ -353,12 -366,6 +368,9 @@@ void force_signal_inject(int signal, in
>   	const char *desc;
>   	struct pt_regs *regs = current_pt_regs();
>   
>  +	if (WARN_ON(!user_mode(regs)))
>  +		return;
>  +
> - 	clear_siginfo(&info);
> - 
>   	switch (signal) {
>   	case SIGILL:
>   		desc = "undefined instruction";

It looks fine. Thanks Stephen.

-- 
Catalin