Hi James,
Today's linux-next merge of the security-testing tree got conflicts in
arch/parisc/include/asm/thread_info.h, arch/parisc/kernel/entry.S and
arch/parisc/kernel/signal.c between commit 9f4259771faf1ffd99888796d925adae4c93630b ("parisc: add TIF_NOTIFY_RESUME and use tracehook_notify_resume") from the parisc tree and
commits d0420c83f39f79afb82010c2d2cafd150eef651b ("KEYS: Extend
TIF_NOTIFY_RESUME to (almost) all architectures [try #6]") and
ee18d64c1f632043a02e6f5ba5e045bb26a5465f ("KEYS: Add a keyctl to install
a process's session keyring on its parent [try #6]") from the
security-testing tree.
Overlapping changes. I fixed it up (using the parisc versions and adding
the extra change from the latter security-testing patch) and can carry
the fixes as necessary.
--
Cheers,
Stephen Rothwell sfr@xxxxxxxxxxxxxxxx
http://www.canb.auug.org.au/~sfr/
Attachment:
pgpqlpshrZsqK.pgp
Description: PGP signature
