Hi all,
Today's linux-next merge of the parisc tree got conflicts in
arch/parisc/include/asm/thread_info.h and arch/parisc/kernel/entry.S
between commit d0420c83f39f79afb82010c2d2cafd150eef651b ("KEYS: Extend
TIF_NOTIFY_RESUME to (almost) all architectures [try #6]") from Linus'
tree and commit 9f4259771faf1ffd99888796d925adae4c93630b ("parisc: add
TIF_NOTIFY_RESUME and use tracehook_notify_resume") from the parisc tree.
It looks like the parisc tree version is a superset of the version in
Linus' tree (for parisc). I fixed it up (hopefully - using the parisc
tree versions) and can carry the fix for a while.
--
Cheers,
Stephen Rothwell sfr@xxxxxxxxxxxxxxxx
http://www.canb.auug.org.au/~sfr/
Attachment:
pgpA3IOH9lLdH.pgp
Description: PGP signature
