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

Tue, 18 Sep 2012 22:22:35 -0700 

Hi Al,

Today's linux-next merge of the signal tree got a conflict in
arch/sh/kernel/cpu/sh5/entry.S arch/sh/kernel/entry-common.S between
commit 5e071e2b4b82 ("sh: Fix up TIF_NOTIFY_RESUME sans TIF_SIGPENDING
handling") from the sh tree and commit 52b8a6e18bfd ("sh: missing tests
for NOTIFY_RESUME") from the signal tree.

These appear to be the same patches (apart from some trivial bits), so I
used the one from the sh tree and can carry the fix as necessary (no
action is required).

-- 
Cheers,
Stephen Rothwell                    s...@canb.auug.org.au

Attachment: pgpSS7tRZRaGH.pgp
Description: PGP signature

Reply via email to