Re: linux-next: manual merge of the signal tree with the arm64 tree
On Fri, Jan 11, 2013 at 09:36:02AM +, Catalin Marinas wrote:
> Hi Stephen,
>
> On Fri, Jan 11, 2013 at 04:46:17AM +, Stephen Rothwell wrote:
> > Today's linux-next merge of the signal tree got a conflict in
> > arch/arm64/kernel/signal32.c between commits 068f1bb36cf1 ("arm64:
> > compat: include sa_restorer in old action from rt_sigaction") and
> > efed4d52e39f ("arm64: compat: ensure access_ok checks are performed on
> > user structures") from the arm64 tree and various commits from the signal
> > tree.
> >
> > The latter removes the code modified by the former, so I did that.
>
> I think the fix is fine. I'll give Al's patches a test and I can
> probably drop Will's patches.
Yup, although it looks like we need to #define __ARCH_HAS_SA_RESTORER for
compat_sys_rt_sigaction.
Will
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majord...@vger.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/
Re: linux-next: manual merge of the signal tree with the arm64 tree
Hi Stephen,
On Fri, Jan 11, 2013 at 04:46:17AM +, Stephen Rothwell wrote:
> Today's linux-next merge of the signal tree got a conflict in
> arch/arm64/kernel/signal32.c between commits 068f1bb36cf1 ("arm64:
> compat: include sa_restorer in old action from rt_sigaction") and
> efed4d52e39f ("arm64: compat: ensure access_ok checks are performed on
> user structures") from the arm64 tree and various commits from the signal
> tree.
>
> The latter removes the code modified by the former, so I did that.
I think the fix is fine. I'll give Al's patches a test and I can
probably drop Will's patches.
Thanks.
--
Catalin
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majord...@vger.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/
Re: linux-next: manual merge of the signal tree with the arm64 tree
Hi Stephen, On Fri, Jan 11, 2013 at 04:46:17AM +, Stephen Rothwell wrote: Today's linux-next merge of the signal tree got a conflict in arch/arm64/kernel/signal32.c between commits 068f1bb36cf1 (arm64: compat: include sa_restorer in old action from rt_sigaction) and efed4d52e39f (arm64: compat: ensure access_ok checks are performed on user structures) from the arm64 tree and various commits from the signal tree. The latter removes the code modified by the former, so I did that. I think the fix is fine. I'll give Al's patches a test and I can probably drop Will's patches. Thanks. -- Catalin -- To unsubscribe from this list: send the line unsubscribe linux-kernel in the body of a message to majord...@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/
Re: linux-next: manual merge of the signal tree with the arm64 tree
On Fri, Jan 11, 2013 at 09:36:02AM +, Catalin Marinas wrote: Hi Stephen, On Fri, Jan 11, 2013 at 04:46:17AM +, Stephen Rothwell wrote: Today's linux-next merge of the signal tree got a conflict in arch/arm64/kernel/signal32.c between commits 068f1bb36cf1 (arm64: compat: include sa_restorer in old action from rt_sigaction) and efed4d52e39f (arm64: compat: ensure access_ok checks are performed on user structures) from the arm64 tree and various commits from the signal tree. The latter removes the code modified by the former, so I did that. I think the fix is fine. I'll give Al's patches a test and I can probably drop Will's patches. Yup, although it looks like we need to #define __ARCH_HAS_SA_RESTORER for compat_sys_rt_sigaction. Will -- To unsubscribe from this list: send the line unsubscribe linux-kernel in the body of a message to majord...@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/
linux-next: manual merge of the signal tree with the arm64 tree
Hi Al,
Today's linux-next merge of the signal tree got a conflict in
arch/arm64/kernel/signal32.c between commits 068f1bb36cf1 ("arm64:
compat: include sa_restorer in old action from rt_sigaction") and
efed4d52e39f ("arm64: compat: ensure access_ok checks are performed on
user structures") from the arm64 tree and various commits from the signal
tree.
The latter removes the code modified by the former, so I did that.
--
Cheers,
Stephen Rothwells...@canb.auug.org.au
pgpBiO42H4sK_.pgp
Description: PGP signature
linux-next: manual merge of the signal tree with the arm64 tree
Hi Al, Today's linux-next merge of the signal tree got a conflict in arch/arm64/kernel/signal32.c between commits 068f1bb36cf1 (arm64: compat: include sa_restorer in old action from rt_sigaction) and efed4d52e39f (arm64: compat: ensure access_ok checks are performed on user structures) from the arm64 tree and various commits from the signal tree. The latter removes the code modified by the former, so I did that. -- Cheers, Stephen Rothwells...@canb.auug.org.au pgpBiO42H4sK_.pgp Description: PGP signature
