From: Al Viro <viro@ZenIV.linux.org.uk>
To: Russell King <rmk@arm.linux.org.uk>
Cc: Stephen Rothwell <sfr@canb.auug.org.au>,
linux-next@vger.kernel.org, linux-kernel@vger.kernel.org,
Will Deacon <will.deacon@arm.com>
Subject: Re: linux-next: manual merge of the signal tree with the arm-current tree
Date: Sun, 15 Jul 2012 12:27:35 +0100 [thread overview]
Message-ID: <20120715112735.GI31729@ZenIV.linux.org.uk> (raw)
In-Reply-To: <20120705075204.GA12344@flint.arm.linux.org.uk>
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.
next prev parent reply other threads:[~2012-07-15 11:27 UTC|newest]
Thread overview: 7+ messages / expand[flat|nested] mbox.gz Atom feed top
2012-07-05 7:35 linux-next: manual merge of the signal tree with the arm-current tree Stephen Rothwell
2012-07-05 7:52 ` Russell King
2012-07-06 1:29 ` Stephen Rothwell
2012-07-15 11:27 ` Al Viro [this message]
2012-07-15 11:47 ` Geert Uytterhoeven
2012-07-15 12:04 ` Al Viro
2012-08-04 19:19 ` Geert Uytterhoeven
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20120715112735.GI31729@ZenIV.linux.org.uk \
--to=viro@zeniv.linux.org.uk \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-next@vger.kernel.org \
--cc=rmk@arm.linux.org.uk \
--cc=sfr@canb.auug.org.au \
--cc=will.deacon@arm.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).