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

Stephen Rothwell writes: > Hi Eric, > > Today's linux-next merge of the userns tree got a conflict in: > > kernel/signal.c > > between commit: > > 49c39f8464a9 ("y2038: signal: Change rt_sigtimedwait to use > __kernel_timespec") > > from the y2038 tree and commit: > > ae7795bc6187 ("signal

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

Hi Eric, Today's linux-next merge of the userns tree got a conflict in: kernel/signal.c between commit: 49c39f8464a9 ("y2038: signal: Change rt_sigtimedwait to use __kernel_timespec") from the y2038 tree and commit: ae7795bc6187 ("signal: Distinguish between kernel_siginfo and siginfo"