Re: linux-next: manual merge of the signal tree with the arm-currenttree

[Al Viro]

On Thu, Jul 05, 2012 at 08:52:04AM +0100, Russell King wrote:
> On Thu, Jul 05, 2012 at 05:35:26PM +1000, Stephen Rothwell wrote:
> > Hi Al,
> > 
> > Today's linux-next merge of the signal tree got a conflict in
> > arch/arm/kernel/signal.c between commit f73e2ca64281 ("ARM: 7443/1:
> > Revert "new way of handling ERESTART_RESTARTBLOCK"") from the arm-current
> > tree and commits 9c802c169f96 ("arm: deal with handlerless restarts
> > without leaving the kernel") and 76c3f4da3ee4 ("arm: get rid of
> > TIF_SYSCALL_RESTARTSYS") from the signal tree.
> > 
> > I have no idea how to cope with this.  So I have effectively reverted
> > commit f73e2ca64281 ("ARM: 7443/1: Revert "new way of handling
> > ERESTART_RESTARTBLOCK"") for today (though parts of that commit are also
> > implemented by the above signal tree commits).
> 
> Currently, bugs have been found with the signal handling updates which
> happened during the last merge window.
> 
> Will has concerns with Al's proposed fixes for the signal handling.

Could you please resend whatever concerns those had been my way?
The last I've seen from Will had been about the stuff in mainline,
not in -next; I might have missed something quite easily, though -
net.access had been really lousy lately and piles in l-k mbox... ouch.
--
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/