public inbox for linux-next@vger.kernel.org 
 help / color / mirror / Atom feed

From: Catalin Marinas <catalin.marinas@arm•com>
To: Stephen Rothwell <sfr@canb•auug.org.au>
Cc: Al Viro <viro@ZenIV•linux.org.uk>,
	"linux-next@vger•kernel.org" <linux-next@vger•kernel.org>,
	"linux-kernel@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 arm64 tree
Date: Fri, 11 Jan 2013 09:36:02 +0000	[thread overview]
Message-ID: <20130111093602.GB13405@arm.com> (raw)
In-Reply-To: <20130111154617.cab6a8d1ff13a4f200969b9d@canb.auug.org.au>

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

next prev parent reply	other threads:[~2013-01-11  9:36 UTC|newest]

Thread overview: 3+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
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 [this message]
2013-01-11 10:03   ` Will Deacon

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=20130111093602.GB13405@arm.com \
    --to=catalin.marinas@arm$(echo .)com \
    --cc=Will.Deacon@arm$(echo .)com \
    --cc=linux-kernel@vger$(echo .)kernel.org \
    --cc=linux-next@vger$(echo .)kernel.org \
    --cc=sfr@canb$(echo .)auug.org.au \
    --cc=viro@ZenIV$(echo .)linux.org.uk \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox