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

lists.openwall.net		lists / announce owl-users owl-dev john-users john-dev passwdqc-users yescrypt popa3d-users / oss-security kernel-hardening musl sabotage tlsify passwords / crypt-dev xvendor / Bugtraq Full-Disclosure linux-kernel linux-netdev linux-ext4 linux-hardening linux-cve-announce PHC
Open Source and information security mailing list archives

Hash Suite for Android: free password hash cracker in your pocket

[<prev] [next>] [thread-next>] [day] [month] [year] [list]

Message-Id: <20110131124633.3f49a8f9.sfr@canb.auug.org.au>
Date:	Mon, 31 Jan 2011 12:46:33 +1100
From:	Stephen Rothwell <sfr@...b.auug.org.au>
To:	Greg KH <greg@...ah.com>
Cc:	linux-next@...r.kernel.org, linux-kernel@...r.kernel.org,
	Torben Hohn <torbenh@....de>,
	Kay Sievers <kay.sievers@...y.org>,
	Linus <torvalds@...ux-foundation.org>,
	Andrew Morton <akpm@...ux-foundation.org>
Subject: linux-next: manual merge of the tty.current tree with Linus' tree

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