* linux-next: manual merge of the security-testing tree with the parisc tree
@ 2009-09-03 5:46 Stephen Rothwell
2009-09-14 5:35 ` Stephen Rothwell
0 siblings, 1 reply; 3+ messages in thread
From: Stephen Rothwell @ 2009-09-03 5:46 UTC (permalink / raw)
To: James Morris
Cc: linux-next, linux-kernel, David Howells, Kyle McMartin,
linux-parisc
[-- Attachment #1: Type: text/plain, Size: 903 bytes --]
Hi James,
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.
--
Cheers,
Stephen Rothwell sfr@canb.auug.org.au
http://www.canb.auug.org.au/~sfr/
[-- Attachment #2: Type: application/pgp-signature, Size: 197 bytes --]
^ permalink raw reply [flat|nested] 3+ messages in thread* Re: linux-next: manual merge of the security-testing tree with the parisc tree
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
2009-09-14 13:49 ` Kyle McMartin
0 siblings, 1 reply; 3+ messages in thread
From: Stephen Rothwell @ 2009-09-14 5:35 UTC (permalink / raw)
To: Kyle McMartin
Cc: linux-next, linux-kernel, David Howells, James Morris,
linux-parisc
[-- 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 --]
^ permalink raw reply [flat|nested] 3+ messages in thread* Re: linux-next: manual merge of the security-testing tree with the parisc tree
2009-09-14 5:35 ` Stephen Rothwell
@ 2009-09-14 13:49 ` Kyle McMartin
0 siblings, 0 replies; 3+ messages in thread
From: Kyle McMartin @ 2009-09-14 13:49 UTC (permalink / raw)
To: Stephen Rothwell
Cc: Kyle McMartin, linux-next, linux-kernel, David Howells,
James Morris, linux-parisc
On Mon, Sep 14, 2009 at 03:35:32PM +1000, Stephen Rothwell wrote:
> Hi Kyle,
> > 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 ...
>
You don't say.
^ permalink raw reply [flat|nested] 3+ messages in thread
end of thread, other threads:[~2009-09-14 13:49 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
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
2009-09-14 13:49 ` Kyle McMartin
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox