Re: linux-next: manual merge of the tty.current tree with Linus'tree

[Greg KH]

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
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/