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

Message-ID: <alpine.LNX.2.00.1002221123580.30967@pobox.suse.cz>
Date:	Mon, 22 Feb 2010 11:24:20 +0100 (CET)
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,
	Frans Pop <elendil@...net.nl>,
	David Miller <davem@...emloft.net>,
	Daniel Mack <daniel@...aq.de>
Subject: Re: linux-next: manual merge of the trivial tree with the sparc
 tree

On Mon, 22 Feb 2010, Stephen Rothwell wrote:

> Hi Jiri,
> 
> Today's linux-next merge of the trivial tree got a conflict in
> arch/sparc/kernel/leon_kernel.c between commit
> 0da2b300b91ddeb9944c3fb4faaf78c1c482c0af ("sparc: remove trailing space
> in messages") from the sparc tree and commit
> 3ad2f3fbb961429d2aa627465ae4829758bc7e07 ("tree-wide: Assorted spelling
> fixes") from the trivial tree.
> 
> The former also fixed the spelling mistake fixed by the latter.

Thanks, I have reverted the chunk in question in my tree.

-- 
Jiri Kosina
SUSE Labs, Novell Inc.
--
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/