From: Jason Wessel <jason.wessel@windriver.com>
To: Stephen Rothwell <sfr@canb.auug.org.au>
Cc: linux-next@vger.kernel.org, linux-kernel@vger.kernel.org
Subject: Re: linux-next: manual merge of the kgdb tree with Linus' tree
Date: Thu, 22 Jul 2010 22:38:24 -0500 [thread overview]
Message-ID: <4C490EB0.2030007@windriver.com> (raw)
In-Reply-To: <20100723122646.a788fc86.sfr@canb.auug.org.au>
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.
next prev parent reply other threads:[~2010-07-23 3:38 UTC|newest]
Thread overview: 6+ messages / expand[flat|nested] mbox.gz Atom feed top
2010-07-23 2:26 linux-next: manual merge of the kgdb tree with Linus' tree Stephen Rothwell
2010-07-23 3:38 ` Jason Wessel [this message]
2010-07-23 7:08 ` Stephen Rothwell
-- strict thread matches above, loose matches on Subject: below --
2010-08-07 4:05 Stephen Rothwell
2010-08-07 21:17 ` Paul E. McKenney
2010-08-09 5:13 ` Jason Wessel
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=4C490EB0.2030007@windriver.com \
--to=jason.wessel@windriver.com \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-next@vger.kernel.org \
--cc=sfr@canb.auug.org.au \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.