linux-kernel - Re: 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-prev] [thread-next>] [day] [month] [year] [list]

Date:	Tue, 22 May 2012 11:16:03 +0200 (CEST)
From:	Jiri Kosina <jkosina@...e.cz>
To:	Stephen Rothwell <sfr@...b.auug.org.au>
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: Re: linux-next: manual merge of the trivial tree with the  tree

On Tue, 22 May 2012, Stephen Rothwell wrote:

> 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.

I will probably keep this trivial conflict for Linus to resolve. Thanks,

-- 
Jiri Kosina
SUSE Labs
--
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/