Stephen Rothwell <sfr@xxxxxxxxxxxxxxxx> 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: Distinguish between kernel_siginfo and siginfo")
>
> from the userns tree.
>
> I fixed it up (see below) and can carry the fix as necessary. This
> is now fixed as far as linux-next is concerned, but any non trivial
> conflicts should be mentioned to your upstream maintainer when your tree
> is submitted for merging. You may also want to consider cooperating
> with the maintainer of the conflicting tree to minimise any particularly
> complex conflicts.
Thank you.
This is good to know about.
Eric
