* linux-next: manual merge of the signal tree with the arm64 tree
@ 2013-01-11 4:46 Stephen Rothwell
2013-01-11 9:36 ` Catalin Marinas
0 siblings, 1 reply; 3+ messages in thread
From: Stephen Rothwell @ 2013-01-11 4:46 UTC (permalink / raw)
To: Al Viro; +Cc: linux-next, linux-kernel, Will Deacon, Catalin Marinas
[-- Attachment #1: Type: text/plain, Size: 506 bytes --]
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 Rothwell sfr@canb•auug.org.au
[-- Attachment #2: Type: application/pgp-signature, Size: 836 bytes --]
^ permalink raw reply [flat|nested] 3+ messages in thread* Re: linux-next: manual merge of the signal tree with the arm64 tree
2013-01-11 4:46 linux-next: manual merge of the signal tree with the arm64 tree Stephen Rothwell
@ 2013-01-11 9:36 ` Catalin Marinas
2013-01-11 10:03 ` Will Deacon
0 siblings, 1 reply; 3+ messages in thread
From: Catalin Marinas @ 2013-01-11 9:36 UTC (permalink / raw)
To: Stephen Rothwell
Cc: Al Viro, linux-next@vger•kernel.org, linux-kernel@vger•kernel.org,
Will Deacon
Hi Stephen,
On Fri, Jan 11, 2013 at 04:46:17AM +0000, 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
^ permalink raw reply [flat|nested] 3+ messages in thread* Re: linux-next: manual merge of the signal tree with the arm64 tree
2013-01-11 9:36 ` Catalin Marinas
@ 2013-01-11 10:03 ` Will Deacon
0 siblings, 0 replies; 3+ messages in thread
From: Will Deacon @ 2013-01-11 10:03 UTC (permalink / raw)
To: Catalin Marinas
Cc: Stephen Rothwell, Al Viro, linux-next@vger•kernel.org,
linux-kernel@vger•kernel.org
On Fri, Jan 11, 2013 at 09:36:02AM +0000, Catalin Marinas wrote:
> Hi Stephen,
>
> On Fri, Jan 11, 2013 at 04:46:17AM +0000, 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
^ permalink raw reply [flat|nested] 3+ messages in thread
end of thread, other threads:[~2013-01-11 10:04 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2013-01-11 4:46 linux-next: manual merge of the signal tree with the arm64 tree Stephen Rothwell
2013-01-11 9:36 ` Catalin Marinas
2013-01-11 10:03 ` Will Deacon
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox