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

[Stephen Rothwell]

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@xxxxxxxxxxxxxxxx

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)
--
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/