From: Michael Neuling <mikey@neuling.org>
To: Benjamin Herrenschmidt <benh@kernel.crashing.org>
Cc: Stephen Rothwell <sfr@canb.auug.org.au>,
Al Viro <viro@ZenIV.linux.org.uk>,
linux-next@vger.kernel.org, linux-kernel@vger.kernel.org,
Paul Mackerras <paulus@samba.org>,
linuxppc-dev@lists.ozlabs.org
Subject: Re: linux-next: manual merge of the signal tree with the powerpc tree
Date: Thu, 21 Feb 2013 14:43:49 -0600 [thread overview]
Message-ID: <27231.1361479429@ale.ozlabs.ibm.com> (raw)
In-Reply-To: <1361425813.4676.47.camel@pasglop>
Benjamin Herrenschmidt <benh@kernel.crashing.org> wrote:
> On Thu, 2013-02-21 at 15:52 +1100, Stephen Rothwell wrote:
> > Hi Al,
> >
> > Today's linux-next merge of the signal tree got conflicts in
> > arch/powerpc/kernel/signal_32.c and arch/powerpc/kernel/signal_64.c
> > between commit 2b0a576d15e0 ("powerpc: Add new transactional memory state
> > to the signal context") from the powerpc tree and commit 7cce246557bf
> > ("powerpc: switch to generic sigaltstack") from the signal tree.
> >
> > I fixed it up (I think - see below) and can carry the fix as necessary
> > (no action is required).
>
> Mikey, can you check everything's all right ?
>
> I'm happy to wait for Al stuff to go in first & fixup the conflict
> before I send the pull request to Linus. I'm off travelling around but I
> should be able to get stuff out this week-end.
The merge looks fine to me. My TM signal tests still pass on
next-20130221.
Thanks sfr!
Mikey
WARNING: multiple messages have this Message-ID (diff)
From: Michael Neuling <mikey@neuling.org>
To: Benjamin Herrenschmidt <benh@kernel.crashing.org>
Cc: Stephen Rothwell <sfr@canb.auug.org.au>,
linux-kernel@vger.kernel.org, linux-next@vger.kernel.org,
Paul Mackerras <paulus@samba.org>,
Al Viro <viro@ZenIV.linux.org.uk>,
linuxppc-dev@lists.ozlabs.org
Subject: Re: linux-next: manual merge of the signal tree with the powerpc tree
Date: Thu, 21 Feb 2013 14:43:49 -0600 [thread overview]
Message-ID: <27231.1361479429@ale.ozlabs.ibm.com> (raw)
In-Reply-To: <1361425813.4676.47.camel@pasglop>
Benjamin Herrenschmidt <benh@kernel.crashing.org> wrote:
> On Thu, 2013-02-21 at 15:52 +1100, Stephen Rothwell wrote:
> > Hi Al,
> >
> > Today's linux-next merge of the signal tree got conflicts in
> > arch/powerpc/kernel/signal_32.c and arch/powerpc/kernel/signal_64.c
> > between commit 2b0a576d15e0 ("powerpc: Add new transactional memory state
> > to the signal context") from the powerpc tree and commit 7cce246557bf
> > ("powerpc: switch to generic sigaltstack") from the signal tree.
> >
> > I fixed it up (I think - see below) and can carry the fix as necessary
> > (no action is required).
>
> Mikey, can you check everything's all right ?
>
> I'm happy to wait for Al stuff to go in first & fixup the conflict
> before I send the pull request to Linus. I'm off travelling around but I
> should be able to get stuff out this week-end.
The merge looks fine to me. My TM signal tests still pass on
next-20130221.
Thanks sfr!
Mikey
next prev parent reply other threads:[~2013-02-21 20:43 UTC|newest]
Thread overview: 9+ messages / expand[flat|nested] mbox.gz Atom feed top
2013-02-21 4:52 linux-next: manual merge of the signal tree with the powerpc tree Stephen Rothwell
2013-02-21 4:52 ` Stephen Rothwell
2013-02-21 4:52 ` Stephen Rothwell
2013-02-21 5:50 ` Benjamin Herrenschmidt
2013-02-21 5:50 ` Benjamin Herrenschmidt
2013-02-21 20:43 ` Michael Neuling [this message]
2013-02-21 20:43 ` Michael Neuling
2013-02-21 21:30 ` Stephen Rothwell
2013-02-21 21:30 ` Stephen Rothwell
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=27231.1361479429@ale.ozlabs.ibm.com \
--to=mikey@neuling.org \
--cc=benh@kernel.crashing.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-next@vger.kernel.org \
--cc=linuxppc-dev@lists.ozlabs.org \
--cc=paulus@samba.org \
--cc=sfr@canb.auug.org.au \
--cc=viro@ZenIV.linux.org.uk \
/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 an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.