Re: [PATCH v2 17/43] microblaze: Use set_current_blocked() and block_sigmask()

[Michal Simek]

Oleg Nesterov wrote:
> On 08/24, Matt Fleming wrote:
> > On Wed, 2011-08-24 at 10:49 +0200, Michal Simek wrote:
> > > > v2 of this patch depends on "[PATCH 01/43] signal: Add block_sigmask()
> > > > for adding sigmask to current->blocked" so they need to go through the
> > > > same tree but this patch would benefit from some maintainer ACK's.
> > > Please add there my ACK to it too.
>
> Thanks Michal.
>
> > > I will add patches 14-16/43 v2 to microblaze next branch keep them
> > > for a while. I will propose them to Linus tree for v3.2.
> > Actually, I just realised this is where it gets a little complicated. If
> > you take those 3 patches and they're not in Oleg's tree, [PATCH 17/43]
> > doesn't apply cleanly. Fixing 17/43 up so it applies without patches
> > 14-16 would result in something like this in handle_signal(),
> >
> > 	if (!(ka->sa.sa_flags & SA_NODEFER)) {
> > 		block_sigmask(ka, sig);
> > 	}
> > 	return 1;
> >
> > Which Linus would have to fixup to its original form when he merges the
> > two trees. I think all the microblaze patches should go through Oleg's
> > tree,
>
> Agreed, this looks simpler.
>
> Michal, unless you object, I am going to add the microblaze changes
> (with your acks) to ptrace branch, it already has 01/43 which adds
> block_sigmask().
>
> OK?

No problem.

Thanks,
Michal


--
Michal Simek, Ing. (M.Eng)
w: www.monstr.eu p: +42-0-721842854
Maintainer of Linux kernel 2.6 Microblaze Linux - http://www.monstr.eu/fdt/
Microblaze U-BOOT custodian
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/