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

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

 



Hi Al,

Today's linux-next merge of the signal tree got a conflict in
arch/arm64/kernel/signal32.c between commits 068f1bb36cf1 ("arm64:
compat: include sa_restorer in old action from rt_sigaction") and
efed4d52e39f ("arm64: compat: ensure access_ok checks are performed on
user structures") from the arm64 tree and various commits from the signal
tree.

The latter removes the code modified by the former, so I did that.

-- 
Cheers,
Stephen Rothwell                    sfr@xxxxxxxxxxxxxxxx

Attachment: pgpaZAtyuIESq.pgp
Description: PGP signature


[Index of Archives]     [Linux Kernel]     [Linux USB Development]     [Yosemite News]     [Linux SCSI]

  Powered by Linux