Messages in this thread | | | Date | Mon, 2 Jul 2012 16:12:00 +1000 | From | Stephen Rothwell <> | Subject | linux-next: manual merge of the signal tree with Linus' tree |
| |
Hi Al,
Today's linux-next merge of the signal tree got a conflict in arch/powerpc/kernel/entry_64.S between commit c58ce2b1e3c7 ("ppc64: fix missing to check all bits of _TIF_USER_WORK_MASK in preempt") from Linus' tree and commit d07644a97726 ("powerpc: missing NOTIFY_RESUME check on 64bit if CONFIG_PREEMPT is set") from the signal tree.
I *think* that the former is a superset of the latter, so I just used the former. -- Cheers, Stephen Rothwell sfr@canb.auug.org.au [unhandled content-type:application/pgp-signature] | |