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

On Fri, Sep 28, 2018 at 01:49:29PM +1000, Stephen Rothwell wrote: > diff --cc arch/arm64/kernel/traps.c > index 21689c6a985f,856b32aa03d8.. > --- 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 >

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

Hi Eric, Today's linux-next merge of the userns tree got a conflict in: arch/arm64/kernel/traps.c between commit: 8a60419d3676 ("arm64: force_signal_inject: WARN if called from kernel context") from the arm64 tree and commit: 6fa998e83ef9 ("signal/arm64: Push siginfo generation into ar