LKML Archive on lore.kernel.org
help / color / mirror / Atom feed
* linux-next: manual merge of the tty.current tree with Linus' tree
@ 2011-01-31  1:46 Stephen Rothwell
  2011-01-31 17:56 ` Greg KH
  0 siblings, 1 reply; 2+ messages in thread
From: Stephen Rothwell @ 2011-01-31  1:46 UTC (permalink / raw)
  To: Greg KH
  Cc: linux-next, linux-kernel, Torben Hohn, Kay Sievers, Linus, Andrew Morton

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.
-- 
Cheers,
Stephen Rothwell                    sfr@canb.auug.org.au

diff --cc drivers/tty/tty_io.c
index 6158eae,dae6fc9..0000000
--- a/drivers/tty/tty_io.c
+++ b/drivers/tty/tty_io.c
@@@ -3256,8 -3256,8 +3256,8 @@@ static ssize_t show_cons_active(struct 
  	struct console *c;
  	ssize_t count = 0;
  
 -	acquire_console_sem();
 +	console_lock();
- 	for (c = console_drivers; c; c = c->next) {
+ 	for_each_console(c) {
  		if (!c->device)
  			continue;
  		if (!c->write)

^ permalink raw reply	[flat|nested] 2+ messages in thread

* Re: linux-next: manual merge of the tty.current tree with Linus' tree
  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
  0 siblings, 0 replies; 2+ messages in thread
From: Greg KH @ 2011-01-31 17:56 UTC (permalink / raw)
  To: Stephen Rothwell
  Cc: linux-next, linux-kernel, Torben Hohn, Kay Sievers, Linus, Andrew Morton

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

^ permalink raw reply	[flat|nested] 2+ messages in thread

end of thread, other threads:[~2011-01-31 17:59 UTC | newest]

Thread overview: 2+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
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 is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).