2010-07-23 02:26:53

by Stephen Rothwell

[permalink] [raw]
Subject: linux-next: manual merge of the kgdb tree with Linus' tree

Hi Jason,

Today's linux-next merge of the kgdb tree got a conflict in
kernel/debug/kdb/kdb_main.c between commit
edd63cb6b91024332d6983fc51058ac1ef0c081e ("sysrq,kdb: Use __handle_sysrq
() for kdb's sysrq function") from Linus' tree and commit
93c47fada46e034941106fb34b76a00a87108fc5 ("kdb: Restore previous sysrq
state") from the kgdb tree.

These are two fixes for the same problem. I effectively reverted the one
from the kgdb tree.
--
Cheers,
Stephen Rothwell [email protected]
http://www.canb.auug.org.au/~sfr/

Attachments:
(No filename) (542.00 B)
 (No filename) (490.00 B)
 Download all attachments

2010-07-23 03:38:37

by Jason Wessel

[permalink] [raw]
Subject: Re: linux-next: manual merge of the kgdb tree with Linus' tree

On 07/22/2010 09:26 PM, Stephen Rothwell wrote:
> Hi Jason,
>
> Today's linux-next merge of the kgdb tree got a conflict in
> kernel/debug/kdb/kdb_main.c between commit
> edd63cb6b91024332d6983fc51058ac1ef0c081e ("sysrq,kdb: Use __handle_sysrq
> () for kdb's sysrq function") from Linus' tree and commit
> 93c47fada46e034941106fb34b76a00a87108fc5 ("kdb: Restore previous sysrq
> state") from the kgdb tree.
>
> These are two fixes for the same problem. I effectively reverted the one
> from the kgdb tree.
>

This already fixed. The problem was caused by the for_linus pull branch
being out of sync with kgdb-next.

Thanks,
Jason.

2010-07-23 07:08:53

by Stephen Rothwell

[permalink] [raw]
Subject: Re: linux-next: manual merge of the kgdb tree with Linus' tree

Hi Jason,

On Thu, 22 Jul 2010 22:38:24 -0500 Jason Wessel <[email protected]> wrote:
>
> This already fixed. The problem was caused by the for_linus pull branch
> being out of sync with kgdb-next.

Yeah, I guessed :-)

Thanks

--
Cheers,
Stephen Rothwell [email protected]
http://www.canb.auug.org.au/~sfr/

Attachments:
(No filename) (341.00 B)
 (No filename) (490.00 B)
 Download all attachments