public inbox for linux-kernel@vger.kernel.org
 help / color / mirror / Atom feed
From: Greg KH <greg@kroah.com>
To: Stephen Rothwell <sfr@canb.auug.org.au>
Cc: linux-next@vger.kernel.org, linux-kernel@vger.kernel.org,
	Torben Hohn <torbenh@gmx.de>, Kay Sievers <kay.sievers@vrfy.org>,
	Linus <torvalds@linux-foundation.org>,
	Andrew Morton <akpm@linux-foundation.org>
Subject: Re: linux-next: manual merge of the tty.current tree with Linus' tree
Date: Mon, 31 Jan 2011 09:56:14 -0800	[thread overview]
Message-ID: <20110131175614.GA25739@kroah.com> (raw)
In-Reply-To: <20110131124633.3f49a8f9.sfr@canb.auug.org.au>

On Mon, Jan 31, 2011 at 12:46:33PM +1100, Stephen Rothwell wrote:
> Hi Greg,
> 
> Today's linux-next merge of the tty.current tree got a conflict in
> drivers/tty/tty_io.c between commit
> ac751efa6a0d70f2c9daef5c7e3a92270f5c2dff ("console: rename
> acquire/release_console_sem() to console_lock/unlock()") from Linus' tree
> and commit a2a6a822adc2a91c677cb60e9bc6ffe26fa90e9f ("tty: use
> for_each_console() and WARN() on sysfs failures") from the tty.current
> tree.
> 
> Just context changes.  I fixed it up (see below) and can carry the fix as
> necessary.

Thanks, I saw this today as well when I asked Linus to pull the changes.
He can do this fixup, or I will and ask him to re-pull if it's needed.

thanks,

greg k-h

      reply	other threads:[~2011-01-31 17:59 UTC|newest]

Thread overview: 2+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2011-01-31  1:46 linux-next: manual merge of the tty.current tree with Linus' tree Stephen Rothwell
2011-01-31 17:56 ` Greg KH [this message]

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=20110131175614.GA25739@kroah.com \
    --to=greg@kroah.com \
    --cc=akpm@linux-foundation.org \
    --cc=kay.sievers@vrfy.org \
    --cc=linux-kernel@vger.kernel.org \
    --cc=linux-next@vger.kernel.org \
    --cc=sfr@canb.auug.org.au \
    --cc=torbenh@gmx.de \
    --cc=torvalds@linux-foundation.org \
    /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 a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox