All of lore.kernel.org
 help / color / mirror / Atom feed
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,
	Dmitry Torokhov <dmitry.torokhov@gmail.com>
Subject: Re: linux-next: manual merge of the kgdb tree with the input tree
Date: Wed, 06 Oct 2010 07:17:05 -0500	[thread overview]
Message-ID: <4CAC68C1.1070706@windriver.com> (raw)
In-Reply-To: <20101006130436.45d8a96a.sfr@canb.auug.org.au>

On 10/05/2010 09:04 PM, Stephen Rothwell wrote:
> Hi Jason,
>
> Today's linux-next merge of the kgdb tree got a conflict in
> drivers/char/sysrq.c between commit
> 1966cb225c6f9040ca163802cbd052c393d4448f ("Input: sysrq - add locking to
> sysrq_filter()") from the input tree and commit
> 02307772717c91a108aca2e999bbc586a85d06a2 ("sysrq,keyboard: properly deal
> with alt-sysrq in sysrq input filter") from the kgdb tree.
>
> Just context changes.  I fixed it up (see below) and can carry the fax as
> necessary.
>   

Thanks Stephen,

Hopefully I can get the sysrq / keyboard patches out of my tree and into
Dmitry's tree which should fix the problem by design. :-)

Thanks,
Jason.

  reply	other threads:[~2010-10-06 12:17 UTC|newest]

Thread overview: 5+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2010-10-06  2:04 linux-next: manual merge of the kgdb tree with the input tree Stephen Rothwell
2010-10-06 12:17 ` Jason Wessel [this message]
  -- strict thread matches above, loose matches on Subject: below --
2010-03-23  3:09 Stephen Rothwell
2010-03-23 13:24 ` Jason Wessel
2010-03-23 23:08   ` Stephen Rothwell

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=4CAC68C1.1070706@windriver.com \
    --to=jason.wessel@windriver.com \
    --cc=dmitry.torokhov@gmail.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.