From: Stephen Rothwell <sfr@canb•auug.org.au>
To: Kyle McMartin <kyle@mcmartin•ca>
Cc: linux-next@vger•kernel.org, linux-kernel@vger•kernel.org,
David Howells <dhowells@redhat•com>,
James Morris <jmorris@namei•org>,
linux-parisc@vger•kernel.org
Subject: Re: linux-next: manual merge of the security-testing tree with the parisc tree
Date: Mon, 14 Sep 2009 15:35:32 +1000 [thread overview]
Message-ID: <20090914153532.2c06eeae.sfr@canb.auug.org.au> (raw)
In-Reply-To: <20090903154636.e70c50da.sfr@canb.auug.org.au>
[-- Attachment #1: Type: text/plain, Size: 1081 bytes --]
Hi Kyle,
On Thu, 3 Sep 2009 15:46:36 +1000 Stephen Rothwell <sfr@canb•auug.org.au> wrote:
>
> Today's linux-next merge of the security-testing tree got conflicts in
> arch/parisc/include/asm/thread_info.h, arch/parisc/kernel/entry.S and
> arch/parisc/kernel/signal.c between commit 9f4259771faf1ffd99888796d925adae4c93630b ("parisc: add TIF_NOTIFY_RESUME and use tracehook_notify_resume") from the parisc tree and
> commits d0420c83f39f79afb82010c2d2cafd150eef651b ("KEYS: Extend
> TIF_NOTIFY_RESUME to (almost) all architectures [try #6]") and
> ee18d64c1f632043a02e6f5ba5e045bb26a5465f ("KEYS: Add a keyctl to install
> a process's session keyring on its parent [try #6]") from the
> security-testing tree.
>
> Overlapping changes. I fixed it up (using the parisc versions and adding
> the extra change from the latter security-testing patch) and can carry
> the fixes as necessary.
This conflict is now between the parisc tree and Linus' tree ...
--
Cheers,
Stephen Rothwell sfr@canb•auug.org.au
http://www.canb.auug.org.au/~sfr/
[-- Attachment #2: Type: application/pgp-signature, Size: 198 bytes --]
next prev parent reply other threads:[~2009-09-14 5:35 UTC|newest]
Thread overview: 3+ messages / expand[flat|nested] mbox.gz Atom feed top
2009-09-03 5:46 linux-next: manual merge of the security-testing tree with the parisc tree Stephen Rothwell
2009-09-14 5:35 ` Stephen Rothwell [this message]
2009-09-14 13:49 ` Kyle McMartin
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=20090914153532.2c06eeae.sfr@canb.auug.org.au \
--to=sfr@canb$(echo .)auug.org.au \
--cc=dhowells@redhat$(echo .)com \
--cc=jmorris@namei$(echo .)org \
--cc=kyle@mcmartin$(echo .)ca \
--cc=linux-kernel@vger$(echo .)kernel.org \
--cc=linux-next@vger$(echo .)kernel.org \
--cc=linux-parisc@vger$(echo .)kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
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