2009-09-03 05:46:47

by Stephen Rothwell

[permalink] [raw]
Subject: linux-next: manual merge of the security-testing tree with the parisc tree

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 [email protected]
http://www.canb.auug.org.au/~sfr/

Attachments:
(No filename) (885.00 B)
 (No filename) (197.00 B)
 Download all attachments

2009-09-14 05:35:40

by Stephen Rothwell

[permalink] [raw]
Subject: Re: linux-next: manual merge of the security-testing tree with the parisc tree

Hi Kyle,

On Thu, 3 Sep 2009 15:46:36 +1000 Stephen Rothwell <[email protected]> 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 [email protected]
http://www.canb.auug.org.au/~sfr/

Attachments:
(No filename) (1.03 kB)
 (No filename) (198.00 B)
 Download all attachments

2009-09-14 13:49:27

by Kyle McMartin

[permalink] [raw]
Subject: Re: linux-next: manual merge of the security-testing tree with the parisc tree

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.