Messages in this thread | | | Date | Fri, 21 Dec 2012 13:42:20 +1100 | 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/h8300/include/asm/signal.h between commit 1ec94e75def5 ("UAPI: (Scripted) Disintegrate arch/h8300/include/asm") from Linus' tree and commit 031b6566983a ("unify SS_ONSTACK/SS_DISABLE definitions") from the signal tree.
I just used the former version, but removed the SS_* constants from the uap version of the include files as well and can carry the fix as necessary (no action is required).
-- Cheers, Stephen Rothwell sfr@canb.auug.org.au [unhandled content-type:application/pgp-signature] | |