linux-next: manual merge of the kgdb tree with Linus' tree
in [Kernel]
|
Prev: [RFC PATCH] hw-breakpoints, kgdb, x86: add a flag to pass DIE_DEBUG notification
Next: linux-next: manual merge of the catalin tree with the arm tree
From: Stephen Rothwell on 22 Jul 2010 22:30 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 sfr(a)canb.auug.org.au http://www.canb.auug.org.au/~sfr/
From: Jason Wessel on 22 Jul 2010 23:40 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. -- To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majordomo(a)vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/
From: Stephen Rothwell on 23 Jul 2010 03:10
Hi Jason, On Thu, 22 Jul 2010 22:38:24 -0500 Jason Wessel <jason.wessel(a)windriver.com> 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 sfr(a)canb.auug.org.au http://www.canb.auug.org.au/~sfr/ |