linux-kernel - linux-next: manual merge of the trivial tree with the 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: Windows password security audit tool. GUI, reports in PDF.

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

Message-Id: <20120522145432.aa4d97df7f08af54229f1338@canb.auug.org.au>
Date:	Tue, 22 May 2012 14:54:32 +1000
From:	Stephen Rothwell <sfr@...b.auug.org.au>
To:	Jiri Kosina <jkosina@...e.cz>
Cc:	linux-next@...r.kernel.org, linux-kernel@...r.kernel.org,
	Masanari Iida <standby24x7@...il.com>,
	John Crispin <blogic@...nwrt.org>,
	Ralf Baechle <ralf@...ux-mips.org>
Subject: linux-next: manual merge of the trivial tree with the  tree

Hi Jiri,

Today's linux-next merge of the trivial tree got a conflict in
arch/mips/lantiq/xway/gpio_ebu.c arch/mips/lantiq/xway/gpio_stp.c between
commit 5238f7bc3566 ("GPIO: MIPS: lantiq: move gpio-stp and gpio-ebu to
the subsystem folder") from the  tree and commit 6997991ab0db ("mips: Fix
printk typos in arc/mips") from the trivial tree.

The typos fixed in the latter probably need to be applied to the renamed
files drivers/gpio/gpio-mm-lantiq.c and drivers/gpio/gpio-stp-xway.c
(resp).

I have removed the old versions.
-- 
Cheers,
Stephen Rothwell                    sfr@...b.auug.org.au
http://www.canb.auug.org.au/~sfr/

Content of type "application/pgp-signature" skipped