linux-kernel - linux-next: manual merge of the tip tree with the ttydev 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>] [day] [month] [year] [list]

Message-Id: <20090626135835.f60b2968.sfr@canb.auug.org.au>
Date:	Fri, 26 Jun 2009 13:58:35 +1000
From:	Stephen Rothwell <sfr@...b.auug.org.au>
To:	Thomas Gleixner <tglx@...utronix.de>, Ingo Molnar <mingo@...e.hu>,
	"H. Peter Anvin" <hpa@...or.com>,
	Peter Zijlstra <peterz@...radead.org>
Cc:	linux-next@...r.kernel.org, linux-kernel@...r.kernel.org,
	Jaswinder Singh Rajput <jaswinder@...nel.org>,
	Alan Cox <alan@...rguk.ukuu.org.uk>,
	Arnd Bergmann <arnd@...db.de>
Subject: linux-next: manual merge of the tip tree with the ttydev tree

Hi all,

Today's linux-next merge of the tip tree got a conflict in
arch/x86/include/asm/termios.h between commit
9d5eecbefea1142a640bb01426fa6e332a5a9e54 ("tty-x86-termios-clean") from
the ttydev tree and commits 69d5ffdaad7b77b97229b55c36afb20e5bebd29e
("x86: convert termios.h to the asm-generic version") and
73a2d096fdf23aa841f7595d114a11ec85a85e4d ("x86: remove all now-duplicate
header files") from the tip tree.

I just used the version from the tip tree as the ttydev changes are
trivial.  Alan, I think you might as well just drop that patch as the tip
tree is rewriting that file completely (converting it to use the
asm-generic version).

-- 
Cheers,
Stephen Rothwell                    sfr@...b.auug.org.au
http://www.canb.auug.org.au/~sfr/

Content of type "application/pgp-signature" skipped